Fixed merge conflicts

5509 files changed, 23442 insertions, 28678 deletions

diff --git a/TAO/ChangeLogs/TAO-3_0_10 b/TAO/ChangeLogs/TAO-3_0_10
new file mode 100644
index 00000000000..b0571846214
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_10
@@ -0,0 +1,134 @@
+commit 367992d328a3fdbf3465445b1922ea9b21a04f04
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Nov 17 07:58:59 2022 +0100
+
+    Update NEWS files for next release
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit fca859fece1cf48bc3ecbba171286a09b660f879
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Nov 1 11:25:13 2022 +0100
+
+    Use const/override/default and some layout changes
+    
+        * ACE/ace/Process.cpp:
+        * ACE/ace/Process.h:
+        * TAO/tao/ORB_Core.cpp:
+
+commit 5968484ea70f045ed9c5cdb8d38602d6592b7f25
+Merge: 711fbe05e66 3d67b98a644
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 20 07:39:29 2022 +0200
+
+    Merge pull request #1970 from jwillemsen/jwi-overrirde
+    
+    Use override
+
+commit 3d67b98a644c748826e76a10659add89497c42b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 19 19:56:03 2022 +0200
+
+    Use override
+    
+        * ACE/ace/OS_NS_stropts.cpp:
+        * TAO/tao/PortableServer/Active_Policy_Strategies.cpp:
+        * TAO/tao/PortableServer/ThreadStrategy.h:
+        * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/ThreadStrategyORBControl.h:
+        * TAO/tao/PortableServer/ThreadStrategySingle.h:
+        * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+        * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp:
+
+commit f4e36f0711e03618f88594d3ee02938d0da6a3ee
+Author: Niepsho <68657205+Niepsho@users.noreply.github.com>
+Date:   Tue Oct 18 13:56:41 2022 +0200
+
+    Use default
+
+commit e815db1b8fe83d68b037c7a61227c736166f9979
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 14 08:38:46 2022 +0200
+
+    Fixed compile error due to cleanup and made destructors default
+
+commit 66da37c13452cd66442bb2baaa9beadbf3c449e4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 13 09:07:28 2022 +0200
+
+    Make use of default
+
+commit dca58941074b2098a9e898e73b4bcd05a3b80bcb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 13 08:48:56 2022 +0200
+
+    Fixed unused variable warnings
+
+commit 969d4ddf3152fe1e6cb616b284dbecf72849c494
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 13 08:39:56 2022 +0200
+
+    Fixed unused variable warnings
+
+commit 99f66230ce63174a10ff5acbe7c54e9c06b98065
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 12 09:44:26 2022 +0200
+
+    Layout changes
+
+commit 892141ae11c090cf86d1d6e8c017d2535645f69a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 12 09:39:00 2022 +0200
+
+    Layout changes
+
+commit 727fb1f5d2a067320c00149f7df2ecba602d9457
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 12 09:29:41 2022 +0200
+
+    Layout changes
+
+commit d7b7a7ce9d2f46fb6e351b844ed87e643e051f27
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 12 09:08:18 2022 +0200
+
+    Layout/return changes
+
+commit 26c2fbc083da279e132f5a951bc43f95b4c97843
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 5 15:51:19 2022 +0200
+
+    Use default destructors
+    
+        * TAO/tao/String_Const_Sequence_Element_T.h:
+        * TAO/tao/String_Sequence_Element_T.h:
+        * TAO/tao/UserException.cpp:
+        * TAO/tao/UserException.h:
+
+commit 4d827f7dbfef927d913e6bc20a8360b78bb07242
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 4 16:54:06 2022 +0200
+
+    Use nullptr/std::addressof/default/uniform initialization
+    :
+        * ACE/ace/OS_NS_netdb.inl:
+        * TAO/tao/Endpoint.h:
+        * TAO/tao/Endpoint.inl:
+        * TAO/tao/IIOP_Endpoint.cpp:
+        * TAO/tao/IIOP_Endpoint.h:
+
+commit d5987833e7a582ff1a72a059f48c5c568a603b65
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Oct 1 14:39:21 2022 +0200
+
+    Make x.0.9 public
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/ChangeLogs/TAO-3_0_4 b/TAO/ChangeLogs/TAO-3_0_4
new file mode 100644
index 00000000000..cefd4305a33
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_4
@@ -0,0 +1,460 @@
+commit 495a504d92acd6eebe0a0a266bec1259fa1aaf9e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 29 08:51:49 2021 +0200
+
+    Include tao/StringSeq.pidl to fix duplicate symbols with msvc
+    
+        * TAO/tests/Bug_1676_Regression/Test.idl:
+        * TAO/tests/Bug_3524_Regression/README:
+        * TAO/tests/Bug_3524_Regression/test.idl:
+
+commit 1ef3c8c0d9f5d3876480a503eeeb5299b6172b90
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 28 09:37:29 2021 +0200
+
+    Use default/override
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+
+commit f2102281d3afb78fd9eddc566426ba4373e8de14
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 28 09:27:42 2021 +0200
+
+    Generate AMH destructor as default
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+
+commit 2c74ffc0559e66fa4ef0f290d4caac328441b768
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 28 09:02:04 2021 +0200
+
+    Make use of default and more condensed code generation
+    
+        * TAO/TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO/TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO/tests/MT_Server/README:
+
+commit 94b620310f4582b648644945fe8a56ab30bd13cb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 27 15:07:15 2021 +0200
+
+    Generate default constructor and destructor as default
+    
+        * TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+
+commit d017dac249b849bc0fda979684166b2ca61b5578
+Merge: a59431844a4 53f510db8ce
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 27 08:17:08 2021 +0200
+
+    Merge pull request #1687 from jwillemsen/jwi-autoptr5
+    
+    Use std::unique_ptr and default
+
+commit fc303f4408a093ea939c5583a5f5f1a7292f5704
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 26 19:29:18 2021 +0200
+
+    Use std::unique_ptr instead of ACE_Auto_Basic_Array_Ptr
+    
+        * ACE/ace/Configuration.cpp:
+        * ACE/ace/Local_Memory_Pool.cpp:
+        * ACE/ace/Local_Name_Space_T.cpp:
+        * ACE/ace/Log_Record.cpp:
+        * ACE/ace/OS_NS_unistd.cpp:
+        * ACE/ace/Parse_Node.cpp:
+        * ACE/ace/Process.cpp:
+        * ACE/ace/Remote_Name_Space.cpp:
+        * ACE/ace/XML_Utils/XML_Helper.tpp:
+        * TAO/tao/Storable_FlatFileStream.cpp:
+        * TAO/tao/Strategies/DIOP_Acceptor.cpp:
+
+commit ad7a6707a41f88f8fdf043cfc44f8674698880f0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 26 19:10:02 2021 +0200
+
+    Use std::unique_ptr and default
+    
+        * ACE/ace/INET_Addr.cpp:
+        * ACE/ace/Parse_Node.h:
+        * ACE/ace/Service_Gestalt.cpp:
+        * ACE/ace/TLI.cpp:
+        * ACE/ace/Thread_Manager.cpp:
+        * ACE/ace/UUID.cpp:
+        * ACE/ace/UUID.h:
+        * ACE/ace/WFMO_Reactor.cpp:
+        * ACE/tests/CDR_File_Test.cpp:
+        * TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
+        * TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
+        * TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp:
+        * TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h:
+        * TAO/orbsvcs/examples/CosEC/Factory/README:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h:
+        * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
+        * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp:
+        * TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp:
+        * TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp:
+        * TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp:
+        * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp:
+        * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h:
+        * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp:
+        * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h:
+        * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README:
+        * TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
+        * TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp:
+        * TAO/tao/IORManipulation/IORManipulation.cpp:
+        * TAO/tao/Leader_Follower.cpp:
+        * TAO/tao/Load_Protocol_Factory_T.h:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * TAO/tao/default_resource.cpp:
+        * TAO/tests/Oneway_Send_Timeouts/Server.cpp:
+        * TAO/tests/Storable/Savable.cpp:
+
+commit 701d5ca07e1f03b1e6be364f4070cbd84d532562
+Merge: 0e24b5e7990 0df9fc5ee12
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 20 16:31:24 2021 +0200
+
+    Merge pull request #1685 from jwillemsen/jwi-cleanup4
+    
+    Use default/override
+
+commit 0e24b5e7990cb86a0397b9feb81f7a6908858c6c
+Merge: 822763269c8 1ceca7d5958
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 20 16:31:07 2021 +0200
+
+    Merge pull request #1684 from jwillemsen/jwi-loopback
+    
+    Use is_loopback to check for a loopback address
+
+commit 0df9fc5ee123522365129fde957f6375f95c2778
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 20 10:53:52 2021 +0200
+
+    Use default/override
+    
+        * TAO/tao/Strategies/LF_Strategy_Null.inl:
+          Deleted.
+    
+        * TAO/tao/Strategies/COIOP_Connection_Handler.h:
+        * TAO/tao/Strategies/COIOP_Connector.cpp:
+        * TAO/tao/Strategies/COIOP_Connector.h:
+        * TAO/tao/Strategies/COIOP_Endpoint.cpp:
+        * TAO/tao/Strategies/COIOP_Endpoint.h:
+        * TAO/tao/Strategies/COIOP_Factory.cpp:
+        * TAO/tao/Strategies/COIOP_Factory.h:
+        * TAO/tao/Strategies/COIOP_Transport.cpp:
+        * TAO/tao/Strategies/COIOP_Transport.h:
+        * TAO/tao/Strategies/DIOP_Connection_Handler.h:
+        * TAO/tao/Strategies/DIOP_Connector.cpp:
+        * TAO/tao/Strategies/DIOP_Connector.h:
+        * TAO/tao/Strategies/DIOP_Endpoint.cpp:
+        * TAO/tao/Strategies/DIOP_Endpoint.h:
+        * TAO/tao/Strategies/DIOP_Factory.cpp:
+        * TAO/tao/Strategies/DIOP_Factory.h:
+        * TAO/tao/Strategies/DIOP_Transport.cpp:
+        * TAO/tao/Strategies/DIOP_Transport.h:
+        * TAO/tao/Strategies/LF_Strategy_Null.cpp:
+        * TAO/tao/Strategies/LF_Strategy_Null.h:
+
+commit 1ceca7d59580a854c5d80517301664a5fdeb4763
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 20 10:50:53 2021 +0200
+
+    Use is_loopback to check for a loopback address
+    
+        * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
+
+commit 822763269c85d3bcc4a4453b1293be789a8a0228
+Merge: c9e35711780 4b188f27199
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 17 16:38:17 2021 +0200
+
+    Merge pull request #1682 from jwillemsen/jwi-queueddata
+    
+    Use uniform initialization and fix g++ unitialized warning
+
+commit 4b188f271990a6781ad8d8a9833dcafe29e2a3fe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 17 15:14:55 2021 +0200
+
+    Use uniform initialization and fix g++ unitialized warning
+    
+        * TAO/tao/Queued_Data.cpp:
+        * TAO/tao/Queued_Data.h:
+        * TAO/tao/Queued_Data.inl:
+
+commit ebf00c730e8c5255c201509130aeda6c42135f26
+Merge: 46fcff0baa5 b899399eccc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 17 08:57:13 2021 +0200
+
+    Merge pull request #1675 from jwillemsen/jwi-strncat
+    
+    Use ACE_OS::strcat, much easier and removes a warning of gcc on strnc…
+
+commit 8f66df19d50e8fd163239245e3f65fe91e2f72a3
+Merge: 632f8eddde0 63c63c2dfa2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 15 12:20:37 2021 +0200
+
+    Merge pull request #1681 from jwillemsen/jwi-makekeys2
+    
+    Next round create 2048 bit keys
+
+commit 63c63c2dfa220b140a90626fc21a226260108fbb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 15 12:06:18 2021 +0200
+
+    Next round create 2048 bit keys
+    
+        * TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys:
+        * TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys:
+
+commit bfe78d306ca5adf4097615dc0d38ffed4049c598
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 15 09:40:08 2021 +0200
+
+    Updated expired certificates
+
+commit a1570029524d1afb0f670748dd3136dd5b34634d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 15 09:27:34 2021 +0200
+
+    Updated expires certificates
+
+commit 27010649539be8117b37516080a7091969a4b03a
+Merge: 5c5cd427623 184eb684d14
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 21:13:03 2021 +0200
+
+    Merge pull request #1679 from jwillemsen/jwi-ssl3
+    
+    Layout/override changes
+
+commit 5c5cd42762380e82a4bb62bb0aec85dcfaadf8fc
+Merge: a954f862cd0 7ea6b67d928
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 21:12:41 2021 +0200
+
+    Merge pull request #1678 from jwillemsen/jwi-ssl2
+    
+    ACE SSL minor changes
+
+commit 184eb684d14c2f3d49f43b0eb005ad106479d5c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:39:40 2021 +0200
+
+    Use 9999 days
+    
+        * TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys:
+        * TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys:
+
+commit c837a2c4803c75aa41bb4964fa1f102be2c6da08
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:34:08 2021 +0200
+
+    Layout change
+    
+        * TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl:
+
+commit 5f1d797afa90de94277507b9013ccb7b83bb0aa1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:33:59 2021 +0200
+
+    Layout changes, use override
+    
+        * TAO/orbsvcs/tests/Security/Big_Request/README:
+        * TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp:
+        * TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/README:
+
+commit 7ea6b67d9283840032bfe48dbbf0bafae291a2b9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:09:08 2021 +0200
+
+    Correct location of -days argument
+    
+        * TAO/orbsvcs/tests/Security/cert/README:
+
+commit 9cb961a20fb7800dba903618916bf0d7d28d6046
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:08:55 2021 +0200
+
+    Fixed typo
+    
+        * TAO/orbsvcs/tests/Security/BiDirectional/README:
+
+commit dc5f4ca3f4d3373ed82c8453646d71bfbc42e2b1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:08:46 2021 +0200
+
+    Use nullptr
+    
+        * TAO/tao/Strategies/advanced_resource.cpp:
+
+commit a29c70a149c86df030793d3e2f95fa54fca0cede
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 14 18:08:35 2021 +0200
+
+    Logging changes
+    
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
+
+commit a954f862cd0260d6c664c01c641861abae28a481
+Merge: b02dec6e4d8 5866183a2e4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 10 08:28:11 2021 +0200
+
+    Merge pull request #1676 from jwillemsen/jwi-gccwarningsdep
+    
+    Fix auto_ptr and fallthrough warnings
+
+commit 5866183a2e45b255ff9db4e8e2564e2d0b9171df
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 9 14:33:20 2021 +0200
+
+    Fix auto_ptr and fallthrough warnings
+    
+        * TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h:
+        * TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/README:
+        * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
+        * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h:
+        * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp:
+        * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
+        * TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+        * TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h:
+
+commit b899399eccc3d0f97323b4a15a319332417c3f1a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 9 13:36:18 2021 +0200
+
+    Use ACE_OS::strcat, much easier and removes a warning of gcc on strncat usage
+    
+        * TAO/TAO_IDL/util/utl_idlist.cpp:
+
+commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Aug 31 21:01:43 2021 -0500
+
+    Removed conv_lib.mpb
+    
+    Replaced uses of it with install_lib
+
+commit b4b2c11a6121786288b489eca3e2f155bea26167
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:32:34 2021 -0500
+
+    annotest_idl.mpc: simplify using tao_idl_fe.mpb now that it's fixed
+
+commit 5e2989a4d63b05cab291bd99acf2fdb00cb0578e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:20:30 2021 -0500
+
+    Unit test for TAO_IDL_FE's AST
+
+commit 26c8e7643c6623ffee6c902203ec9b55c7f216cf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:17:44 2021 -0500
+
+    removed invalid base project from tao_idl_fe
+
+commit 194e1f3a1ae2b1379ba49ecab2b06cbfe7b3dcfb
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 08:48:34 2021 -0500
+
+    TAO_IDL_FE: NT_fixed needs owns_base_type in typedef
+    
+    (cherry picked from commit 3a344501bebb195b1728c209d3e162622e8ec506)
+
+commit f75799c04412ef1cf29948f3fde889cbb32f0d1f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 23 16:38:36 2021 +0200
+
+    Docu/cleanup
+    
+        * TAO/examples/Borland/ChatClientWnd.h:
+        * TAO/examples/Borland/ORBThread.h:
+        * TAO/examples/Borland/Receiver.idl:
+        * TAO/examples/Borland/ReceiverImpl.h:
+
+commit ff36cc735a8fc98d840982116021da48c4cb2568
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 16:59:42 2021 +0200
+
+    Cleanup old Embarcadero compiler checks
+    
+        * ACE/ace/Compression/rle/RLECompressor.cpp:
+        * ACE/ace/post.h:
+        * ACE/ace/pre.h:
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h:
+        * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+        * TAO/tests/Bug_3574_Regression/test.cpp:
+
+commit e41cfa87c167c64e26a90c7079bc47e8362e4d8b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 5 13:21:00 2021 +0200
+
+    Removed ACE_HAS_UTIME because it is not used and fixed some broken links
+    
+        * ACE/ace/config-aix-5.x.h:
+        * ACE/docs/Download.html:
+        * TAO/tao/Transport.h:
+        * TAO/tao/Transport_Selection_Guard.h:
+
+commit a79c07f1ebc800f8ef643a7d69c29e987420fd4e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 4 09:27:08 2021 +0200
+
+    Make ACE 7.0.3 and TAO 3.0.3 available
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/ChangeLogs/TAO-3_0_5 b/TAO/ChangeLogs/TAO-3_0_5
new file mode 100644
index 00000000000..174a90d0fa6
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_5
@@ -0,0 +1,297 @@
+commit 71e4e963553d379b9744e9357267b65a0dec8cde
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Nov 16 13:05:02 2021 +0100
+
+    Fixed g++ warning, use override/default
+    
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h:
+
+commit 120b0f9b0aaf5771581dfa27229297d68e91cf2b
+Author: caoxiaolins <caoxiaolin_s@163.com>
+Date:   Sun Nov 14 21:28:56 2021 +0800
+
+    Removed redundant base project of project TAO_Notify_Service
+    
+    Fixes https://github.com/DOCGroup/ACE_TAO/issues/1705
+
+commit bf06d65f6dd1780bde5fcfc8fba852fb17234603
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Nov 12 09:22:06 2021 +0100
+
+    Installed tree doesn't have double orbsvcs path
+    
+        * TAO/orbsvcs/Notify_Service/Notify_Server.cpp:
+        * TAO/orbsvcs/Notify_Service/Notify_Service.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h:
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h:
+
+commit 3152281734753a2cd4e508f9244fade5a1e2dca1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Nov 12 09:09:16 2021 +0100
+
+    Removed redundant whitelines
+    
+        * TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README:
+        * TAO/orbsvcs/Logging_Service/Event_Logging_Service/README:
+        * TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README:
+        * TAO/orbsvcs/Logging_Service/README:
+        * TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README:
+        * TAO/orbsvcs/tests/AVStreams/README:
+        * TAO/orbsvcs/tests/Event/Mcast/Complex/README:
+        * TAO/orbsvcs/tests/Event/Mcast/Simple/README:
+        * TAO/orbsvcs/tests/Event/Mcast/Two_Way/README:
+        * TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README:
+        * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README:
+        * TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt:
+        * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README:
+        * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README:
+
+commit 026a87c8d9d1ce03c09d77e8c1fb99eb7d6af666
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Nov 11 11:27:50 2021 -0600
+
+    Notify svc: Fixed include
+    
+    The "make install" tree doesn't have two orbsvcs directories
+
+commit 0f879fd3f8a6e4d0b1762bd6c1424af735813ccc
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 10 11:42:07 2021 -0600
+
+    SystemExceptions shouldn't use a different export
+    
+    All classes defined in libTAO should use the same export macro.
+    This avoids MSVC creating import libs for all executables that use
+    libTAO -- see https://github.com/DOCGroup/MPC/issues/130 and
+    https://github.com/microsoft/vcpkg/issues/16551
+
+commit 576421723fad21844f94f2cbf8a55fa43ab1e7bf
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Nov 9 12:54:22 2021 -0600
+
+    Update TAO/NEWS
+    
+    Co-authored-by: Adam Mitz <mitza@objectcomputing.com>
+
+commit 05c690e4196f4830a25d2e45a758b4f714d34bf6
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 12:34:31 2021 -0600
+
+    Remove Mod for Booleans
+    
+    To address warnings on windows.
+
+commit cf10eef4b9a6dde7fa63edd77c482d75bc1ae51f
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 00:47:32 2021 -0600
+
+    `TAO/NEWS`: Correct Spelling
+
+commit e5854ea627173c0a83ab4cb2a5c17f9966038237
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Nov 5 13:34:50 2021 -0500
+
+    Fix More Parentheses Spacing
+
+commit b549b44c8a4c8474a076f28d55997cc543af0b3c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Nov 5 13:32:26 2021 -0500
+
+    Update TAO NEWS File
+
+commit 75fd738cbe9153802def7dc3d593edd51a4a1834
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Nov 5 13:26:45 2021 -0500
+
+    Respond to Review of #1715
+    
+    https://github.com/DOCGroup/ACE_TAO/pull/1715#discussion_r743241981
+
+commit bffb55e36cf752988ce5cd3f55b37515601a8d06
+Merge: b79f031d852 15e4737ddce
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu Nov 4 17:09:29 2021 -0500
+
+    Merge remote-tracking branch 'upstream/master'
+
+commit b79f031d852433b939bf19fc88b208955e4d4c55
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu Nov 4 15:38:15 2021 -0500
+
+    Fix Broken Floating Point Expressions
+    
+    Fixes https://github.com/DOCGroup/ACE_TAO/issues/1713 and adds a test.
+    
+    Also makes some other minor fixes and improvments to AST_Expression.
+
+commit 15e4737ddce6b0a73451e5f9856f7e5641b6173b
+Merge: 0bfb484a363 e891d972409
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 3 16:48:01 2021 -0500
+
+    Merge pull request #1709 from mitza-oci/msvc-langstd
+    
+    Port to MSVC with /std:c++17 and 20
+
+commit 257660f8cb9bb5e1cd989e82295d70a4296bc92f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 3 09:49:53 2021 +0100
+
+    Reduce amount of empty lines in union generation
+    
+        * TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+
+commit c53ed6fa6a20b529b507379ebdf6efa8c26e7166
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Nov 1 15:28:00 2021 -0500
+
+    tao_idl updates for /std:c++20
+    
+    std::ostream doesn't work with wchar_t
+
+commit 67e622e4639dbf478df2c009e10e5226e0eaaf45
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Nov 1 12:03:17 2021 -0500
+
+    TAO updates for /std:c++20
+    
+    Note that the C++20 standard library disallows using
+    wide (wchar_t) strings with narrow iostreams
+
+commit 58754472d3be09f540e6e3632a7175539aa25dba
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Sun Oct 31 21:38:48 2021 -0500
+
+    tao_idl updates for /std:c++20
+    
+    resolved ambiguous call to operator<< by refactoring to avoid
+    repetition of the same statement 300 times
+
+commit f63fd23cdbaafd7a8c17095198193421476ee9f2
+Merge: 713b686b403 affc714b380
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Oct 23 09:58:09 2021 +0200
+
+    Merge pull request #1700 from jwillemsen/jwi-taoidl2
+    
+    Don't use strncpy in native_ch.cpp to fix compiler warning
+
+commit affc714b3808507eb0c5f451292c8fd56da032f9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 22 16:55:21 2021 +0200
+
+    Don't use strncpy in native_ch.cpp to fix compiler warning
+    Use override/default
+    
+        * ACE/ace/Event_Handler.h:
+        * TAO/TAO_IDL/be/be_array.cpp:
+        * TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_structure/structure.cpp:
+        * TAO/TAO_IDL/be_include/be_array.h:
+        * TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h:
+        * TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h:
+        * TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/array.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h:
+        * TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h:
+        * TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h:
+        * TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h:
+        * TAO/TAO_IDL/be_include/be_visitor_structure/structure.h:
+        * TAO/TAO_IDL/include/ast_concrete_type.h:
+        * TAO/TAO_IDL/include/ast_type.h:
+        * TAO/TAO_IDL/util/utl_exceptlist.cpp:
+
+commit 713b686b4039ad41033296c6b23a7ad1a62c69b8
+Merge: 8a289d150ee a1665e92f0b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 13 08:55:24 2021 +0200
+
+    Merge pull request #1699 from jwillemsen/jwi-defaultdestructor
+    
+    Make use of default destructor
+
+commit 9084da95c561f11fc84e449e4e19324eecddda1e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 12 15:56:08 2021 +0200
+
+    Use default destructor
+    
+        * ACE/ASNMP/asnmp/oid.cpp:
+        * ACE/ace/ATM_Addr.cpp:
+        * ACE/ace/ATM_Addr.h:
+        * ACE/ace/Asynch_IO.cpp:
+        * ACE/ace/Asynch_IO.h:
+        * ACE/ace/MEM_Addr.cpp:
+        * ACE/ace/MEM_Addr.h:
+        * TAO/tests/OctetSeq/README:
+
+commit dbd98a476910b9c1a6745db560f57b02525dddeb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 1 09:38:36 2021 +0200
+
+    Make x.0.4 public available
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/ChangeLogs/TAO-3_0_6 b/TAO/ChangeLogs/TAO-3_0_6
new file mode 100644
index 00000000000..8b6628c1ffa
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_6
@@ -0,0 +1,289 @@
+commit d61d61771cb9f73a9c2a0fc4c4f896385513c212
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 20 08:26:33 2022 +0100
+
+    List changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit f67de62fc547264c093e4e7fd8db6f1981dbca76
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 20 08:22:51 2022 +0100
+
+    Fixed typo
+    
+        * TAO/tao/PortableServer/Root_POA.cpp:
+
+commit 6bed8a1e6e8067968ecd7bc2f1e60f6d1a5f5a64
+Merge: e1066915005 2067f66c702
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 18 13:25:36 2022 +0100
+
+    Merge pull request #1766 from jwillemsen/jwi-docucleanup2
+    
+    Corrected links to documentation, use nullptr/default, layout changes
+
+commit 2067f66c7028d125e09cdfcbe9fb33aed5a58692
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 18 10:51:55 2022 +0100
+
+    Use nullptr/default, docu changes
+    
+        * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/PI/PolicyFactory_Loader.cpp:
+        * TAO/tao/Policy_Validator.cpp:
+        * TAO/tao/PortableServer/Default_Policy_Validator.cpp:
+        * TAO/tao/PortableServer/Default_Policy_Validator.h:
+        * TAO/tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * TAO/tao/RTPortableServer/RT_Policy_Validator.h:
+        * TAO/tao/ZIOP/ZIOP_Policy_Validator.h:
+        * TAO/tests/BiDirectional/README:
+        * TAO/tests/BiDirectional/client.cpp:
+
+commit 5d3513f7346ef9465df43e3a8151e4643867d37b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 18 10:51:14 2022 +0100
+
+    Corrected links
+    
+        * TAO/docs/documentation.html:
+
+commit e1066915005387ee81397e9cec2e24b72abb1bd9
+Merge: a8372419d0e 27acd637ea3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 17 14:40:36 2022 +0100
+
+    Merge pull request #1765 from jwillemsen/jwi-cleanup2
+    
+    Use doxygen/nullptr/bool
+
+commit 27acd637ea341c104749d6b8369d67fc5448920d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 17 11:57:46 2022 +0100
+
+    Use doxygen/nullptr/bool
+    
+        * ACE/ace/Log_Msg.cpp:
+        * ACE/ace/NT_Service.cpp:
+        * ACE/ace/Object_Manager.cpp:
+        * ACE/ace/Object_Manager.h:
+        * ACE/ace/Thread.inl:
+        * ACE/tests/Task_Test.cpp:
+        * TAO/tao/DynamicInterface/Request.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/Messaging/AMH_Response_Handler.cpp:
+
+commit a8372419d0e73f4b816fccd15d85b085c56ea4d3
+Merge: d41442943e4 2733b15ce02
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 14 16:48:18 2022 -0600
+
+    Merge pull request #1760 from mitza-oci/cxx20
+    
+    fixed build with GCC -std=c++20
+
+commit d41442943e4fcdfc689133619b2043aee7d62a59
+Merge: 97daeea11d2 ab0b550403f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 13 17:40:49 2022 +0100
+
+    Merge pull request #1761 from jwillemsen/jwi-defaultoverride
+    
+    Make use of C++ default/override
+
+commit ab0b550403f711d725405afdd04475107b8f3bd2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 13 10:28:36 2022 +0100
+
+    Make use of C++ default/override
+
+commit 8e4d70bc963383a8798b8d63e518fe4bcfb2b234
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 11 20:34:43 2022 -0600
+
+    fixed build with GCC -std=c++20
+
+commit 97daeea11d251609247a90379d61551e8627910a
+Merge: 71c64284b43 0f69c85d3a3
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 10 21:20:04 2022 -0600
+
+    Merge pull request #1752 from mitza-oci/gha-install
+    
+    make install, pkgconfig, ace_for_tao fixes
+
+commit 71c64284b4334f0f715ffc91fcdcef8bf6f3d031
+Merge: ee8f83a1e40 bf32655ffa4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 21:26:03 2022 +0100
+
+    Merge pull request #1757 from jwillemsen/jwi-codeset
+    
+    Make use of C++11 default and override
+
+commit bf32655ffa453d723536b06570059f38ef2b0136
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 17:17:45 2022 +0100
+
+    Removed redundant void
+    
+        * TAO/tao/Codeset/Codeset.h:
+
+commit f30b9cbe69c8599f3e96e1e03b1ca41699019915
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 17:07:28 2022 +0100
+
+    Make use of C++11 default
+    
+        * TAO/tao/Cleanup_Func_Registry.h:
+        * TAO/tao/Cleanup_Func_Registry.inl:
+        * TAO/tao/Client_Strategy_Factory.h:
+        * TAO/tao/Codeset_Manager.h:
+        * TAO/tao/Codeset_Manager_Factory_Base.cpp:
+        * TAO/tao/Codeset_Manager_Factory_Base.h:
+
+commit 48e842b9afeb089a4f3d5c5011c69ea75f99631d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 17:02:33 2022 +0100
+
+    Make use of C++11 default and override
+    
+        * TAO/tao/Codeset/Codeset_Manager_i.cpp:
+        * TAO/tao/Codeset/Codeset_Manager_i.h:
+        * TAO/tao/Codeset/Codeset_Service_Context_Handler.h:
+        * TAO/tao/Codeset/Codeset_Translator_Factory.cpp:
+        * TAO/tao/Codeset/Codeset_Translator_Factory.h:
+        * TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp:
+        * TAO/tao/Codeset/Codeset_Translator_Factory_T.h:
+        * TAO/tao/Codeset/UTF16_BOM_Factory.cpp:
+        * TAO/tao/Codeset/UTF16_BOM_Factory.h:
+        * TAO/tao/Codeset/UTF16_BOM_Translator.cpp:
+        * TAO/tao/Codeset/UTF16_BOM_Translator.h:
+        * TAO/tao/Codeset/UTF8_Latin1_Factory.cpp:
+        * TAO/tao/Codeset/UTF8_Latin1_Factory.h:
+        * TAO/tao/Codeset/UTF8_Latin1_Translator.cpp:
+        * TAO/tao/Codeset/UTF8_Latin1_Translator.h:
+
+commit 0f69c85d3a38b8b50bd766fae5795b81329c7335
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 7 16:55:12 2022 -0600
+
+    Fixed a few pkg-config issues
+
+commit f6a98bf6e81d24b776921aab7ed812156d77eef1
+Merge: 5a2c18b21aa cacd3ed5e1b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 13:20:24 2022 +0100
+
+    Merge pull request #1754 from jwillemsen/jwi-rcsid
+    
+    Removed lef over for rcsid
+
+commit 5a2c18b21aab3ddc9efb4c365888872b427260ba
+Merge: 971a2f55600 37146c8f03e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 13:19:57 2022 +0100
+
+    Merge pull request #1753 from jwillemsen/jwi-bidircpp11
+    
+    Make use of C++11 features in BiDIR
+
+commit cacd3ed5e1b549e9adb7c8701ca33d6996ea532d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 11:33:33 2022 +0100
+
+    Removed lef over for rcsid
+    
+        * ACE/bin/MakeProjectCreator/config/acedefaults.mpb:
+        * ACE/bin/libsize.pl:
+        * TAO/docs/minimumTAO.html:
+        * TAO/docs/performance.html:
+
+commit 37146c8f03ecb28dfa9be8f8d4144466c90d946a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 09:48:37 2022 +0100
+
+    Make use of C++11 features in BiDIR
+    
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.h:
+        * TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h:
+        * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h:
+        * TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.h:
+
+commit 3ad369c499d9a3045b041428c830dfba1bfdf468
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Dec 17 13:44:56 2021 -0600
+
+    Use the tao_rules base project to bring in makefile rules
+
+commit eba5995a2fb8ed7734a4bb5332606f17cf8f6122
+Merge: 982e921423e 94baee24599
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 19:50:29 2021 +0100
+
+    Merge pull request #1745 from jwillemsen/jwi-exceptiondocu
+    
+    Modernize example code in deep copy documentation
+
+commit 8421ce146282ea06925a23229c2f046cba781814
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 12:45:54 2021 +0100
+
+    Add an attribute with the name call as test case
+    
+        * TAO/tests/IDL_Test/interface.idl:
+
+commit 94baee245996a418a3cc1ada80e50f1f2e9a343b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 12:38:15 2021 +0100
+
+    Modernize excample code in deep copy documentation
+    
+        * TAO/tao/Exception.h:
+
+commit 3f9404e68a0abe4755f328d70fdff6f403327de5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 12:37:30 2021 +0100
+
+    Add test case where we have an argument `call` which lead to non compiling generated code
+    
+        * TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO/tests/IDL_Test/interface.idl:
+
+commit 65f57025d8615cff69543ab63ddc30701f7f4e85
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Nov 19 16:07:46 2021 -0600
+
+    fixed comments in tao_idl-generated code
+    
+    (cherry picked from commit f8d8777b9cb4c42d8e693b9c97f8f9469740de76)
+
+commit e66d46e38a26f3113edd07241337205e9842cf40
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Nov 18 15:03:57 2021 +0100
+
+    Fallback to MacOSX 11 latest when we have a not recognized major version
+    
+        * ACE/include/makeinclude/platform_macosx.GNU:
+        * TAO/NEWS:
+
+commit b75ee3d8e1cc3dcad8d508b590167837fe0bfa2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 17 11:30:38 2021 +0100
+
+    Prepare for next release and make x.0.5 public
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/ChangeLogs/TAO-3_0_7 b/TAO/ChangeLogs/TAO-3_0_7
new file mode 100644
index 00000000000..1893b7b623b
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_7
@@ -0,0 +1,391 @@
+commit 97bae51bbcde61f7d389441b3f7fac9e29534c9a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 10 11:29:38 2022 +0200
+
+    Use default
+    
+        * TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp:
+        * TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h:
+        * TAO/tao/Strategies/SCIOP_Endpoint.cpp:
+        * TAO/tao/Strategies/SCIOP_Endpoint.h:
+        * TAO/tao/Strategies/SCIOP_Factory.cpp:
+        * TAO/tao/Strategies/SCIOP_Factory.h:
+        * TAO/tao/Strategies/SHMIOP_Connector.cpp:
+        * TAO/tao/Strategies/SHMIOP_Connector.h:
+        * TAO/tao/Strategies/UIOP_Endpoint.cpp:
+        * TAO/tao/Strategies/UIOP_Endpoint.h:
+
+commit 73d0ce5aa15fcf0e27124fd4e9aa6e756e6bc9de
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Apr 23 09:28:22 2022 +0200
+
+    Make use of ACE_FALLTHROUGH
+
+commit 17fc02df28233df6df48daa00f62a89b6629ef4b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Apr 23 09:25:51 2022 +0200
+
+    Make use of default
+    
+        * TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp:
+        * TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h:
+        * TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp:
+        * TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h:
+
+commit 2693429c1335ccf6e1c1b39f338f67c2739a38a8
+Merge: 9a54764694a 58b937ceafa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Apr 19 19:06:09 2022 +0200
+
+    Merge pull request #1822 from jwillemsen/jwi-readmetypos
+    
+    Fixed some typos in readmes
+
+commit 58b937ceafa3563b358599bd19519db204bece3d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Apr 19 19:00:55 2022 +0200
+
+    Fixed some typos in readmes
+
+commit 9a54764694aaf7c0830d916e85f3de8e90a252f9
+Merge: 5f445eac3b0 b2f2da90051
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Apr 19 17:16:46 2022 +0200
+
+    Merge pull request #1821 from jwillemsen/jwi-default
+
+commit b2f2da90051267c26b4165ace3ffb9c40acfb536
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Apr 19 09:20:01 2022 +0200
+
+    Removed redundant void
+    
+        * TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h:
+
+commit 9adf6e6eac693a65add0a9bee486c8ced1547023
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Apr 19 09:19:50 2022 +0200
+
+    Make constructor default
+    
+        * TAO/tests/DII_Deferred_Transient/Hello.cpp:
+        * TAO/tests/DII_Deferred_Transient/Hello.h:
+
+commit e11fca73066699aa01c4f820841e4725d25d3e86
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date:   Tue Apr 12 12:37:45 2022 -0500
+
+    More tests update
+
+commit e8a34fc500cb689215ad5500c951de06f864469b
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date:   Fri Apr 8 12:34:55 2022 -0500
+
+    Update orbsvcs tests
+
+commit 8085c8f0443371a61fc5d30464b3a9dfb4211693
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date:   Thu Apr 7 16:56:03 2022 -0500
+
+    More updates to TAO/tests
+
+commit 44f313a104c4a76fa6e83239ec07066df6703355
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date:   Thu Apr 7 11:26:20 2022 -0500
+
+    Fixing tests
+
+commit 9d3af324cdb11fe2812acf55dbc1274ee0e87225
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Apr 6 13:41:46 2022 +0200
+
+    Fixed typo
+    
+        * TAO/docs/ORBEndpoint.html:
+
+commit 0bfdaeb95608f3652cfe499e1960988c71476f30
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Mar 11 10:35:21 2022 -0600
+
+    tao_idl: avoid undefined behavior (adding to nullptr)
+
+commit f42ac731ce93d0963450f4027e5d43049665e2d1
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Feb 15 10:57:43 2022 -0600
+
+    Update TAO/NEWS
+    
+    Co-authored-by: Adam Mitz <mitza@objectcomputing.com>
+
+commit d758d7eb994dd9bdeb2b02a1ae7746acab83ba7f
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Feb 15 10:39:02 2022 -0600
+
+    Update TAO/TAO_IDL/driver/drv_preproc.cpp
+    
+    Co-authored-by: Adam Mitz <mitza@objectcomputing.com>
+
+commit 694663ce656d2b56729588175983d1340d807a29
+Merge: 9de890f6631 8ae8c457638
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 15 10:38:04 2022 -0600
+
+    Merge remote-tracking branch 'upstream/master' into igtd/tao-idl-open
+
+commit 9de890f6631c296b98eb9cd3a3b425b11c5ddc60
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Mon Feb 14 12:25:30 2022 -0600
+
+    Update TAO/NEWS
+
+commit ac7122d8366f187afb732482b3301a4b1d769d1e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Mon Feb 14 12:21:49 2022 -0600
+
+    drv_preproc.cpp: Replace fstat with stat
+
+commit d1d0d3ce399e1191c5d05251127074bd60081cdc
+Author: Clayton Calabrese <calabreseclayton@gmail.com>
+Date:   Fri Feb 11 14:13:31 2022 -0600
+
+    Add news file for PRs 1772 and 1778
+
+commit f86b6106d9a4d122555a47e860b7f83284d4a31b
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Feb 11 03:03:01 2022 -0600
+
+    Replace -1 with ACE_INVALID_HANDLE
+
+commit 0a279b9e711450549ac5ac11025617174329edd0
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu Feb 10 21:35:19 2022 -0600
+
+    Fix tao_idl File Errors
+    
+    1. The error message for failing to open an IDL file didn't have the
+       filename in it. This was because the `ACE_ERROR` for it was using a
+       `%m` when it should have been using a `%p`.
+       It looks like https://github.com/DOCGroup/ACE_TAO/pull/1420/commits/faab6830cf4ecf67b452183dba712caae7996be4
+       went one change too far.
+    
+    2. First brought up here: https://github.com/objectcomputing/OpenDDS/issues/3308
+       Inputting a directory to tao_idl results in an empty file that causes
+       a weird error latter. Changed it to ensure the file is a regular file
+       using `fstat`.
+
+commit 0d11899fc5c8ecdd52e12ff98324f085109e329f
+Merge: ab053fad273 89a599e2c4d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 7 17:02:22 2022 +0100
+
+    Merge pull request #1781 from jwillemsen/jwi-doxygen4
+    
+    Upgrade doxygen config files to the latest version of doxygen
+
+commit 89a599e2c4d2d3fe65c1dc4078c2e3a910bff326
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 7 14:30:57 2022 +0100
+
+    Upgrade doxygen config files to the latest version of doxygen
+
+commit 68b5a13864501e5a5f18c2fc842e9623771d4cd3
+Author: Clayton Calabrese <calabreseclayton@gmail.com>
+Date:   Wed Feb 2 16:01:44 2022 -0600
+
+    Fix unused variable warning for first_quote variable
+
+commit fa5ca0765970ed21788207f1920e76c48111650a
+Merge: ff69a8d6d27 a85885d41a8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Feb 2 20:58:59 2022 +0100
+
+    Merge pull request #1777 from jwillemsen/jwi-copydis
+    
+    Use deleted copy/assign and use nullptr
+
+commit ff69a8d6d272e741957ff60f34c4428885de33b2
+Merge: e4b72cc9a0f ae0a6df7c06
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Feb 2 16:04:30 2022 +0100
+
+    Merge pull request #1776 from jwillemsen/jwi-examplecleanup
+    
+    Minor cleanup
+
+commit 13ba18411204bf0525f4d1badea98892e5973529
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Feb 2 14:57:46 2022 +0100
+
+    Remove redundant whitespace
+    
+        * TAO/examples/Simple/README:
+
+commit f3858b42237e52396c002309f5a6cd5f7eb56fa4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Feb 2 14:57:11 2022 +0100
+
+    Initialize members
+    
+        * TAO/examples/Simple/Simple_util.cpp:
+        * TAO/examples/Simple/Simple_util.h:
+
+commit ae0a6df7c06ede20e909164f97f94bfe9eeb342e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Feb 2 12:23:09 2022 +0100
+
+    Minor cleanup
+    
+        * TAO/examples/DeveloperGuideExamples.txt:
+        * TAO/examples/Event_Comm/Consumer_Handler.cpp:
+        * TAO/examples/Event_Comm/Consumer_Handler.h:
+        * TAO/examples/Event_Comm/Consumer_Input_Handler.cpp:
+        * TAO/examples/Event_Comm/Consumer_Input_Handler.h:
+        * TAO/examples/Event_Comm/Event_Comm_i.h:
+        * TAO/examples/Event_Comm/Notifier_Handler.cpp:
+        * TAO/examples/Event_Comm/Notifier_Handler.h:
+        * TAO/examples/Event_Comm/consumer.cpp:
+        * TAO/examples/Event_Comm/supplier.cpp:
+        * TAO/examples/Event_Comm/supplier.h:
+        * TAO/examples/Simple/Simple_util.cpp:
+        * TAO/examples/Simple/Simple_util.h:
+        * TAO/examples/Simple/chat/Broadcaster_i.cpp:
+        * TAO/examples/Simple/chat/Broadcaster_i.h:
+        * TAO/examples/Simple/echo/Echo_Client_i.cpp:
+        * TAO/examples/Simple/echo/Echo_Client_i.h:
+        * TAO/examples/Simple/echo/Echo_i.cpp:
+        * TAO/examples/Simple/echo/Echo_i.h:
+
+commit e4b72cc9a0fcc5e0f4449eef2598d84df37715b2
+Merge: 219b2a2a8a3 f62e96a54a9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Feb 1 14:57:43 2022 -0600
+
+    Merge pull request #1772 from ClaytonCalabrese/resolve_space_in_path
+    
+    TAO_IDL: Fix Space In Path Handling
+
+commit c3204073d36bb7bacf54f56f153782d1de2944d7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 1 19:26:07 2022 +0100
+
+    Remove redundant void
+    
+        * TAO/examples/Callback_Quoter/Consumer_Handler.cpp:
+
+commit b4794216ec8b22c4c3d278507dfab5448c31e44b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 1 18:58:56 2022 +0100
+
+    Fixed codacy issues
+    
+        * TAO/examples/Callback_Quoter/Consumer_Handler.h:
+        * TAO/examples/Callback_Quoter/Consumer_i.cpp:
+        * TAO/examples/Callback_Quoter/Consumer_i.h:
+        * TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp:
+        * TAO/examples/Callback_Quoter/Notifier_Input_Handler.h:
+        * TAO/examples/Callback_Quoter/Supplier_i.h:
+
+commit cb82b05379998df92de22061ab5c49aa464107a7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 1 17:25:03 2022 +0100
+
+    Removed redundant virtual
+    
+        * TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h:
+
+commit 64f5c16be32cf4a9fb14ac76d37531c53d47246b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 1 17:11:25 2022 +0100
+
+    Cleanup the callback quoter example
+    
+        * TAO/examples/Callback_Quoter/Consumer.idl:
+        * TAO/examples/Callback_Quoter/Consumer_Handler.cpp:
+        * TAO/examples/Callback_Quoter/Consumer_Handler.h:
+        * TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp:
+        * TAO/examples/Callback_Quoter/Consumer_Input_Handler.h:
+        * TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp:
+        * TAO/examples/Callback_Quoter/Consumer_Signal_Handler.h:
+        * TAO/examples/Callback_Quoter/Consumer_i.cpp:
+        * TAO/examples/Callback_Quoter/Consumer_i.h:
+        * TAO/examples/Callback_Quoter/Notifier.idl:
+        * TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp:
+        * TAO/examples/Callback_Quoter/Notifier_Input_Handler.h:
+        * TAO/examples/Callback_Quoter/Notifier_i.cpp:
+        * TAO/examples/Callback_Quoter/Notifier_i.h:
+        * TAO/examples/Callback_Quoter/README:
+        * TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
+        * TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h:
+        * TAO/examples/Callback_Quoter/Supplier_i.cpp:
+        * TAO/examples/Callback_Quoter/Supplier_i.h:
+        * TAO/examples/Callback_Quoter/consumer.cpp:
+        * TAO/examples/Callback_Quoter/notifier.cpp:
+        * TAO/examples/Callback_Quoter/supplier.cpp:
+
+commit 124cb3c16e5b3b9e766bc3d30677d5a86ae57b06
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 1 14:06:55 2022 +0100
+
+    Removed redundant newline
+    
+        * TAO/examples/Buffered_AMI/client.cpp:
+        * TAO/examples/Buffered_Oneways/client.cpp:
+
+commit f62e96a54a95d0ae48b4addbf266278be33a62d8
+Author: Clayton Calabrese <calabreseclayton@gmail.com>
+Date:   Thu Jan 27 15:40:20 2022 -0600
+
+    Change to consistently concatonate -I with the rest of the arg. Remove outdated comment.
+
+commit fa93d8146fc7823ea6960c342a7be95c0c9a97bf
+Author: Clayton Calabrese <calabreseclayton@gmail.com>
+Date:   Tue Jan 25 17:34:56 2022 -0600
+
+    remove unused variable has_space. Update if to remove first_quote.
+
+commit 98dcdf61448837f074787eaf47096f05bb2ade28
+Merge: 8d5a781cb31 44e18307771
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 25 20:29:57 2022 +0100
+
+    Merge pull request #1773 from jwillemsen/jwi-logging
+    
+    Logging changes, updated bczar instructions
+
+commit 44e1830777113a8ada369d5d39bd667c1f95ab95
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 25 18:23:45 2022 +0100
+
+    Logging changes, fixed a typo in the documentation, layout change
+    
+        * TAO/docs/Options.html:
+        * TAO/tao/IIOP_Acceptor.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
+
+commit 08ab454bd3ae971b575f389b64ed7ba42e5c9dda
+Author: Clayton Calabrese <calabreseclayton@gmail.com>
+Date:   Mon Jan 24 18:22:56 2022 -0600
+
+    Fix an issue where TAO_IDL would not properly handle spaces in paths
+
+commit 341eb88adc828eef2bbdc5468785224c5315d1b2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 21 13:41:15 2022 +0100
+
+    Remove duplicate semi-colon
+
+commit 45c001e0f6affa2fba6f4698e9adb60036599dc1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 20 09:52:54 2022 +0100
+
+    Make x.0.6 public
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * ACE/html/README:
+        * TAO/NEWS:
diff --git a/TAO/ChangeLogs/TAO-3_0_8 b/TAO/ChangeLogs/TAO-3_0_8
new file mode 100644
index 00000000000..13130876300
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_8
@@ -0,0 +1,179 @@
+commit b4822ca137fe6622bbe7d2e3a48737a7d4bec21a
+Merge: 6f45d133c86 01865991423
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jun 28 08:47:31 2022 -0600
+
+    Merge pull request #1868 from mitza-oci/seq-codegen-any
+    
+    Updated sequence Any operators code generation
+
+commit 01865991423cf451a7a689198f54e2715e01f241
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 14:42:19 2022 -0500
+
+    Updated .gitignore
+
+commit ccaccc38fc368183e8ac3caff85c85643b95c30b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 14:40:32 2022 -0500
+
+    updated namespaces based on review comment
+
+commit 00322cece3e96c695fc20a3fe38be2cbec9682cf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 27 21:32:36 2022 +0200
+
+    Use default/nullptr
+        * TAO/tao/AnyTypeCode/Any.cpp:
+        * TAO/tao/AnyTypeCode/Any.h:
+
+commit 9cb860c2773e35781196fb3fc42d7dbbaeb1a09d
+Merge: 7089ca0a2ca dbc6154a1b9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 27 21:28:27 2022 +0200
+
+    Merge branch 'master' into jwi-addressofany
+
+commit 7089ca0a2cacc8f0c00eca0f4228bcbff35cb12c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 27 21:28:14 2022 +0200
+
+    Make use of addressof/const
+    
+        * TAO/tao/AnyTypeCode/Any.cpp:
+
+commit 13c6769e5ec7caaea332e7f4d5af14f350c41255
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 13:23:05 2022 -0500
+
+    fixed whitespace for CodeFactor check
+
+commit 1dcb876984270da8634b6ef95da1a3be2660a5ad
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 11:54:17 2022 -0500
+
+    Updated sequence Any operators code generation
+    
+    - Fixed the alternate mapping (std::vector)
+    - Use leading :: to avoid naming collision with CORBA namespace
+
+commit da57b9d4b194ccad355e2a7b0b252d32bfdfd2bc
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 09:54:47 2022 -0500
+
+    Updated NEWS
+
+commit 6c1476eef08213a05f0b2b9b4746d4ff7beda437
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 15:55:21 2022 -0500
+
+    Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option
+
+commit 9fd4f2bd77dd3d54995068f20e711fb3737ef711
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 13:45:32 2022 -0500
+
+    Updated NEWS
+
+commit ae3ff95027b1845e284c9869737d94c54e3ed38c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 23 21:30:05 2022 -0500
+
+    struct anyops: use fully-qualified scope
+
+commit 2c2be5bf757c0d167a38045fdeb598af8d750ac6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 23 18:53:17 2022 -0500
+
+    moved operator<<= and >>= for CORBA::Any into namespace CORBA
+
+commit 8ab5b907ce4f15c1daf3ce69cb1e07fe43868a4c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 17:01:17 2022 -0500
+
+    fixed whitespace
+
+commit 8a7e22701d1150bbaef3dd3b213693744b18d7c2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 16:57:00 2022 -0500
+
+    Corrected versioned_namespace usage in mpc file
+
+commit ff4b2b64fd8889033117dea0ea75a0d7d00e57a1
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 15:54:44 2022 -0500
+
+    TAO_IDL -Wb,versioning options do not depend on ACE_HAS_VERSIONED_NAMESPACE
+
+commit 5fe812b68381b582a63a8a8b761b85776e087c45
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 15:17:03 2022 -0500
+
+    TAO_IDL: improve versioned namespace and valuetype support
+    
+    - made versioned namespaces more general
+    - valuetype's traits need to be in TAO's namespace
+    - allow valuetypes with -Scdr
+
+commit cd015ed2ea0f03e51732c7d0213476da4023aeab
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Jun 15 17:10:44 2022 -0500
+
+    Test tao_idl-generated code with versioned namespaces
+    
+    TAO::Value_Traits is generated in the wrong namespace
+
+commit 21cb902c2e5c8296d36e0eb8d6c251b85a046dcb
+Merge: ee4008d6869 e1f7c3ba17c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 14 09:26:11 2022 +0200
+
+    Merge pull request #1854 from jwillemsen/jwi-redundantvoid2
+    
+    Removed redundant void
+
+commit e1f7c3ba17c4f57cc3c624285f7009f4d5145cca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 14 08:40:39 2022 +0200
+
+    Removed redundant void
+    
+        * ACE/ace/NT_Service.h:
+        * TAO/tests/MT_Server/test_i.h:
+
+commit 57cb0af875c71d8b24552c179d94fe83bd20007d
+Merge: 3703b49316d 44292a1fbae
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 7 12:40:16 2022 +0200
+
+    Merge pull request #1850 from jwillemsen/jwi-messagingglobalscope
+    
+    Use global scope for Messaging to fix problems when using an own Mess…
+
+commit 44292a1fbae067464ab2866b4c97d90701e0f324
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 7 09:39:44 2022 +0200
+
+    Use global scope for Messaging to fix problems when using an own Messaging namespace in a different scope
+    
+        * TAO/tao/PI_Server/ServerRequestInfo.h:
+
+commit ef76fa29be7a5dda6319f27eb0eb39a5018f88d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 3 10:45:39 2022 +0200
+
+    Use override to fix Embarcadero C++ Builder 11.1 warnings
+    
+        * TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h:
+
+commit 5abccb83ac1da6be99e28832fde74b835b45ebbc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat May 21 08:42:13 2022 +0200
+
+    Updated for x.0.7 release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/ChangeLogs/TAO-3_0_9 b/TAO/ChangeLogs/TAO-3_0_9
new file mode 100644
index 00000000000..25d5cad42ea
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_9
@@ -0,0 +1,588 @@
+commit a16ac15dd106967992baef21a91f73f002b2cb79
+Merge: 7b7e6532345 46bf3cb65ed
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 09:20:49 2022 +0200
+
+    Merge pull request #1942 from knutpett/knutpett/const_accessor
+    
+    Added const accessors for AST_Decl::local_name () and UTL_String::get_string ()
+
+commit 7b7e65323459375cda40274c9b5828b3f5aebda9
+Merge: 0b7e12778ae 2aab75d5fdd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 09:20:32 2022 +0200
+
+    Merge pull request #1941 from knutpett/knutpett/remove_void_part2
+    
+    Part 2: Remove obsolescent (void) in functions with no parameters
+
+commit 46bf3cb65ed64842f6272fb9d571af3c8d4ead59
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 23 08:47:45 2022 +0200
+
+    Remove the non-const version
+    
+    This is safe since non-const functions can call const-functions.
+
+commit 0b7e12778ae92315cbd51c901cb8402d6bd646a7
+Merge: f980f161749 64b5a4fecb5
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Sep 22 17:58:28 2022 -0500
+
+    Merge pull request #1907 from lukem/format-security
+    
+    Fix -Wformat-security issues
+
+commit 1aa4a63339a3990a68b5dd5f808bc3e5c33e193f
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Thu Sep 22 16:30:31 2022 +0200
+
+    Added const accessors for AST_Decl::local_name () and UTL_String::get_string ()
+
+commit 2aab75d5fddc126e8085c70fe8e1b875b75a30ef
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Mon Sep 19 14:37:02 2022 +0200
+
+    Part 2: Remove obsolescent (void) in functions with no parameters
+
+commit f980f161749eac82843c44943e6fec229920ba9f
+Merge: a3981dc07f3 90cfc149fdf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 21 08:38:51 2022 +0200
+
+    Merge pull request #1936 from jwillemsen/jwi-valuetypecdr
+    
+    Valuetype test extensions
+
+commit 90cfc149fdf58636ba5474b8ee5a3e60d24d7d90
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 20 16:39:55 2022 +0200
+
+    Correct project
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit e47c0ac2aa640d892e02ccb05a160a82d3490e6c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 20 16:35:24 2022 +0200
+
+    Move new test IDL to seperate project
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace2.idl:
+          Added.
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit 64b5a4fecb5806522f220d63b0744ffa40bb6bcc
+Merge: ccbb3639f96 9bb6d09a139
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 19 16:40:20 2022 -0500
+
+    Merge branch 'master' into format-security
+
+commit dcdc061a7e9e6446115374c404020c57577a2f62
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 14:45:51 2022 +0200
+
+    Use override instead of virtual
+    
+        * TAO/tao/Wait_On_LF_No_Upcall.h:
+        * TAO/tao/Wait_On_Leader_Follower.h:
+        * TAO/tao/Wait_On_Reactor.h:
+        * TAO/tao/Wait_On_Read.h:
+
+commit c43546b7c54c422c3fc6c3c8cf56d51703c1a58f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 14:44:02 2022 +0200
+
+    Add back virtual
+    
+        * TAO/tao/Wait_On_Leader_Follower.h:
+
+commit adf5bf4e71739a491b31ecec4fcfa8f82daded67
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 13:46:37 2022 +0200
+
+    Use default destructors
+    
+        * TAO/tao/Wait_On_LF_No_Upcall.cpp:
+        * TAO/tao/Wait_On_LF_No_Upcall.h:
+        * TAO/tao/Wait_On_Leader_Follower.cpp:
+        * TAO/tao/Wait_On_Leader_Follower.h:
+        * TAO/tao/Wait_On_Reactor.cpp:
+        * TAO/tao/Wait_On_Reactor.h:
+        * TAO/tao/Wait_On_Read.cpp:
+        * TAO/tao/Wait_On_Read.h:
+        * TAO/tao/Wait_Strategy.cpp:
+        * TAO/tao/Wait_Strategy.h:
+
+commit 417e48232eb31084b2908abf8a522531e7647ca9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 12:41:08 2022 +0200
+
+    More test
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+
+commit c31931d437af978c72302bb66831f729e680f325
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 12:38:40 2022 +0200
+
+    More test extensins
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit 55598ab199359c7daa3331520675f7a5c8e3cfe7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 11:27:26 2022 +0200
+
+    Extend test, enabled cdr
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit 5e96bb28fc7572f39b63ac2aca72800c45cdb1ee
+Merge: 96f0f9c1666 84f0894d8f0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 09:55:44 2022 +0200
+
+    Merge pull request #1933 from jwillemsen/jwi-versionednamespacetest
+    
+    Extend test IDL
+
+commit 96f0f9c16668c07531ea8c60c7b912f2e7b55806
+Merge: 14610fc4e13 d7c2081760f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 09:55:26 2022 +0200
+
+    Merge pull request #1934 from jwillemsen/jwi-require_truncation_
+    
+    Use uniform initialisation for require_truncation_ so tha we can generate a default constructor
+
+commit d7c2081760f1fed0c7e5929c35b7cc0fe9429c2e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 18 11:53:46 2022 +0200
+
+    Use uniform initialisation for require_truncation_ so tha we can generate a default constructor
+    
+        * TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+
+commit 84f0894d8f00fcb6e865c4dace75115eac98ac42
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 18 10:33:55 2022 +0200
+
+    Extend test IDL
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+
+commit 3f1236a89ac9381be2ece19ff833f6a6b5f4ae15
+Merge: da2ab4ef14f 062f194d4b3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:00:38 2022 +0200
+
+    Merge pull request #1930 from jwillemsen/jwi-sslcert
+    
+    Generated new certificates, old ones expired
+
+commit 062f194d4b339bc32dbd5705613800eb4db68960
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:00:04 2022 +0200
+
+    Generated new certificates, old ones expired
+
+commit bc05ebcc29b4ec7f5c7af14dad9ef6bd18883891
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 09:34:26 2022 +0200
+
+    Revert addressof changes, looks it broke something
+    
+        * TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
+
+commit 0a03a4b940b9bb549587d3f22eab9e66d617551c
+Merge: a457e9d14d9 0615e6ef888
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 09:16:25 2022 +0200
+
+    Merge pull request #1926 from jwillemsen/jwi-taoidlnullptr3
+    
+    Use nullptr, check pointers with 1, use std::addressof, reduced sloc
+
+commit 3da59eac098c1ef9d2c98f2079185ff35c3b6105
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Sep 13 22:57:39 2022 +0200
+
+    Remove obsolescent (void) in functions with no parameters
+
+commit 0615e6ef888bdcbbae4324e1dcbd04a21516e0e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 13 13:39:29 2022 +0200
+
+    Removed empty line
+    
+        * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+
+commit 603ecf36e5a6142ced625b1579a3ea1d4e48bdd8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 13 12:04:48 2022 +0200
+
+    Use nullptr, check pointers with 1, use std::addressof, reduced sloc
+    
+        * TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+
+commit ccbb3639f96d55c38f96914c6c7c4bc8c8998db9
+Merge: bdc29ef27a6 fe03724176d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 09:36:12 2022 +0200
+
+    Merge branch 'master' into format-security
+
+commit fe03724176dcfd20e0f9a6e493198469242be6b6
+Merge: 41a1f3bc12f 00b403be7df
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 08:32:34 2022 +0200
+
+    Merge pull request #1922 from knutpett/knutpett/whitespace
+    
+    Remove whitespace
+
+commit 00b403be7df0442405bd5e3dcc07beaa6730ddd2
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:26:57 2022 +0200
+
+    Fixed Redundant blank line at the end of a code block should be deleted
+
+commit 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:19:28 2022 +0200
+
+    Remove leading blank lines after opening {
+
+commit ab436d45dc956c1eaec31bff0c43ca3a0cb0cb66
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:14:24 2022 +0200
+
+    Remove trailing whitespace forgotten in previous commit
+
+commit c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:08:48 2022 +0200
+
+    Removed extra newline before closing }
+
+commit 2be659384defe6b235e020f03a7d683c80a16c7e
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 16:30:54 2022 +1000
+
+    Adapt to ACE_TEXT_PRIs
+    
+    Use ACE_TEXT_PRIs instead of conditional compilation
+    checking !defined(ACE_WIN32) && defined(ACE_USES_WCHAR).
+
+commit f5e5d7759a9314053509d294a4c10827d3946034
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 11:05:56 2022 +1000
+
+    Define ACE_TEXT_PRIs. Use to fix -Wformat-security
+    
+    Define ACE_TEXT_PRIs as "s" or "ls" depending upon the WCHAR mode.
+    (This is similar to the PRIxxx macros in <inttypes.h>)
+    
+    Use  ACE_TEXT("%") ACE_TEXT_PRIs  instead of "%s" or even
+    just the raw string without a format specifier.
+    
+    Fixes issue #1906.
+
+commit 8bc991b1de07cdb3a4c472d0932c71bda181db34
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 23:19:18 2022 +0200
+
+    resurrect two removed virtuals
+
+commit 5b9eb336d9f631d62f51d7725b4f9a1df7e4c240
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 9 18:00:29 2022 +0200
+
+    Removed redunant void
+    :
+        * TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp:
+
+commit 9542877dc5440626262777674cc9481079d9ee0c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 9 17:51:09 2022 +0200
+
+    Make use of std::addressof and removed some redundant whitespacing
+
+commit 126e88aeb3f288c770f0dccde5c6314ccaa6212c
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 15:46:54 2022 +0200
+
+    Replace 3 blank lines with just 2 blank lines
+
+commit 430d023f1d97173cfd104498f92dc4ccaa1c4135
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 14:31:18 2022 +0200
+
+    Remove extra newline after public, protected and private
+
+commit d75c37b54441651922e5dcfd287cbc87b1833e23
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 09:23:14 2022 +0200
+
+    Fix CodeFactor issues: blank lines
+
+commit f74944300c9af39d3e099aec8dff263e6d7918df
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 11:59:29 2022 +0200
+
+    Fix whitespace issues found by fuzz
+    
+    Running trailing_whitespaces check
+    Error: ./TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h:132: found trailing whitespace
+    Error: ./TAO/tao/CSD_Framework/CSD_POA.h:53: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/LifespanStrategyTransient.h:48: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h:54: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h:59: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:46: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:52: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:67: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:74: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:93: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:96: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:102: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:125: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:132: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:44: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:50: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:68: found trailing whitespace
+
+commit 6f72892d61032d294fe1387a36ec6e04e9efa9c2
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 10:38:55 2022 +0200
+
+    Fix trailing newline in class declarations
+
+commit 6d7b6be10a2c2be4fc47bdd2e285657fcc4d60fd
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 10:31:07 2022 +0200
+
+    Fix more blank line issues
+
+commit 1bc30d9abfac4b990a8ca25f43c666f28a8d61d2
+Merge: 156da73ce08 56377d8db17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 5 08:22:58 2022 +0200
+
+    Merge pull request #1912 from knutpett/warning_extra_semi
+    
+    Remove warnings -Wextra-semi
+
+commit c320b8022b5fd32b9237f1211f3f6d29c2192b21
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Fri Sep 2 21:18:26 2022 +1000
+
+    Fix -Wformat-security issues for wchar_t
+    
+    Use %ls instead of %s when using wchar_t
+    
+    Fixes issue #1906.
+
+commit 56377d8db17268f480e3800b020cbd5df5c1afab
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Aug 30 10:43:31 2022 +0200
+
+    Fix issues found by CodeFactor: blank line
+    
+    CodeFactor reported:
+    Redundant blank line at the start of a code block should be deleted
+
+commit 18bda4f07b8a8fde245f26afe8772a4c650d0773
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Aug 30 10:41:19 2022 +0200
+
+    Use default constructor
+
+commit c2181241c7dc3be203d4b0f231f2ab11b4f243e4
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Aug 29 17:39:16 2022 -0500
+
+    fuzz script comments
+
+commit a020ca7ad752fffd3b20b38e2f187cc8dcf5be10
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Aug 29 16:00:04 2022 -0500
+
+    Use ACE's Sync(h) traits in AST_Annotation_Appls
+    
+    - interprocess mutexes are not needed
+    - support threads=0 builds of tao_idl
+
+commit 023da962da06c7c6ab4e801d7a5861ef21ca9577
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Mon Aug 29 16:20:38 2022 +0200
+
+    Remove warnings -Wextra-semi
+
+commit 1c9614d34d09d39486e579c6c21b0218997739c8
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Aug 20 11:17:07 2022 +1000
+
+    Fix -Wformat-security issues
+    
+    Ensure that methods with a printf()-like format string
+    are invoked with a literal string instead of a string
+    built from possibly untrusted sources.
+    
+    Fixes issue #1906.
+
+commit 44c80da21fe3daed65ce0b19e47b09ba6aa3f438
+Merge: 05484cd6cd8 368e8175c5e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 14:43:23 2022 +0200
+
+    Merge pull request #1898 from jwillemsen/jwi-ACE_NESTED_CLASS
+    
+    Removed old comments for ACE_NESTED_CLASS
+
+commit 368e8175c5eea00b008b9295a4b1146ab297c771
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 09:55:22 2022 +0200
+
+    Removed old comments for ACE_NESTED_CLASS
+    
+        * TAO/TAO_IDL/ast/ast_type.cpp:
+        * TAO/TAO_IDL/be/be_interface.cpp:
+        * TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp:
+        * TAO/tests/IDL_Test/params.idl:
+
+commit 4a6478c41ac4b1e17cea8e0e4f4bbb6afe91269b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 08:32:51 2022 +0200
+
+    Use override, remove redundant whitespacing, fixed typo
+    
+        * ACE/tests/Enum_Interfaces_Test.cpp:
+        * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl:
+
+commit d799942f683eee8dafa8f81384f6a5d835ccc649
+Merge: bd92596bbc6 7ff6fc7440e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 20 08:13:11 2022 +0200
+
+    Merge pull request #1888 from jwillemsen/jwi-vcpkgv10
+    
+    Upgrade to vcpkg v10
+
+commit 4e2f7ae34d81f4ce82e6930b668785b886fb31fe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jul 19 09:32:06 2022 +0200
+
+    Layout changes
+
+commit bd92596bbc63635a2ed2131322e6c659a5420586
+Merge: b9e4a9a92a6 8f9a9f304ba
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 16:27:20 2022 +0200
+
+    Merge pull request #1887 from jwillemsen/jwi-codesetregistry
+    
+    Minor change for codeset registry generation and removed old Id tags
+
+commit 8f9a9f304ba52f05f9a06c2afa16ea3f4ca0b097
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 13:22:23 2022 +0200
+
+    Add semicolon to generation
+    
+        * TAO/utils/catior/Catior_i.cpp:
+
+commit 061375f9119599cadddb96fcb1284c06e0fa4695
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 13:22:11 2022 +0200
+
+    Removed old Id tag
+    
+        * TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+
+commit f94bdbc8fd6ae29e2f2b998f27fbacb03ca8f6d0
+Merge: 3ebafd71204 dae27692c88
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 15 13:57:34 2022 +0200
+
+    Merge pull request #1886 from jwillemsen/jwi-irixcleanup
+    
+    Removed some old Irix related code
+
+commit dae27692c8897e7f1de112b819c25fe7971ee895
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 15 08:04:34 2022 +0200
+
+    Removed some old Irix related code
+    
+        * TAO/bin/tao_orb_tests.lst:
+        * TAO/bin/tao_other_tests.lst:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+        * TAO/tao/IIOP_Connection_Handler.cpp:
+        * TAO/tao/IIOP_Transport.cpp:
+
+commit 3ebafd712042a344dc52677e1d190c9dfcbb3c65
+Merge: b619e577177 8096d513b52
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 14 11:57:11 2022 +0200
+
+    Merge pull request #1883 from jwillemsen/jwi-localhost
+    
+    Make use of ACE_LOCALHOST and removed Tru64/Irix remaining code
+
+commit 8096d513b52a30164b1820eab996dd26dbe2a4b8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 14 09:25:40 2022 +0200
+
+    Removed old code for Tru64/Irix, not supported anymore for a long time
+
+commit 1edc75272eb9348504ce9932af88e8870d814c30
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 15:41:16 2022 +0200
+
+    Removed workaround for Tru64
+    
+        * TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+
+commit 55e5793c7215c22c6ddf40fbcc0144a8862f76e2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 09:25:12 2022 +0200
+
+    Layout changes
+    
+        * TAO/tao/Codeset/Codeset.cpp:
+        * TAO/tao/Codeset/Codeset_Manager_i.cpp:
+        * TAO/tao/Codeset/UTF8_Latin1_Factory.h:
+
+commit bff9af24d9cfd567a0f91d15dbab8bf729758e5a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 09:55:07 2022 +0200
+
+    Updated
+    
+        * ACE/docs/bczar/bczar.html:
+        * TAO/NEWS:
diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
index 64b16d70739..25dfe5dfa71 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "AMH_Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-AMH_Messenger_i::AMH_Messenger_i (void)
+AMH_Messenger_i::AMH_Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-AMH_Messenger_i::~AMH_Messenger_i (void)
+AMH_Messenger_i::~AMH_Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
index 58fa8170f74..5de0c49ce58 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
@@ -21,10 +21,10 @@ class  AMH_Messenger_i : public virtual POA_DevGuide::AMH_Messenger
 {
 public:
   //Constructor
-  AMH_Messenger_i (void);
+  AMH_Messenger_i ();
 
   //Destructor
-  virtual ~AMH_Messenger_i (void);
+  virtual ~AMH_Messenger_i ();
 
   virtual void send_message (
     DevGuide::AMH_MessengerResponseHandler_ptr _tao_rh,
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.cpp b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
index ff63085ba51..561794f3ea9 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.h b/TAO/DevGuideExamples/AMH/Messenger_i.h
index 440732375dd..90c00311c25 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.h
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
index 6ce5e712976..b9a85db840c 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
@@ -10,10 +10,9 @@ Inner_callback_i::Inner_callback_i (PortableServer::POA_ptr p,
 }
 
 // Implementation skeleton destructor
-Inner_callback_i::~Inner_callback_i (void)
+Inner_callback_i::~Inner_callback_i ()
 {
   std::cout << "Inner_callback_i destroying" << std::endl;
-
 }
 
 void
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
index 1c5da919e7b..578a169a046 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
@@ -13,7 +13,7 @@ public:
                     AMH_MiddleResponseHandler_ptr rh);
 
   //Destructor
-  virtual ~Inner_callback_i(void);
+  virtual ~Inner_callback_i();
 
   virtual void answer (const char * ami_return_val);
 
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/README b/TAO/DevGuideExamples/BiDirectionalGIOP/README
index 61078ee50e7..b3b4aca800e 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/README
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/README
@@ -1,9 +1,6 @@
+This example is a copy of the $TAO_ROOT/test/BiDirectional test.
 
-
-This example is a copy of the $TAO_ROOT/test/BiDirerectional test
-but it does not use ACE_TRY/ENVIRONMENT macros.
-
-This example exercises the birectional GIOP connection
+This example exercises the bidirectional GIOP connection
 implementation in TAO.
 
 Start like this:
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
index 91143969b3c..b355371b492 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
@@ -8,10 +8,6 @@ Callback_i::Callback_i (CORBA::ORB_ptr orb)
 {
 }
 
-Callback_i::~Callback_i (void)
-{
-}
-
 void Callback_i::shutdown ()
 {
   std::cout << "Performing clean shutdown." << std::endl;
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
index dc70a79ed39..4c575795233 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
@@ -8,11 +8,11 @@ class  Callback_i : public virtual POA_Callback
 public:
   Callback_i (CORBA::ORB_ptr orb);
 
-  virtual ~Callback_i (void);
+  virtual ~Callback_i () = default;
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void callback_method (void);
+  virtual void callback_method ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
index 5b1167b9622..4f484c3f6c4 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
index ad4b3224ab9..529d1feff1e 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
@@ -84,7 +84,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Our own special orb->run() that knows how to callback clients
     while (true) {
-
       // returns 1 as soon as it has successfully called back.
       if (svt->call_client()) {
         break;
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
index 32c5f1c39b4..32aafb0e039 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
@@ -16,10 +16,6 @@ Simple_i::Simple_i (CORBA::ORB_ptr orb, int callback_count)
 {
 }
 
-Simple_i::~Simple_i (void)
-{
-}
-
 CORBA::Long Simple_i::test_method (CORBA::Boolean do_callback)
 {
   if (do_callback) {
@@ -43,11 +39,9 @@ int
 Simple_i::call_client()
 {
   if (ready_for_callback_) {
-
     ready_for_callback_ = 0;
 
     for (int times = 0; times < callback_count_; ++times) {
-
       callback_->callback_method();
 
       if (orb_->orb_core()->lane_resources().transport_cache().current_size() > 1)
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
index 614ccafecda..199fd9297c2 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
@@ -8,19 +8,13 @@ class  Simple_i : public virtual POA_Simple
 public:
   Simple_i (CORBA::ORB_ptr orb, int iterations);
 
-  virtual ~Simple_i (void);
+  ~Simple_i () = default;
 
-virtual CORBA::Long test_method (
-    CORBA::Boolean do_callback
-  );
+  virtual CORBA::Long test_method (CORBA::Boolean do_callback);
 
-virtual void callback_object (
-    Callback_ptr cb
-  );
+  virtual void callback_object (Callback_ptr cb);
 
-virtual void shutdown (
-
-  );
+  virtual void shutdown ();
 
   /// Not part of the CORBA interface. This method is called
   /// by our special orb event loop in server main().
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
index a5a5752bec4..4ce8f917281 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
index c5e1efee908..63b295106db 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 77880838f4f..a92e246f1b9 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -2,12 +2,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -22,6 +22,5 @@ CORBA::Boolean Messenger_i::send_message (
   CORBA::string_free(message);
   message = CORBA::string_dup("Thanks for the message.");
   return true;
-
 }
 
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
index cb0454e8fdc..edf9c1c9991 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
@@ -14,17 +14,16 @@ class  Messenger_i : public virtual Messenger,
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 #endif /* MESSENGERI_H_  */
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
index a3bb99603c0..4e0d4f301ff 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
@@ -42,7 +42,6 @@ Messenger_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                  void * cookie,
                                  PortableServer::Servant servant)
 {
-
   std::cout << "postinvoke called..." << std::endl;
 
   // Delete the servant as it is no longer needed.
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
index 57c1b902c7c..dad7a4481b4 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
@@ -19,12 +19,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
index 8b6d57bd407..adeb8fa5ee0 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
@@ -30,10 +30,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
index 0bb8b9d3a8d..400e8f94199 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
@@ -43,7 +43,6 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
   try {
-
     // Initialize orb
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
index 0b0ab15cd8c..f2e1d7865b6 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
@@ -10,7 +10,7 @@ MessengerHandler::MessengerHandler (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-MessengerHandler::~MessengerHandler (void)
+MessengerHandler::~MessengerHandler ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
index 951028cf9e4..aa36a1377f4 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
@@ -10,7 +10,7 @@ public:
   MessengerHandler (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~MessengerHandler (void);
+  virtual ~MessengerHandler ();
 
 virtual void send_message (
     CORBA::Boolean ami_return_val,
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
index 7fd597c9f45..ce960aed3b0 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
@@ -20,7 +20,7 @@ Messenger_i::Messenger_i (unsigned int seconds_to_wait,
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
index 86c1412ebff..32dc3a7aa0d 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
@@ -25,7 +25,7 @@ public:
                CORBA::Boolean throw_exception = 0);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
@@ -42,9 +42,7 @@ private:
   // Force an exception to be thrown to test client-side
   // exception handling
   CORBA::Boolean throw_exception_;
-
 };
 
 
-
 #endif /* MESSENGER_IMPL_H_  */
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
index a47d0443e66..66361fec627 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
@@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 {
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
index bd8302bd79e..1237e79659b 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
@@ -12,12 +12,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
index d49d63761c2..90c00311c25 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
@@ -21,17 +21,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
index a5a5752bec4..4ce8f917281 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
index c5e1efee908..63b295106db 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
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/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
index 5b42492bc30..a28018a9ee8 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
@@ -15,7 +15,7 @@ public:
   MessengerServer (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~MessengerServer (void);
+  virtual ~MessengerServer ();
 
   // parse arguments
   int parse_args (int argc, ACE_TCHAR* argv[]);
@@ -65,10 +65,8 @@ public:
   };
 
 private:
-
   CORBA::ORB_var orb_;
   ConsoleMonitor * monitor_;
-
 };
 
 #endif /* MESSENGERSERVER_H_  */
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index 6a002f1adbe..c366adf61a8 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -16,7 +16,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
index eca9e343812..ad49fec836e 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
@@ -24,7 +24,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
@@ -36,7 +36,6 @@ public:
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* MESSENGER_I_H_  */
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index fd6851b32b2..6874b232e05 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
index d49d63761c2..90c00311c25 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
@@ -21,17 +21,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index b43707e7210..745132f4916 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -14,12 +14,12 @@
 #include <sstream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
index d49d63761c2..90c00311c25 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
@@ -21,17 +21,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
index b43707e7210..745132f4916 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
@@ -14,12 +14,12 @@
 #include <sstream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
index d49d63761c2..90c00311c25 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
@@ -21,17 +21,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
index 12fe3748671..dc1627055d0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
@@ -2,7 +2,7 @@
 #include "ClientInterceptor.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
 {
 }
 
@@ -14,7 +14,6 @@ ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 void
 ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   // Create and register the request interceptors.
   PortableInterceptor::ClientRequestInterceptor_ptr ci =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
index 33c23248a43..d43b9f57b5a 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
@@ -10,7 +10,7 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
index e0c2bef7b55..d111a653ff0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
@@ -7,13 +7,13 @@
 const CORBA::ULong service_ctx_id = 0xdeed;
 
 ClientInterceptor::
-ClientInterceptor (void)
+ClientInterceptor ()
   : myname_ ("Client_Authentication_Interceptor")
 {
   std::cout << "Calling ClientInterceptor constructor." << std::endl;
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
@@ -59,7 +59,6 @@ ClientInterceptor::send_request (
 
   // Add this context to the service context list.
   ri->add_request_service_context (sc, false);
-
 }
 
 void
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
index 9d41e48ebdf..2a2fb385a43 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
@@ -9,9 +9,8 @@ class ClientInterceptor
 : public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual ::CORBA::LocalObject
 {
-
  public:
-  ClientInterceptor (void);
+  ClientInterceptor ();
 
   virtual ~ClientInterceptor ();
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
index 3842ab53dc2..12ea090e3f7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
@@ -11,12 +11,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
index 8ab4755edce..cf27ff521a1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
                                        const char * user_name,
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
index 056363d73fe..25de9b5b8ad 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
@@ -17,7 +17,6 @@ void
 ServerInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   // Create and register the request interceptors.
   PortableInterceptor::ServerRequestInterceptor_ptr si =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
index 6cb15bed351..d1f802011aa 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
@@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
-ServerInterceptor::ServerInterceptor (void)
+ServerInterceptor::ServerInterceptor ()
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
index a8da1affe95..3e8e46e14a9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
@@ -8,7 +8,7 @@ class ServerInterceptor
 : public PortableInterceptor::ServerRequestInterceptor
 {
  public:
-  ServerInterceptor (void);
+  ServerInterceptor ();
 
   ~ServerInterceptor ();
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
index 5bb6f8ea7c7..ef9543c5d75 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
@@ -2,7 +2,7 @@
 #include "ClientInterceptor.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
index ee05418e97d..c9a56901d89 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
@@ -10,7 +10,7 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
index b8d9b9b3a06..36ae3a4bf34 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
@@ -24,7 +24,7 @@ ClientInterceptor (IOP::CodecFactory_var cf)
   this->codec = cf->create_codec (encoding);
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
@@ -84,7 +84,6 @@ ClientInterceptor::send_request (
 
   // Add this context to the service context list.
   ri->add_request_service_context (sc, false);
-
 }
 
 void
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
index fb5cb926455..6c711ac4024 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
@@ -10,7 +10,6 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual ::CORBA::LocalObject
 {
-
  public:
   ClientInterceptor (IOP::CodecFactory_var) ;
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index 07e184ac27c..fcc2add53e9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -4,12 +4,12 @@
 #include "Messenger_i.h"
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
index d481b7803f5..465d2f1a851 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
@@ -12,14 +12,13 @@ class  Messenger_i : public virtual POA_Messenger
 {
  public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 
   virtual void send_message (const CORBA::OctetSeq & user_name);
-
 };
 
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
index 5dfa84b5172..79eb560bc87 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
@@ -91,7 +91,7 @@ ServerInterceptor::receive_request (
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;;
+    std::cout << "Permission Denied " << std::endl;
   }
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index b8ee6b53248..0bc539cf374 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -3,7 +3,7 @@
 #include "MessengerC.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
  : slot_ (0),
    current_ (PortableInterceptor::Current::_nil())
 {
@@ -41,7 +41,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 }
 
 void
-ClientInitializer::set_slot_data (void)
+ClientInitializer::set_slot_data ()
 {
   // Set the recursion flag
   CORBA::Any flag;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
index 4870f1877c3..c3d497c1008 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
@@ -11,10 +11,10 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
-  void set_slot_data (void);
+  void set_slot_data ();
 
  private:
    PortableInterceptor::SlotId slot_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
index c46cca7caf8..5321a7e460f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
@@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger,
   this->slot = theSlot;
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
@@ -87,7 +87,6 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   x = false;
   flag <<= CORBA::Any::from_boolean(x);
   pic->set_slot(slot,flag);
-
 }
 
 void
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
index f3ec546e4b4..17440a354b4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
@@ -11,7 +11,6 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual ::CORBA::LocalObject
 {
-
  public:
   ClientInterceptor (Messenger_var theMessage,
                      PortableInterceptor::Current_ptr thePic,
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
index 7bfb4963b32..576ff21b0fc 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
@@ -12,12 +12,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -34,7 +34,7 @@ CORBA::Boolean Messenger_i::send_message (
   return true;
 }
 
-char * Messenger_i::get_time (void)
+char * Messenger_i::get_time ()
 {
   time_t thetime;
   struct tm * timeinfo = 0;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
index 68e056019b7..7a63cb2c5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
@@ -21,17 +21,17 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message);
 
-  virtual char * get_time (void);
+  virtual char * get_time ();
 };
 
 #endif /* MESSENGERI_H_  */
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
index 0c2241c5312..a6f879eb1dc 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
@@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
-ServerInterceptor::ServerInterceptor (void)
+ServerInterceptor::ServerInterceptor ()
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
@@ -70,7 +70,7 @@ ServerInterceptor::receive_request (
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;;
+    std::cout << "Permission Denied " << std::endl;
   }
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
index a8da1affe95..3e8e46e14a9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
@@ -8,7 +8,7 @@ class ServerInterceptor
 : public PortableInterceptor::ServerRequestInterceptor
 {
  public:
-  ServerInterceptor (void);
+  ServerInterceptor ();
 
   ~ServerInterceptor ();
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
index 84dae2a1ed6..504fd1a67df 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
@@ -1,7 +1,7 @@
 #include "ClientInitializer.h"
 #include "ClientInterceptor.h"
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
index ee05418e97d..c9a56901d89 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
@@ -10,7 +10,7 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
index 656d2383bce..e083f001718 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
@@ -20,10 +20,9 @@ ClientInterceptor (IOP::CodecFactory_var cf)
 
   // Obtain the CDR encapsulation Codec.
   this->codec = cf->create_codec (encoding);
-
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
@@ -67,7 +66,6 @@ ClientInterceptor::send_request (
 
   // Add this context to the service context list.
   ri->add_request_service_context (sc, false);
-
 }
 
 void
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
index 5bd7dd2a6d4..6c711ac4024 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
@@ -10,7 +10,6 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual ::CORBA::LocalObject
 {
-
  public:
   ClientInterceptor (IOP::CodecFactory_var) ;
 
@@ -33,7 +32,6 @@ class ClientInterceptor:
  private:
   const char *myname_;
   IOP::Codec_var codec;
-
 };
 
 #endif
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index cb3646a5051..6abb6149707 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -4,12 +4,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
index 24befa12b87..6508d56c77c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
@@ -12,14 +12,13 @@ class  Messenger_i : public virtual POA_Messenger
 {
  public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 
   virtual void send_message (const CORBA::OctetSeq & user_name);
-
 };
 
 #endif /* MESSENGERI_H_  */
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
index c7485411606..76e16098445 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
@@ -21,7 +21,6 @@ ServerInterceptor::ServerInterceptor (IOP::CodecFactory_var cf)
 
   // Obtain the CDR encapsulation Codec.
   this->codec = cf->create_codec (encoding);
-
 }
 
 ServerInterceptor::~ServerInterceptor ()
@@ -88,7 +87,7 @@ ServerInterceptor::receive_request (
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;;
+    std::cout << "Permission Denied " << std::endl;
   }
 }
 
diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
index 7d22f0a9bca..fe22d886baf 100644
--- a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
@@ -96,7 +96,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     static const CORBA::Short increment = get_increment();
     for(CORBA::ULong i = 0; i < get_total_lanes(); i++) {
-
       // Set the priority to one that matches one of the lanes
       CORBA::Short priority = i * increment;
       current->the_priority(priority);
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
index 077bd43a8b2..fc686f11a34 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
@@ -2,12 +2,12 @@
 #include "ace/OS_NS_time.h"
 #include <iostream>
 
-Logger_i::Logger_i (void)
+Logger_i::Logger_i ()
 {
   log_file.open("Logger.txt");
 }
 
-Logger_i::~Logger_i (void)
+Logger_i::~Logger_i ()
 {
   log_file.close();
 }
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.h b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
index d23787a08e9..cacf61448fc 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
@@ -12,8 +12,8 @@
 class  Logger_i : public virtual POA_Logger
 {
 public:
-  Logger_i (void);
-  virtual ~Logger_i (void);
+  Logger_i ();
+  virtual ~Logger_i ();
 private:
   ofstream log_file;      // Output file stream to which messages are logged.
   time_t log_time;        // Needed for creating a time stamp.
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
index 32349ed7f16..09098dc809f 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
index e2cd0fc8925..63ad758730f 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
index 35a37beb085..f0e3d7c8312 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
@@ -26,7 +26,6 @@ Messenger_ptr
 Smart_Messenger_Proxy_Factory::create_proxy (
   Messenger_ptr proxy)
 {
-
   Messenger_ptr smart_proxy = 0;
   if (CORBA::is_nil(proxy) == 0)
     smart_proxy = new Smart_Messenger_Proxy(proxy, logger_.in());
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
index aaa387072a7..3a51587727f 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
@@ -70,9 +70,7 @@ private:
 };
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
-
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
@@ -100,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/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
index b5d4854dfb1..198181714d2 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
@@ -34,7 +34,7 @@ MessageImpl::MessageImpl
 }
 
 ::CORBA::ValueBase *
-MessageImpl::_copy_value (void)
+MessageImpl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
index f762e101cf1..0c3114d373a 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
@@ -25,7 +25,7 @@ public:
     const char* txt
     );
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   virtual ::Message::AddrList* getAddresses();
   virtual void addAddress(const char*);
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
index 1c310744b18..06071e1be93 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
@@ -33,7 +33,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
@@ -50,11 +49,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
     Message_var msg = new MessageImpl("Son", "Mom", "Dinner's Ready.", "Hurry home.");
 
     if (tst->send_message(msg)) {
-
       std::cout << "Message sent successfully.\n";
       msg->print();
       std::cout << std::endl;
-
     } else {
       std::cout << "Message refused." << std::endl;
     }
@@ -64,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/NEWS b/TAO/NEWS
index 3e35b1120fd..58aa925ac87 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,6 +1,52 @@
+USER VISIBLE CHANGES BETWEEN TAO-3.0.10 and TAO-3.0.11
+======================================================
+
+USER VISIBLE CHANGES BETWEEN TAO-3.0.9 and TAO-3.0.10
+=====================================================
+
+. Various cleanup and using more C++11 features
+
+USER VISIBLE CHANGES BETWEEN TAO-3.0.8 and TAO-3.0.9
+====================================================
+
+. Various cleanup
+
+USER VISIBLE CHANGES BETWEEN TAO-3.0.7 and TAO-3.0.8
+====================================================
+
+. Moved operators<<= and >>= for CORBA::Any to the CORBA namespace.
+  This makes the code compatible with GCC 12 and removes the need for
+  both the -fdelayed-template-parsing workaround (for clang) and defining
+  ACE_ANY_OPS_USE_NAMESPACE in config-macos*.h.
+
+. Removed unused configuration option ACE_ANY_OPS_USE_NAMESPACE
+
+USER VISIBLE CHANGES BETWEEN TAO-3.0.6 and TAO-3.0.7
+====================================================
+
+. Fixed an issue with handling spaces in paths for TAO_IDL
+
+. TAO_IDL: Fix open file error not mentioning the filename and not checking if
+  the file is actually a directory.
+
+USER VISIBLE CHANGES BETWEEN TAO-3.0.5 and TAO-3.0.6
+====================================================
+
+. Various cleanup and using more C++11 features
+
+. Fixed compilation error in the TAO core when using C++20
+
+USER VISIBLE CHANGES BETWEEN TAO-3.0.4 and TAO-3.0.5
+====================================================
+
+. TAO_IDL: Fix bug where floating point constant expressions fail to evaluate.
+  This bug was introduced in 3.0.3
+
 USER VISIBLE CHANGES BETWEEN TAO-3.0.3 and TAO-3.0.4
 ====================================================
 
+. Various cleanup and using more C++11 features
+
 USER VISIBLE CHANGES BETWEEN TAO-3.0.2 and TAO-3.0.3
 ====================================================
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 7c4a699c462..c45772d00a7 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 3.0.3
-    ACE VERSION: 7.0.3
+    TAO VERSION: 3.0.10
+    ACE VERSION: 7.0.10
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index e2803ef69af..2c5ee1816c4 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -1344,7 +1344,7 @@ AST_Decl::set_name (UTL_ScopedName *n)
 }
 
 Identifier *
-AST_Decl::local_name ()
+AST_Decl::local_name () const
 {
   return this->pd_local_name;
 }
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 276f0f66cac..7249d745843 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -98,6 +98,7 @@ AST_Expression::eval_kind_to_expr_type (AST_Expression::EvalKind eval_kind)
     case EK_long:
       return EV_long;
     case EK_ulong:
+    case EK_positive_int:
       return EV_ulong;
     case EK_longlong:
       return EV_longlong;
@@ -113,9 +114,13 @@ AST_Expression::eval_kind_to_expr_type (AST_Expression::EvalKind eval_kind)
       return EV_int8;
     case EK_uint8:
       return EV_uint8;
-    default:
+    case EK_const:
+      idl_global->err ()->misc_error ("eval_kind_to_expr_type can't handle EK_const");
       return EV_none;
     }
+
+  idl_global->err ()->misc_error ("eval_kind_to_expr_type unhandled EvalKind");
+  return EV_none;
 }
 
 // Helper function to fill out the details of where this expression
@@ -1650,7 +1655,8 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
     case AST_Expression::EK_uint8:
       retval = coerce_value (newval, AST_Expression::EV_uint8);
       break;
-    default:
+    case AST_Expression::EK_floating_point:
+      retval = coerce_value (newval, AST_Expression::EV_double);
       break;
   }
 
@@ -1736,7 +1742,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
       return nullptr;
     }
 
-  ExprType const expr_type = eval_kind_to_expr_type (ek);
+  ExprType const expr_type = ek == EK_const ?
+    pd_v1->ev ()->et : eval_kind_to_expr_type (ek);
   if (expr_type == EV_none) return nullptr;
 
   ACE_NEW_RETURN (retval,
@@ -1806,7 +1813,7 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
       break;
 
     default:
-      success = true;
+      break;
     }
 
   if (!success)
@@ -1818,6 +1825,17 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
   return retval;
 }
 
+template <typename Type>
+bool
+do_eval_mod_op (Type a, Type b, Type &result)
+{
+  if (b == 0) {
+    return false;
+  }
+  result = a % b;
+  return true;
+}
+
 // Apply binary operators to an AST_Expression after evaluating
 // its sub-expressions.
 // Operations supported: '%'
@@ -1839,79 +1857,74 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
       return nullptr;
     }
 
+  ExprType const expr_type = ek == EK_const ?
+    pd_v1->ev ()->et : eval_kind_to_expr_type (ek);
+  if (expr_type == EV_none) return nullptr;
+
   ACE_NEW_RETURN (retval,
                   AST_ExprValue,
                   nullptr);
 
-  if (ek == EK_ulonglong)
+  pd_v1->set_ev (pd_v1->coerce (expr_type));
+  pd_v2->set_ev (pd_v2->coerce (expr_type));
+  retval->et = expr_type;
+
+  bool success = false;
+  switch (expr_type)
     {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulonglong));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulonglong));
-      retval->et = EV_ulonglong;
+    case EV_int8:
+      success = do_eval_mod_op<ACE_CDR::Int8> (
+        pd_v1->ev ()->u.int8val, pd_v2->ev ()->u.int8val, retval->u.int8val);
+      break;
 
-      if (this->pd_v2->ev ()->u.ullval == 0)
-        {
-          delete retval;
-          retval = nullptr;
-          return nullptr;
-        }
+    case EV_uint8:
+      success = do_eval_mod_op<ACE_CDR::UInt8> (
+        pd_v1->ev ()->u.uint8val, pd_v2->ev ()->u.uint8val, retval->u.uint8val);
+      break;
 
-      retval->u.ullval =
-        this->pd_v1->ev ()->u.ullval % this->pd_v2->ev ()->u.ullval;
-    }
-  else if (ek == EK_longlong)
-    {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_longlong));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_longlong));
-      retval->et = EV_longlong;
+    case EV_short:
+      success = do_eval_mod_op<ACE_CDR::Short> (
+        pd_v1->ev ()->u.sval, pd_v2->ev ()->u.sval, retval->u.sval);
+      break;
 
-      if (this->pd_v2->ev ()->u.llval == 0)
-        {
-          delete retval;
-          retval = nullptr;
-          return nullptr;
-        }
+    case EV_ushort:
+      success = do_eval_mod_op<ACE_CDR::UShort> (
+        pd_v1->ev ()->u.usval, pd_v2->ev ()->u.usval, retval->u.usval);
+      break;
 
-      retval->u.llval =
-        this->pd_v1->ev ()->u.llval % this->pd_v2->ev ()->u.llval;
-    }
-  else if (ek == EK_ulong)
-    {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulong));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulong));
-      retval->et = EV_ulong;
+    case EV_long:
+      success = do_eval_mod_op<ACE_CDR::Long> (
+        pd_v1->ev ()->u.lval, pd_v2->ev ()->u.lval, retval->u.lval);
+      break;
 
-      if (this->pd_v2->ev ()->u.ulval == 0)
-        {
-          delete retval;
-          retval = nullptr;
-          return nullptr;
-        }
+    case EV_ulong:
+      success = do_eval_mod_op<ACE_CDR::ULong> (
+        pd_v1->ev ()->u.ulval, pd_v2->ev ()->u.ulval, retval->u.ulval);
+      break;
 
-      retval->u.ulval =
-        this->pd_v1->ev ()->u.ulval % this->pd_v2->ev ()->u.ulval;
-    }
-  else if (ek == EK_long)
-    {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_long));
-      retval->et = EV_long;
+    case EV_longlong:
+      success = do_eval_mod_op<ACE_CDR::LongLong> (
+        pd_v1->ev ()->u.llval, pd_v2->ev ()->u.llval, retval->u.llval);
+      break;
 
-      if (this->pd_v2->ev ()->u.lval == 0)
-        {
-          delete retval;
-          retval = nullptr;
-          return nullptr;
-        }
+    case EV_ulonglong:
+      success = do_eval_mod_op<ACE_CDR::ULongLong> (
+        pd_v1->ev ()->u.ullval, pd_v2->ev ()->u.ullval, retval->u.ullval);
+      break;
+
+    case EV_octet:
+      success = do_eval_mod_op<ACE_CDR::Octet> (
+        pd_v1->ev ()->u.oval, pd_v2->ev ()->u.oval, retval->u.oval);
+      break;
 
-      retval->u.lval =
-        this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval;
+    default:
+      break;
     }
-  else
+
+  if (!success)
     {
       delete retval;
       retval = nullptr;
-      return nullptr;
     }
 
   return retval;
@@ -1991,9 +2004,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
   pd_v2->set_ev (pd_v2->coerce (expr_type));
   retval->et = expr_type;
 
-  bool success = true;
+  bool success = false;
   switch (expr_type)
-  {
+    {
     case EV_int8:
       success = do_eval_bit_op<ACE_CDR::Int8> (pd_ec,
         pd_v1->ev ()->u.int8val, pd_v2->ev ()->u.int8val, retval->u.int8val);
@@ -2045,8 +2058,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
       break;
 
     default:
-      success = true;
-  }
+      break;
+    }
 
   if (!success)
     {
@@ -2163,10 +2176,10 @@ AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
         case EV_octet:
           retval->u.oval = ~this->pd_v1->ev ()->u.oval;
           break;
-        case AST_Expression::EV_int8:
+        case EV_int8:
           retval->u.int8val = ~pd_v1->ev ()->u.int8val;
           break;
-        case AST_Expression::EV_uint8:
+        case EV_uint8:
           retval->u.uint8val = ~pd_v1->ev ()->u.uint8val;
           break;
         default:
@@ -2372,8 +2385,21 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_fixed:
       tmp = this->eval_internal (EK_fixed_point);
       break;
-    default:
-      tmp = this->eval_internal (EK_const);
+    case EV_float:
+    case EV_double:
+    case EV_longdouble:
+      tmp = eval_internal (EK_floating_point);
+      break;
+    case EV_char:
+    case EV_wchar:
+    case EV_string:
+    case EV_wstring:
+    case EV_enum:
+    case EV_any:
+    case EV_object:
+    case EV_void:
+      tmp = eval_internal (EK_const);
+    case EV_none:
       break;
   }
 
@@ -2457,7 +2483,8 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_uint8:
       copy->u.uint8val = this->pd_ev->u.uint8val;
       break;
-    default:
+    case EV_any:
+    case EV_object:
       break;
   }
 
@@ -2677,29 +2704,33 @@ dump_expr_val (ACE_OSTREAM_TYPE &o, AST_Expression::AST_ExprValue *ev)
     {
     case AST_Expression::EV_short:
       o << ev->u.sval;
-      break;
+      return;
     case AST_Expression::EV_ushort:
       o << ev->u.usval;
-      break;
+      return;
     case AST_Expression::EV_long:
       o << ev->u.lval;
-      break;
+      return;
     case AST_Expression::EV_ulong:
     case AST_Expression::EV_enum:
       o << ev->u.ulval;
-      break;
+      return;
     case AST_Expression::EV_float:
       o << ev->u.fval;
-      break;
+      return;
     case AST_Expression::EV_double:
       o << ev->u.dval;
-      break;
+      return;
     case AST_Expression::EV_char:
       o << ev->u.cval;
-      break;
+      return;
     case AST_Expression::EV_wchar:
-      o << ev->u.wcval;
+#ifdef ACE_HAS_CPP20
       break;
+#else
+      o << ev->u.wcval;
+      return;
+#endif
     case AST_Expression::EV_octet:
       {
         std::ios saved (nullptr);
@@ -2707,10 +2738,10 @@ dump_expr_val (ACE_OSTREAM_TYPE &o, AST_Expression::AST_ExprValue *ev)
         o << "0x" << std::hex << std::setw (2) << std::setfill ('0') << unsigned (ev->u.oval);
         o.copyfmt (saved);
       }
-      break;
+      return;
     case AST_Expression::EV_bool:
       o << (ev->u.bval == true ? "TRUE" : "FALSE");
-      break;
+      return;
     case AST_Expression::EV_string:
       if (ev->u.strval != nullptr)
         {
@@ -2720,25 +2751,32 @@ dump_expr_val (ACE_OSTREAM_TYPE &o, AST_Expression::AST_ExprValue *ev)
         {
           o << "(null string)";
         }
-      break;
+      return;
     case AST_Expression::EV_longlong:
       o << ev->u.llval;
-      break;
+      return;
     case AST_Expression::EV_ulonglong:
       o << ev->u.ullval;
-      break;
+      return;
     case AST_Expression::EV_fixed:
       o << ev->u.fixedval;
-      break;
+      return;
     case AST_Expression::EV_int8:
       o << static_cast<short> (ev->u.int8val);
-      break;
+      return;
     case AST_Expression::EV_uint8:
       o << static_cast<unsigned short> (ev->u.uint8val);
+      return;
+    case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wstring:
+    case AST_Expression::EV_any:
+    case AST_Expression::EV_object:
+    case AST_Expression::EV_void:
+    case AST_Expression::EV_none:
       break;
-    default:
-      o << "(Can not dump this type)";
     }
+
+    o << "(Can not dump type " << AST_Expression::exprtype_to_string (ev->et) << ")";
 }
 
 // Dump an AST_Expression node to the ostream o.
@@ -2840,6 +2878,7 @@ AST_Expression::dump (ACE_OSTREAM_TYPE &o)
         o << ACE_TEXT ("(nil symbolic name)");
       break;
     case EC_none:
+      o << ACE_TEXT ("(none)");
       break;
     default:
       o << ACE_TEXT ("unsupported dump mode for expression with ec == ")
@@ -3046,9 +3085,9 @@ AST_Expression::exprtype_to_string (ExprType t)
     return "uint8";
   case AST_Expression::EV_int8:
     return "int8";
-  default:
-    return "<UNKNOWN TYPE>";
   }
+
+  return "<UNKNOWN TYPE>";
 }
 
 AST_Enum *
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 282635fe6f9..578b56704f7 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -185,17 +185,10 @@ AST_Type::has_constructor (bool value)
     }
 }
 
-// This code works. However, whether we should generate the
-// ACE_NESTED_CLASS macro or not should be based on an option to the
-// compiler. The previous version generated a relative path.
-// This version always generates ACE_NESTED_CLASS, (leave ace/ACE.h and friends
-// do the porting)
-//
 // Caution: returns the same buffer pointer even if the contents may change
 // in the next call.  (return std::string anyone?)
 //
-// Return the type name using the ACE_NESTED_CLASS macro
-
+// Return the type name
 const char *
 AST_Type::nested_type_name (AST_Decl *use_scope,
                             const char *suffix,
@@ -242,16 +235,13 @@ AST_Type::nested_name (const char* local_name,
   // Some compilers do not like generating a fully scoped name for a type that
   // was defined in the same enclosing scope in which it was defined. For such,
   // we emit a macro defined in the ACE library.
-  //
 
   // The tricky part here is that it is not enough to check if the
   // typename we are using was defined in the current scope. But we
   // need to ensure that it was not defined in any of our ancestor
-  // scopes as well. If that is the case, then we can generate a fully
-  // scoped name for that type, else we use the ACE_NESTED_CLASS macro.
+  // scopes as well.
 
   // Thus we need some sort of relative name to be generated.
-
   if (this->nested_type_name_ == nullptr)
     {
       ACE_NEW_RETURN (this->nested_type_name_,
@@ -288,9 +278,7 @@ AST_Type::nested_name (const char* local_name,
   // Traverse every component of the def_scope and use_scope beginning at the
   // root and proceeding towards the leaf trying to see if the components
   // match. Continue until there is a match and keep accumulating the path
-  // traversed. This forms the first argument to the ACE_NESTED_CLASS
-  // macro. Whenever there is no match, the remaining components of the
-  // def_scope form the second argument.
+  // traversed.
 
   // This adds the global double colon for type names using the canonical
   // CORBA namespace, replacing the ad hoc spot
diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp
index f0e70503289..15c3a059435 100644
--- a/TAO/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp
@@ -30,7 +30,6 @@ AST_ValueBox::boxed_type () const
 void
 AST_ValueBox::dump (ACE_OSTREAM_TYPE &o)
 {
-
   this->dump_i (o, "valuetype ");
 
   this->local_name ()->dump (o);
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index beb3256d603..8f2a04f8ffc 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -52,10 +52,6 @@ be_array::be_array (UTL_ScopedName *n,
     }
 }
 
-be_array::~be_array ()
-{
-}
-
 int
 be_array::create_name ()
 {
@@ -267,7 +263,7 @@ be_array::gen_ostream_operator (TAO_OutStream *os,
       AST_Expression *expr = this->dims ()[i];
 
       // Generate a loop for each dimension.
-      *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < "
+      *os << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < "
           << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl
           << "{" << be_idt_nl
           << "if (i" << i << " != 0)" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index b94578fc1a9..715ce0199e2 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -145,9 +145,7 @@ TAO_CodeGen::start_client_header (const char *fname)
       return -1;
     }
 
-  *this->client_header_ << be_nl << "// TAO_IDL - Generated from" << be_nl
-                        << "// " << __FILE__ << ":" << __LINE__
-                        << be_nl_2;
+  TAO_INSERT_COMMENT (this->client_header_);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->client_header_);
@@ -334,7 +332,16 @@ TAO_CodeGen::start_client_header (const char *fname)
   // Begin versioned namespace support after initial headers have been
   // included, but before the inline file and post include
   // directives.
-  *this->client_header_ << be_global->versioning_begin ();
+  //
+  // Just for the client header, which is included first,
+  // the versioned namespace is opened, closed, and opened again.
+  // This is needed because tao_idl will generate code as if there is no
+  // versioned namespace wrapping the mapped types.  The 'using namespace'
+  // that appears in the END macro allows these types to be referenced from
+  // the global namespace.
+  *this->client_header_ << be_global->versioning_begin ()
+                        << be_global->versioning_end ()
+                        << be_global->versioning_begin ();
 
   return 0;
 }
@@ -362,9 +369,7 @@ TAO_CodeGen::start_client_stubs (const char *fname)
       return -1;
     }
 
-  *this->client_stubs_ << be_nl << "// TAO_IDL - Generated from" << be_nl
-                       << "// " << __FILE__ << ":" << __LINE__
-                       << be_nl_2;
+  TAO_INSERT_COMMENT (this->client_stubs_);
 
   this->gen_stub_src_includes ();
 
@@ -446,10 +451,7 @@ TAO_CodeGen::start_server_header (const char *fname)
       return -1;
     }
 
-  *this->server_header_ << be_nl
-                        << "// TAO_IDL - Generated from" << be_nl
-                        << "// " << __FILE__ << ":" << __LINE__
-                        << be_nl_2;
+  TAO_INSERT_COMMENT (this->server_header_);
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_header_);
@@ -575,12 +577,7 @@ TAO_CodeGen::start_server_template_header (const char *fname)
       return -1;
     }
 
-  *this->server_template_header_ << be_nl
-                                 << "// TAO_IDL - Generated from"
-                                 << be_nl
-                                 << "// " << __FILE__
-                                 << ":" << __LINE__
-                                 << be_nl_2;
+  TAO_INSERT_COMMENT (this->server_template_header_);
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_header_);
@@ -631,9 +628,7 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
       return -1;
     }
 
-  *this->server_skeletons_ << be_nl_2 << "// TAO_IDL - Generated from"
-                           << be_nl << "// " << __FILE__ << ":" << __LINE__
-                           << be_nl_2;
+  TAO_INSERT_COMMENT (this->server_skeletons_);
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_skeletons_);
@@ -693,10 +688,7 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       return -1;
     }
 
-  *this->server_template_skeletons_ << be_nl << "// TAO_IDL - Generated from"
-                                    << be_nl << "// "
-                                    << __FILE__ << ":" << __LINE__
-                                    << be_nl_2;
+  TAO_INSERT_COMMENT (this->server_template_skeletons_);
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_skeletons_);
@@ -772,10 +764,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
       return 0;
     }
 
-  *this->anyop_header_ << be_nl
-                       << "// TAO_IDL - Generated from" << be_nl
-                       << "// " << __FILE__ << ":" << __LINE__
-                       << be_nl_2;
+  TAO_INSERT_COMMENT (this->anyop_header_);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->anyop_header_);
@@ -1007,10 +996,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_header_;
 
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_svnt_header_);
@@ -1110,10 +1096,7 @@ TAO_CodeGen::start_ciao_svnt_source (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_source_;
 
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_svnt_source_);
@@ -1153,10 +1136,7 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_template_header_;
 
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_svnt_template_header_);
@@ -1235,10 +1215,7 @@ TAO_CodeGen::start_ciao_svnt_template_source (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_template_source_;
 
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_svnt_template_source_);
@@ -1442,10 +1419,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_conn_header_;
 
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_conn_header_);
@@ -1514,10 +1488,7 @@ TAO_CodeGen::start_ciao_conn_source (const char *fname)
 
   TAO_OutStream &os = *this->ciao_conn_source_;
 
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_conn_source_);
@@ -1593,10 +1564,7 @@ TAO_CodeGen::start_implementation_header (const char *fname)
       return -1;
     }
 
-  *this->implementation_header_ << be_nl << "// TAO_IDL - Generated from"
-                                << be_nl << "// "
-                                << __FILE__ << ":" << __LINE__
-                                << be_nl_2;
+  TAO_INSERT_COMMENT (this->implementation_header_);
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->implementation_header_);
@@ -1650,10 +1618,7 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
       return -1;
     }
 
-  *this->implementation_skeleton_ << be_nl << "// TAO_IDL - Generated from"
-                                  << be_nl << "// "
-                                  << __FILE__ << ":" << __LINE__
-                                  << be_nl_2;
+  TAO_INSERT_COMMENT (this->implementation_skeleton_);
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->implementation_skeleton_);
@@ -1680,9 +1645,7 @@ TAO_CodeGen::end_client_header ()
 {
   // Generate the <<= and >>= operators here.
 
-  *this->client_header_ << be_nl_2 << "// TAO_IDL - Generated from"
-                        << be_nl << "// " << __FILE__ << ":"
-                        << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (this->client_header_);
 
   // End versioned namespace support before remaining include
   // directives at end of file.
@@ -1824,9 +1787,7 @@ TAO_CodeGen::end_implementation_header (const char *fname)
 int
 TAO_CodeGen::end_server_template_header ()
 {
-  *this->server_template_header_ << be_nl_2 << "// TAO_IDL - Generated from"
-                                 << be_nl << "// "
-                                 << __FILE__ << ":" << __LINE__ << "\n";
+  TAO_INSERT_COMMENT (this->server_template_header_);
 
   // End versioned namespace support.  Do not place include directives
   // before this.
@@ -2223,7 +2184,7 @@ TAO_CodeGen::gen_export_file (const char *filename,
       return;
     }
 
-  ACE_CString stem_str (macro_str.substr (0, stem_len));;
+  ACE_CString stem_str (macro_str.substr (0, stem_len));
   const char *stem = stem_str.c_str ();
 
   os << "\n#ifndef " << stem << "_EXPORT_H\n"
@@ -2377,7 +2338,6 @@ TAO_CodeGen::gen_stub_hdr_includes ()
                                this->client_header_);
 
 
-
   if (idl_global->abstract_iface_seen_ || idl_global->abstractbase_seen_)
     {
       // Include the AbstractBase file from the Valuetype library.
@@ -3764,7 +3724,7 @@ TAO_CodeGen::make_rand_extension (char * const t)
   size_t const NUM_CHARS = ACE_OS::strlen (t);
 
   /// Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to
-  /// ACE_Time_Value::msec(void) to avoid truncation.
+  /// ACE_Time_Value::msec() to avoid truncation.
   ACE_UINT64 msec;
 
   /// Use a const ACE_Time_Value to resolve ambiguity between
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index 5262752f986..ab9406ecdbd 100644
--- a/TAO/TAO_IDL/be/be_component.cpp
+++ b/TAO/TAO_IDL/be/be_component.cpp
@@ -233,7 +233,7 @@ be_component::scan (UTL_Scope *s)
             this->mirror_scan (mp->port_type ());
             continue;
           case AST_Decl::NT_attr:
-            a = dynamic_cast<AST_Attribute*> (d);;
+            a = dynamic_cast<AST_Attribute*> (d);
 
             if (!a->readonly ())
               {
@@ -410,7 +410,7 @@ be_component::mirror_scan (AST_PortType *pt)
 
             continue;
           case AST_Decl::NT_attr:
-            a = dynamic_cast<AST_Attribute*> (d);;
+            a = dynamic_cast<AST_Attribute*> (d);
 
             if (!a->readonly ())
               {
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index 541792d3e0c..3fcadb0a14c 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -485,7 +485,6 @@ be_generator::create_structure (UTL_ScopedName *n,
 AST_StructureFwd *
 be_generator::create_structure_fwd (UTL_ScopedName *n)
 {
-
   AST_Structure *full_defn = this->create_structure (n,
                                                      false,
                                                      false);
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index b29c9a85154..752cb0f9da8 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -62,6 +62,8 @@ BE_GlobalData::BE_GlobalData ()
     stripped_filename_ (nullptr),
     core_versioning_begin_ (core_versioned_ns_begin),
     core_versioning_end_ (core_versioned_ns_end),
+    anyops_versioning_begin_ (core_versioning_begin_ + "namespace CORBA {\n"),
+    anyops_versioning_end_ ("\n}" + core_versioning_end_),
     versioning_begin_ (),
     versioning_end_ (),
     versioning_include_ (),
@@ -1150,6 +1152,9 @@ BE_GlobalData::versioning_end (const char * s)
   this->core_versioning_begin_ =
     this->versioning_end_ + // Yes, "end".
     core_versioned_ns_begin;
+
+  this->anyops_versioning_begin_ =
+    this->core_versioning_begin_ + "namespace CORBA {\n";
 }
 
 void
@@ -1164,7 +1169,8 @@ BE_GlobalData::versioning_begin (const char * s)
     core_versioned_ns_end
     + this->versioning_begin_;  // Yes, "begin".
 
-  // Yes, "begin".
+  this->anyops_versioning_end_ =
+    "\n}" + this->core_versioning_end_;
 }
 
 const char *
@@ -1179,6 +1185,18 @@ BE_GlobalData::core_versioning_end () const
   return this->core_versioning_end_.c_str ();
 }
 
+const char *
+BE_GlobalData::anyops_versioning_begin () const
+{
+  return this->anyops_versioning_begin_.c_str ();
+}
+
+const char *
+BE_GlobalData::anyops_versioning_end () const
+{
+  return this->anyops_versioning_end_.c_str ();
+}
+
 // Set the client_hdr_ending.
 void
 BE_GlobalData::client_hdr_ending (const char* s)
@@ -3743,4 +3761,3 @@ BE_GlobalData::parse_args (long &i, char **av)
         idl_global->parse_args_exit (1);
     }
 }
-
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 274da06bb2e..ec79ce3ee3b 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -319,6 +319,13 @@ TAO_OutStream::operator<< (const char *str)
 }
 
 TAO_OutStream &
+TAO_OutStream::operator<< (char ch)
+{
+  ACE_OS::fprintf (this->fp_, "%c", ch);
+  return *this;
+}
+
+TAO_OutStream &
 TAO_OutStream::operator<< (const ACE_CString &str)
 {
   ACE_OS::fprintf (this->fp_, "%s", str.c_str ());
@@ -644,3 +651,9 @@ TAO_OutStream::print (AST_Expression *expr)
   return *this;
 }
 
+void TAO_OutStream::insert_comment (const char *file, int line)
+{
+  *this << be_nl << "// TAO_IDL - Generated from" << be_nl
+        << "// " << file << ':' << static_cast<ACE_CDR::ULong> (line)
+        << be_nl_2;
+}
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index af681500bcf..2e79519140c 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -435,8 +435,7 @@ be_interface::relative_name (const char *localname,
   // The tricky part here is that it is not enough to check if the
   // typename we are using was defined in the current scope. But we
   // need to ensure that it was not defined in any of our ancestor
-  // scopes as well. If that is the case, then we can generate a fully
-  // scoped name for that type, else we use the ACE_NESTED_CLASS macro.
+  // scopes as well.
 
   // Thus we need some sort of relative name to be generated.
 
@@ -465,10 +464,7 @@ be_interface::relative_name (const char *localname,
   // Traverse every component of the def_scope and use_scope beginning at the
   // root and proceeding towards the leaf trying to see if the components
   // match. Continue until there is a match and keep accumulating the path
-  // traversed. This forms the first argument to the ACE_NESTED_CLASS
-  // macro. Whenever there is no match, the remaining components of the
-  // def_scope form the second argument.
-
+  // traversed.
   ACE_OS::strcpy (def_name,
                   localname);
   ACE_OS::strcpy (use_name,
@@ -619,7 +615,6 @@ be_interface::gen_def_ctors_helper (be_interface* node,
                                     be_interface* base,
                                     TAO_OutStream *os)
 {
-
   static int first = 0;
 
   if (node != base)
@@ -744,8 +739,7 @@ be_interface::gen_var_out_seq_decls ()
   const char *lname = this->local_name ();
   TAO_OutStream *os = tao_cg->client_header ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the ifdefined macro for this interface.
   os->gen_ifdef_macro (this->flat_name (),
@@ -1856,8 +1850,7 @@ be_interface::gen_gperf_things (const char *flat_name)
 
   TAO_OutStream *os = tao_cg->server_skeletons ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the correct class definition for the operation lookup
   // strategy. Then, get the lookup method from GPERF. And then,
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 6308a89c696..04e8801b112 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -254,8 +254,7 @@ be_type::gen_common_varout (TAO_OutStream *os)
       return;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   AST_Type::SIZE_TYPE st = this->size_type ();
 
@@ -294,9 +293,7 @@ be_type::gen_stub_decls (TAO_OutStream *os)
       return;
     }
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   AST_Interface *i = dynamic_cast<AST_Interface*> (this);
   AST_ValueType *v = dynamic_cast<AST_ValueType*> (this);
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index f13367ddab0..01ecb59fbdd 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -187,7 +187,6 @@ be_union::destroy ()
   this->be_scope::destroy ();
   this->be_type::destroy ();
   this->AST_Union::destroy ();
-
 }
 
 // Visitor method.
diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp
index cc605a4e5c1..e735a1916cc 100644
--- a/TAO/TAO_IDL/be/be_util.cpp
+++ b/TAO/TAO_IDL/be/be_util.cpp
@@ -519,10 +519,6 @@ be_util::usage ()
       ACE_TEXT (" -Wb,obv_opt_accessor\t\t\t\toptimizes access to base class ")
       ACE_TEXT ("data in valuetypes\n")
     ));
-#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
-     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
-  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
-     && TAO_HAS_VERSIONED_NAMESPACE == 1)
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Wb,versioning_begin\t\t\tSet text that opens a ")
@@ -538,7 +534,6 @@ be_util::usage ()
       ACE_TEXT (" -Wb,versioning_include\t\t\tSet text that will be used as include for ")
       ACE_TEXT ("a \"versioned\" namespace\n")
     ));
-#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Wb,no_fixed_err\t\t\tDon't generate an error when the fixed")
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index c5955d0024f..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();
@@ -451,9 +449,7 @@ be_valuetype::gen_helper_header (char *, char *)
 {
   TAO_OutStream *os = tao_cg->client_header ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -482,8 +478,7 @@ be_valuetype::gen_helper_inline (char *, char *)
   // is not getting generated... Actually this is a much bigger
   // problem. Just hacking  it up for the timebeing..
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "#if defined (__ACE_INLINE__)" << be_nl_2
       << be_global->core_versioning_begin () << be_nl
@@ -508,8 +503,10 @@ be_valuetype::gen_helper_stubs (char *, char *)
 {
   TAO_OutStream *os = tao_cg->client_stubs ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
+
+  *os << be_nl
+      << be_global->core_versioning_begin ();
 
   *os << "void" << be_nl
       << "CORBA::add_ref (" << this->full_name () << " * vt)" << be_nl
@@ -529,6 +526,9 @@ be_valuetype::gen_helper_stubs (char *, char *)
       << "}" << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_nl
+      << be_global->core_versioning_end () << be_nl;
+
   return 0;
 }
 
@@ -560,8 +560,7 @@ be_valuetype::gen_var_out_seq_decls ()
 
   TAO_OutStream *os = tao_cg->client_header ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the ifdefined macro for this interface.
   os->gen_ifdef_macro (this->flat_name (),
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 87b095402ab..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);
@@ -738,7 +737,6 @@ be_visitor_amh_pre_proc::generate_name (ACE_CString &destination,
 }
 
 
-
 be_operation *
 be_visitor_amh_pre_proc::generate_get_operation (be_attribute *node)
 {
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_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index c759000c029..86a28c1b5c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -61,9 +61,7 @@ be_visitor_arg_traits::visit_root (be_root *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl
       << be_global->core_versioning_begin ();
@@ -141,8 +139,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   std::string guard_suffix =
     std::string (this->S_) + std::string ("arg_traits");
@@ -156,7 +153,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
       << "class "
       << " " << this->S_ << "Arg_Traits< ::"
       << node->name () << ">" << be_idt_nl
-      << ": public" << be_idt << be_idt_nl
+      << ": public "
       << "Object_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl
       << "::" << node->name () << "_ptr," << be_nl
       << "::" << node->name () << "_var," << be_nl
@@ -169,8 +166,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
     }
 
   *os << "," << be_nl << this->insert_policy ()
-      << be_uidt_nl
-      << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
+      << ">" << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
 
@@ -245,9 +241,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (&os);
 
   os << be_nl_2
       << "template<>" << be_nl
@@ -301,9 +295,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (&os);
 
   std::string guard_suffix =
     std::string (this->S_) + std::string ("arg_traits");
@@ -425,8 +417,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
         {
           TAO_OutStream *os = this->ctx_->stream ();
 
-          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__;
+          TAO_INSERT_COMMENT (os);
 
           std::string guard_suffix =
             std::string (this->S_) + std::string ("arg_traits");
@@ -505,8 +496,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   std::string guard_suffix =
     std::string (this->S_) + std::string ("arg_traits");
@@ -585,8 +575,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   std::string guard_suffix =
     std::string (this->S_) + std::string ("arg_traits");
@@ -679,8 +668,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
       return 0;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   bool use_vec = (node->unbounded () && be_global->alt_mapping ());
   UTL_ScopedName *sn = alias->name ();
@@ -898,8 +886,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "template<>" << be_nl
@@ -941,8 +928,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
   // multiple declarations.
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "template<>" << be_nl
@@ -1052,8 +1038,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
   // multiple declarations.
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "template<>" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
index 5bad138dd40..639a59eb870 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -153,7 +153,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
   {
     case AST_PredefinedType::PT_any:
       *os << any_deref;
-      // fallthrough
+      ACE_FALLTHROUGH;
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_object:
       *os << lname << var_call;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index f8505ad354a..de4f218b6f7 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -432,7 +432,6 @@ be_visitor_args_vardecl_ss::emit_common (
 }
 
 
-
 int
 be_visitor_args_vardecl_ss::emit_common2 (be_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
index ed5cb8e796f..b03606ba3f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
@@ -18,10 +18,6 @@ be_visitor_array_any_op_ch::be_visitor_array_any_op_ch (
 {
 }
 
-be_visitor_array_any_op_ch::~be_visitor_array_any_op_ch ()
-{
-}
-
 int
 be_visitor_array_any_op_ch::visit_array (be_array *node)
 {
@@ -33,17 +29,16 @@ be_visitor_array_any_op_ch::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << "_forany &);" << be_nl;
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << "_forany &);";
 
-  *os << be_global->core_versioning_end () << be_nl;
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index cd6b9c256c3..3390d8f9154 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -18,10 +18,6 @@ be_visitor_array_any_op_cs::be_visitor_array_any_op_cs (
 {
 }
 
-be_visitor_array_any_op_cs::~be_visitor_array_any_op_cs ()
-{
-}
-
 int
 be_visitor_array_any_op_cs::visit_array (be_array *node)
 {
@@ -32,11 +28,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
@@ -46,6 +38,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
   // type is inserted into an Any and then marshaled.
   if (node->is_local ())
     {
+      *os << be_global->core_versioning_begin () << be_nl;
+
       *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
@@ -70,16 +64,20 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "}";
+
+      *os << be_global->core_versioning_end () << be_nl;
     }
 
+  *os << be_global->anyops_versioning_begin () << be_nl;
+
   // If this is non-zero, we want to call its tc_name()
   // for the TypeCode to pass to the Any operator impls.
   be_typedef *td = this->ctx_->tdef ();
 
   *os << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << "_forany &_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->name () << "_forany &_tao_elem)" << be_uidt_nl
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl
       << node->name () << "_slice," << be_nl
@@ -98,8 +96,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
 
   *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << node->name () << "_forany &_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->name () << "_forany &_tao_elem)" << be_uidt_nl
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl
@@ -109,11 +107,11 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "_tao_any," << be_nl
       << node->name () << "_forany::_tao_any_destructor," << be_nl
       << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
-      << "_tao_elem.out ()" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt << be_uidt_nl
+      << "_tao_elem.out ());" << be_uidt
+      << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_stub_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index bfcec987fbd..af79385e5d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -17,10 +17,6 @@ be_visitor_array_ch::be_visitor_array_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array_ch::~be_visitor_array_ch ()
-{
-}
-
 int be_visitor_array_ch::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
@@ -48,8 +44,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   AST_Decl::NodeType nt = bt->node_type ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-               << "// " __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // If we contain an anonymous sequence,
   // generate code for the sequence here.
@@ -275,7 +270,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       // Typedefed array.
       *os << storage_class.c_str() << node->nested_type_name (scope, "_slice")
           << " *" << be_nl;
-      *os << node->nested_type_name (scope, "_alloc") << " (void);"
+      *os << node->nested_type_name (scope, "_alloc") << " ();"
           << be_nl_2;
       *os << storage_class.c_str() << "void" << be_nl
           << node->nested_type_name (scope, "_free")
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index eafc05c4e2d..eccbf541505 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -16,10 +16,6 @@ be_visitor_array_ci::be_visitor_array_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array_ci::~be_visitor_array_ci ()
-{
-}
-
 int be_visitor_array_ci::visit_array (be_array *node)
 {
   // Nothing to do if we are imported or code is already generated.
@@ -143,8 +139,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the array traits specialization definitions,
   // guarded by #ifdef on unaliased array element type and length.
@@ -261,7 +256,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       if (expr->ev ()->et == AST_Expression::EV_ulong)
         {
           // Generate a loop for each dimension.
-          *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < "
+          *os << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < "
               << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl
               << "{" << be_idt_nl;
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 5904cbcf719..b4987cd21c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -16,10 +16,6 @@ be_visitor_array_cs::be_visitor_array_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array_cs::~be_visitor_array_cs ()
-{
-}
-
 int be_visitor_array_cs::visit_array (be_array *node)
 {
   // Nothing to do if we are imported or code is already generated.
@@ -90,8 +86,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // dup method.
   *os << fname << "_slice *" << be_nl
@@ -173,7 +168,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
       if (expr->ev ()->et == AST_Expression::EV_ulong)
         {
           // Generate a loop for each dimension.
-          *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < "
+          *os << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < "
               << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl
               << "{" << be_idt_nl;
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
index b65ee3bf8c8..08b67645d47 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
@@ -95,8 +95,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
index aabe94ec294..363c7b1d0cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -159,8 +159,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -603,7 +602,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
       if (expr->ev ()->et == AST_Expression::EV_ulong)
         {
           // Generate a loop for each dimension.
-          *os << be_nl << "for ( ::CORBA::ULong i" << i
+          *os << be_nl << "for (::CORBA::ULong i" << i
               << " = 0; i" << i << " < "
               << expr->ev ()->u.ulval << " && _tao_marshal_flag; ++i" << i
               << ")" << be_idt_nl
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 2b0c7d847eb..014fd2f28ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -1487,7 +1487,6 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name,
 int
 be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
 {
-
   UTL_Scope *s = node->defined_in ();
 
   UTL_ScopedName *consumer_name =
@@ -1799,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/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
index b890516c0a1..71278e46fc7 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
@@ -29,7 +29,6 @@ be_visitor_component_exs::~be_visitor_component_exs ()
 int
 be_visitor_component_exs::visit_component (be_component *node)
 {
-
   if (node->imported ())
     {
       return 0;
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_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
index 3b1355474cb..bc19dd0ce0d 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
@@ -96,7 +96,6 @@ be_visitor_context_svts::visit_connector (be_connector *node)
 int
 be_visitor_context_svts::visit_uses (be_uses *node)
 {
-
   ACE_CString prefix (this->ctx_->port_prefix ());
   prefix += node->local_name ()->get_string ();
   const char *port_name = prefix.c_str ();
@@ -160,7 +159,7 @@ be_visitor_context_svts::visit_publishes (be_publishes *node)
       << port_name << " (" << be_idt_nl
       << "::" << fname << "Consumer_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
+      << "if (::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
@@ -284,7 +283,7 @@ be_visitor_context_svts::visit_emits (be_emits *node)
       << " (" << be_idt_nl
       << "::" << fname << "Consumer_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
+      << "if (::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
@@ -307,7 +306,7 @@ be_visitor_context_svts::visit_emits (be_emits *node)
       << "{" << be_idt_nl
       << "::" << fname << "Consumer_var ciao_emits_" << port_name << " =" << be_idt_nl
       << "this->ciao_emits_" << port_name << "_consumer_._retn ();" << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (ciao_emits_"
+      << "if (::CORBA::is_nil (ciao_emits_"
       << port_name << ".in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::NoConnection ();" << be_uidt_nl
@@ -343,7 +342,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj,
       << port_name << " (" << be_idt_nl
       << "::" << fname << "_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
+      << "if (::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
@@ -365,7 +364,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj,
       << "{" << be_idt_nl
       << "::" << fname << "_var ciao_uses_" << port_name << " =" << be_idt_nl
       << "this->ciao_uses_" << port_name << "_._retn ();" << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (ciao_uses_"
+      << "if (::CORBA::is_nil (ciao_uses_"
       << port_name << ".in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::NoConnection ();" << be_uidt_nl
@@ -434,7 +433,7 @@ be_visitor_context_svts::gen_uses_multiplex (
       << port_name << " (" << be_idt_nl
       << "::" << fname << "_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
+      << "if (::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index 412debc236a..40f2d026a1e 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -338,7 +338,6 @@ Exec_Attr_Decl_Generator::emit (
   TAO_OutStream *  /*os*/,
   be_interface * base_interface)
 {
-
   // Even though this call seems unaware of CCM types, the
   // visitor must inherit from be_visitor_component_scope so
   // it will pick up attributes via porttypes.
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
index d2d93264f93..88323b99c55 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
@@ -21,10 +21,6 @@ be_visitor_executor_exs::be_visitor_executor_exs (
 {
 }
 
-be_visitor_executor_exs::~be_visitor_executor_exs ()
-{
-}
-
 int
 be_visitor_executor_exs::visit_operation (be_operation *node)
 {
@@ -219,7 +215,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
           << "reactor = orb->orb_core ()->reactor ();"
           << be_uidt_nl << "}"
           << be_uidt << be_uidt_nl << "}"
-          << be_uidt_nl << "if (reactor == 0)" << be_idt_nl
+          << be_uidt_nl << "if (!reactor)" << be_idt_nl
           << "{" << be_idt_nl
           << "throw ::CORBA::INTERNAL ();"
           << be_uidt_nl << "}"
@@ -286,7 +282,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
       << "this->ciao_context_ =" << be_idt_nl
       << global << sname << "::CCM_" << lname
       << "_Context::_narrow (ctx);" << be_uidt << be_nl_2
-      << "if ( ::CORBA::is_nil (this->ciao_context_.in ()))"
+      << "if (::CORBA::is_nil (this->ciao_context_.in ()))"
       << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::INTERNAL ();" << be_uidt_nl
@@ -354,7 +350,7 @@ be_visitor_executor_exs::visit_provides (be_provides *node)
       << node_->local_name () << "_exec_i::get_"
       << port_name << " ()" << be_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (this->ciao_" << port_name
+      << "if (::CORBA::is_nil (this->ciao_" << port_name
       << "_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << lname << "_exec_i *tmp {};" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index 9fbd6a8de25..4dd9b33267b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -17,10 +17,6 @@ be_visitor_servant_svh::be_visitor_servant_svh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_servant_svh::~be_visitor_servant_svh ()
-{
-}
-
 int
 be_visitor_servant_svh::visit_component (be_component *node)
 {
@@ -339,7 +335,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
       os_ << be_nl_2
           << "/// Inherited from ::Components::EventConsumerBase." << be_nl
           << "virtual void" << be_nl
-          << "push_event ( ::Components::EventBase * ev);";
+          << "push_event (::Components::EventBase * ev);";
 
       os_ << be_nl_2
           << "/// Get component implementation." << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index 3f081adcfb4..34f73a86050 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -17,10 +17,6 @@ be_visitor_servant_svs::be_visitor_servant_svs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_servant_svs::~be_visitor_servant_svs ()
-{
-}
-
 int
 be_visitor_servant_svs::visit_component (be_component *node)
 {
@@ -123,7 +119,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
           << be_uidt_nl
           << "{" << be_idt_nl;
 
-      os_ << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)"
+      os_ << "for (::CORBA::ULong i = 0; i < descr.length (); ++i)"
           << be_idt_nl
           << "{" << be_idt_nl
           << "const char * descr_name = descr[i]->name ();"
@@ -668,7 +664,7 @@ be_visitor_servant_svs::gen_provides_top ()
       << "const char * name)" << be_uidt_nl
       << "{" << be_idt_nl;
 
-  os_ << "if (name == 0)" << be_idt_nl
+  os_ << "if (!name)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
       << "}" << be_uidt << be_nl_2;
@@ -678,7 +674,7 @@ be_visitor_servant_svs::gen_provides_top ()
       << "::" << sname_str << global << "CCM_" << node_->original_local_name ()
       << "::_duplicate (this->executor_.in ());" << be_uidt << be_nl_2;
 
-  os_ << "if ( ::CORBA::is_nil (executor.in ()))"
+  os_ << "if (::CORBA::is_nil (executor.in ()))"
       << be_idt_nl
       << "{"<< be_idt_nl
       << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
@@ -717,7 +713,7 @@ be_visitor_servant_svs::gen_publishes_top ()
           << be_uidt_nl
           << "{" << be_idt_nl;
 
-      os_ << "if (publisher_name == 0)" << be_idt_nl
+      os_ << "if (!publisher_name)" << be_idt_nl
           << "{" << be_idt_nl
           << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
           << "}" << be_uidt;
@@ -746,7 +742,7 @@ be_visitor_servant_svs::gen_publishes_top ()
           << "::Components::Cookie * ck)" << be_uidt_nl
           << "{" << be_idt_nl;
 
-      os_ << "if (publisher_name == 0)" << be_idt_nl
+      os_ << "if (!publisher_name)" << be_idt_nl
           << "{" << be_idt_nl
           << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
           << "}" << be_uidt;
@@ -823,7 +819,7 @@ be_visitor_servant_svs::gen_uses_top ()
           << "::CORBA::Object_ptr connection)" << be_uidt_nl
           << "{" << be_idt_nl;
 
-      os_ << "if (name == 0)" << be_idt_nl
+      os_ << "if (!name)" << be_idt_nl
           << "{" << be_idt_nl
           << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
           << "}" << be_uidt;
@@ -853,7 +849,7 @@ be_visitor_servant_svs::gen_uses_top ()
           << (this->node_->has_uses_multiple () ? "ck" : "/* ck */")
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
-          << "if (name == 0)" << be_idt_nl
+          << "if (!name)" << be_idt_nl
           << "{" << be_idt_nl
           << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
           << "}" << be_uidt;
@@ -940,7 +936,7 @@ be_visitor_servant_svs::gen_emits_top ()
       << be_uidt_nl
       << "{" << be_idt_nl;
 
-  os_ << "if (emitter_name == 0)" << be_idt_nl
+  os_ << "if (!emitter_name)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
       << "}" << be_uidt;
@@ -968,7 +964,7 @@ be_visitor_servant_svs::gen_emits_top ()
       << "const char * source_name)" << be_uidt_nl
       << "{" << be_idt_nl;
 
-  os_ << "if (source_name == 0)" << be_idt_nl
+  os_ << "if (!source_name)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
       << "}" << be_uidt;
@@ -1269,7 +1265,7 @@ be_visitor_disconnect_block::visit_uses (be_uses *node)
 
   if (is_multiple)
     {
-      os_ << "if (ck == 0)" << be_idt_nl
+      os_ << "if (!ck)" << be_idt_nl
           << "{" << be_idt_nl
           << "throw ::Components::CookieRequired ();" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
index c7f28aeccf3..bf3f4090c93 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
@@ -261,7 +261,7 @@ be_visitor_component_scope::gen_svnt_entrypoint_defn ()
       << "_var x =" << be_idt_nl
       << global << sname << "::CCM_" << lname
       << "::_narrow (p);" << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (x.in ()))" << be_idt_nl
+      << "if (::CORBA::is_nil (x.in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
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/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
index bea0ef5deb2..4f908a21ac1 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
@@ -85,7 +85,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
   ACE_CString half_stripped_name (
     connector_name.substr (0, connector_name.find ("_Connector")));
 
-  os_ << half_stripped_name.c_str () <<  "_exec_i *facet_exec_0_;" << be_nl;;
+  os_ << half_stripped_name.c_str () <<  "_exec_i *facet_exec_0_;" << be_nl;
 
   ACE_CString double_stripped_name (
      half_stripped_name.substr (ACE_OS::strlen ("AMI4CCM_")));
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 c8cd22615a1..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
@@ -79,7 +79,6 @@ be_visitor_facet_ami_exh::visit_provides (be_provides *node)
 int
 be_visitor_facet_ami_exh::visit_attribute (be_attribute *node)
 {
-
   be_operation get_op (node->field_type (),
                        AST_Operation::OP_noflags,
                        node->name (),
@@ -219,9 +218,7 @@ be_visitor_facet_ami_exh::init (bool for_impl)
 int
 be_visitor_facet_ami_exh::gen_reply_handler_class ()
 {
-  os_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
+  TAO_INSERT_COMMENT (&os_);
 
   const char *suffix = "_reply_handler";
   this->init (false);
@@ -271,8 +268,7 @@ be_visitor_facet_ami_exh::gen_reply_handler_class ()
 int
 be_visitor_facet_ami_exh::gen_facet_executor_class ()
 {
-    os_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (&os_);
 
   const char *suffix = "_exec_i";
   const char *scope_name =
@@ -324,7 +320,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class ()
      sync_iface->get_insert_queue ().enqueue_tail (sync_iface);
 
 
-
      Facet_AMI_ExecH_Op_Attr_Generator op_attr_gen (this);
      int status =
          sync_iface->traverse_inheritance_graph(
@@ -340,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 176da224463..04b9540766a 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
@@ -41,7 +41,6 @@ be_visitor_facet_ami_exs::visit_component (be_component *node)
 int
 be_visitor_facet_ami_exs::visit_provides (be_provides *node)
 {
-
   this->iface_ =
     dynamic_cast<be_interface*> (node->provides_type ());
 
@@ -70,7 +69,6 @@ be_visitor_facet_ami_exs::visit_provides (be_provides *node)
 int
 be_visitor_facet_ami_exs::visit_attribute (be_attribute *node)
 {
-
   be_operation get_op (node->field_type (),
                          AST_Operation::OP_noflags,
                          node->name (),
@@ -230,7 +228,6 @@ be_visitor_facet_ami_exs::init ()
   else
     this->sync_ = false;
 
-
 }
 int
 be_visitor_facet_ami_exs::gen_reply_handler_class ()
@@ -327,7 +324,6 @@ be_visitor_facet_ami_exs::gen_reply_handler_class ()
 int
 be_visitor_facet_ami_exs::gen_facet_executor_class ()
 {
-
   this->for_reply_handler_ = false;
 
   const char *suffix = "_exec_i";
@@ -386,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);
@@ -407,7 +402,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class ()
       << ScopeAsDecl (this->node_->defined_in ())->full_name ()
       << "::CCM_" << this->node_->local_name ()
       << "_Context::_narrow (ctx);" << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (this->context_.in ()))"
+      << "if (::CORBA::is_nil (this->context_.in ()))"
       << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::INTERNAL ();" << be_uidt_nl
@@ -451,7 +446,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_class ()
 int
 be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 {
-
   os_ << be_nl_2
       << "void" << be_nl
       << this->iface_->local_name () << "_reply_handler::"
@@ -537,7 +531,6 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 int
 be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
 {
-
   // do not handle not sendc operations.
   if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== nullptr)
      return 0;
@@ -647,7 +640,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
 int
 be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node)
 {
-
    if (node->is_sendc_ami())
      return 0;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
index 89701c0a0de..d8d3d370aa2 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -31,8 +31,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // If we are defined in the outermost scope, then the value is assigned
   // to us here itself, else it will be in the *.cpp file.
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
index cefc77ce40c..3be50d11c83 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -50,8 +50,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
   *os << "const ";
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
index 1a2c6dc7fd4..9fba0c53737 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
@@ -17,10 +17,6 @@ be_visitor_enum_any_op_ch::be_visitor_enum_any_op_ch (
 {
 }
 
-be_visitor_enum_any_op_ch::~be_visitor_enum_any_op_ch ()
-{
-}
-
 int
 be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
 {
@@ -32,54 +28,9 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  be_module *module = nullptr;
-
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
+  TAO_INSERT_COMMENT (os);
 
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Generate the Any <<= and >>= operators.
-          *os << be_nl_2
-              << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
-              << ");" << be_nl;
-          *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ::"
-              << node->name () << " &);";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Generate the Any <<= and >>= operators.
   *os << be_nl_2
@@ -88,12 +39,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " &);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index f6d8c7f5b35..0630b405019 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -31,8 +31,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -68,72 +67,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace corresponding
-          // to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Generate the Any <<= and >>= operator declarations
-          // Any <<= and >>= operators.
-          *os << "void operator<<= (" << be_idt << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " _tao_elem)" << be_uidt
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Basic_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt_nl
-              << "}" << be_nl_2;
-
-          *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
-              << "const ::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " &_tao_elem)" << be_uidt
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "return" << be_idt_nl
-              << "TAO::Any_Basic_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt << be_uidt_nl
-              << "}";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Generate the Any <<= and >>= operator declarations
   // Any <<= and >>= operators.
@@ -164,12 +98,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_stub_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
index 5c0e63d33ac..1c4dbbf1492 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
@@ -30,8 +30,7 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
index 5ff226289aa..2b4804fa900 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
@@ -16,10 +16,6 @@ be_visitor_enum_cdr_op_cs::be_visitor_enum_cdr_op_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_enum_cdr_op_cs::~be_visitor_enum_cdr_op_cs ()
-{
-}
-
 int
 be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
 {
@@ -30,8 +26,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
index 32f9694a2ba..7708d5e3d5a 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
@@ -22,10 +22,6 @@ be_visitor_enum_ch::be_visitor_enum_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_enum_ch::~be_visitor_enum_ch ()
-{
-}
-
 // Visit the enum_ch node and its scope.
 int
 be_visitor_enum_ch::visit_enum (be_enum *node)
@@ -40,8 +36,7 @@ be_visitor_enum_ch::visit_enum (be_enum *node)
   // Comma to be generated by the scope visitor.
   this->ctx_->comma (true);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "enum " << node->local_name () << be_nl;
   *os << "{" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
index aeaac4931ed..e06e3e6f88f 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
@@ -22,10 +22,6 @@ be_visitor_enum_cs::be_visitor_enum_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_enum_cs::~be_visitor_enum_cs ()
-{
-}
-
 // visit the Enum_cs node and its scope
 int
 be_visitor_enum_cs::visit_enum (be_enum *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
index 8d19cc74442..da793b8aa84 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
@@ -33,54 +33,10 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          *os << be_nl_2
-              << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
-              << " &); // copying version" << be_nl;
-          *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
-              << "*); // noncopying version" << be_nl;
-          *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
-              << node->name () << " *&);";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
 
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << be_nl_2
       << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
@@ -90,12 +46,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
@@ -205,4 +156,3 @@ be_visitor_exception_any_op_ch::visit_union (be_union *node)
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index c38649bd11a..db409770a97 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -33,9 +33,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -103,94 +101,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace corresponding
-          // to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Copying insertion operator.
-
-          *os << be_nl_2
-              << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Non-copying insertion operator."
-          *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Extraction to const pointer operator.
-          *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt_nl
-              << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n";
-        }
-    }
-
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Copying insertion operator.
 
@@ -242,12 +153,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
index d190c985d5e..fe0ac4e38e0 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
@@ -33,8 +33,7 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index eb400f07815..3cb9545dc75 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -44,8 +44,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index ad0751a4dad..14f8b8156af 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -37,8 +37,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2 << "class " << be_global->stub_export_macro ()
             << " " << node->local_name ()
@@ -73,9 +72,9 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
     }
 
   *os << "static " << node->local_name ()
-      << " *_downcast ( ::CORBA::Exception *);" << be_nl
+      << " *_downcast (::CORBA::Exception *);" << be_nl
       << "static const " << node->local_name ()
-      << " *_downcast ( ::CORBA::Exception const *);" << be_nl_2;
+      << " *_downcast (::CORBA::Exception const *);" << be_nl_2;
 
   *os << "static ::CORBA::Exception *_alloc ();" << be_nl_2;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index a25dc7fb3da..4e5559aa935 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -94,8 +94,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << be_uidt_nl << "}" << be_nl_2;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Default constructor.
   *os << node->name () << "::" << node->local_name ()
@@ -178,7 +177,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   // Non-const downcast method.
   *os << node->name () << " *" << be_nl;
-  *os << node->name () << "::_downcast ( ::CORBA::Exception *_tao_excp)" << be_nl;
+  *os << node->name () << "::_downcast (::CORBA::Exception *_tao_excp)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return dynamic_cast<" << node->local_name ()
       << " *> (_tao_excp);" << be_uidt_nl;
@@ -186,7 +185,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   // Const downcast method.
   *os << "const " << node->name () << " *" << be_nl;
-  *os << node->name () << "::_downcast ( ::CORBA::Exception const *_tao_excp)"
+  *os << node->name () << "::_downcast (::CORBA::Exception const *_tao_excp)"
       << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return dynamic_cast<const " << node->local_name ()
@@ -276,7 +275,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "TAO_AnyTypeCode_Adapter *adapter =" << be_idt_nl
           << "ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ("
           << "\"AnyTypeCode_Adapter\");" << be_uidt_nl
-          << "if (adapter == 0)" << be_idt_nl
+          << "if (!adapter)" << be_idt_nl
           << "{" << be_idt_nl
           // FUZZ: disable check_for_ace_log_categories
           << "TAOLIB_ERROR_RETURN ((LM_ERROR," << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index b4730800ba1..1d6042b98eb 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -47,8 +47,7 @@ be_visitor_exception_ctor::visit_exception (be_exception *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 46691909cae..29bfdc295db 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -112,10 +112,6 @@ be_visitor_field_ch::visit_array (be_array *node)
   else
     {
       // This was a typedefed array.
-      // ACE_NESTED_CLASS macro generated by nested_type_name
-      // is necessary if the struct, union, or valuetype containing this
-      // field was not defined inside a module. In such a case, VC++
-      // complains that the non-module scope is not yet fully defined.
       UTL_Scope *holds_container =
         this->ctx_->scope ()->decl ()->defined_in ();
       AST_Decl *hc_decl = ScopeAsDecl (holds_container);
@@ -171,10 +167,6 @@ be_visitor_field_ch::visit_enum (be_enum *node)
     }
 
   // This was a typedefed array.
-  // ACE_NESTED_CLASS macro generated by nested_type_name
-  // is necessary if the struct, union, or valuetype containing this
-  // field was not defined inside a module. In such a case, VC++
-  // complains that the non-module scope is not yet fully defined.
   UTL_Scope *holds_container =
     this->ctx_->scope ()->decl ()->defined_in ();
   AST_Decl *hc_decl = ScopeAsDecl (holds_container);
@@ -237,10 +229,6 @@ be_visitor_field_ch::emit_common (be_type *node)
       bt = node;
     }
 
-  // ACE_NESTED_CLASS macro generated by nested_type_name
-  // is necessary if the struct, union, or valuetype containing this
-  // field was not defined inside a module. In such a case, VC++
-  // complains that the non-module scope is not yet fully defined.
   UTL_Scope *holds_container =
     this->ctx_->scope ()->decl ()->defined_in ();
   AST_Decl *hc_decl = ScopeAsDecl (holds_container);
@@ -346,8 +334,7 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
           // Generate the anonymous sequence member typedef.
           be_decl *bs = this->ctx_->scope ()->decl ();
 
-          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+          TAO_INSERT_COMMENT (os);
 
           *os << "typedef " << bt->nested_type_name (bs)
               << " _" << this->ctx_->node ()->local_name ()
@@ -355,15 +342,9 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
         }
     }
 
-  // ACE_NESTED_CLASS macro generated by nested_type_name
-  // is not necessary in all cases.
   be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
 
   // This was a typedefed array.
-  // ACE_NESTED_CLASS macro generated by nested_type_name
-  // is necessary if the struct, union, or valuetype containing this
-  // field was not defined inside a module. In such a case, VC++
-  // complains that the non-module scope is not yet fully defined.
   UTL_Scope *holds_container =
     this->ctx_->scope ()->decl ()->defined_in ();
   AST_Decl *hc_decl = ScopeAsDecl (holds_container);
@@ -432,10 +413,6 @@ be_visitor_field_ch::visit_structure (be_structure *node)
     }
 
   // This was a typedefed array.
-  // ACE_NESTED_CLASS macro generated by nested_type_name
-  // is necessary if the struct, union, or valuetype containing this
-  // field was not defined inside a module. In such a case, VC++
-  // complains that the non-module scope is not yet fully defined.
   UTL_Scope *holds_container =
     this->ctx_->scope ()->decl ()->defined_in ();
   AST_Decl *hc_decl = ScopeAsDecl (holds_container);
@@ -519,10 +496,6 @@ be_visitor_field_ch::visit_union (be_union *node)
   *os << be_nl_2;
 
   // This was a typedefed array.
-  // ACE_NESTED_CLASS macro generated by nested_type_name
-  // is necessary if the struct, union, or valuetype containing this
-  // field was not defined inside a module. In such a case, VC++
-  // complains that the non-module scope is not yet fully defined.
   UTL_Scope *holds_container =\
     this->ctx_->scope ()->decl ()->defined_in ();
   AST_Decl *hc_decl = ScopeAsDecl (holds_container);
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
index 6d989d0bda9..bb80dfa0948 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
@@ -218,7 +218,7 @@ be_visitor_home_ex_idl::gen_implicit ()
       << "Implicit" << be_nl
       << "{" << be_idt_nl
       << "::Components::EnterpriseComponent create ()" << be_idt_nl
-      << "raises ( ::Components::CCMException);"
+      << "raises (::Components::CCMException);"
       << be_uidt << be_uidt_nl
       << "};";
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
index 805646d81b7..263f78c05ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
@@ -147,7 +147,7 @@ be_visitor_home_svs::visit_factory (be_factory *node)
           << "::_duplicate (this->executor_.in ());" << be_uidt
           << be_nl_2;
 
-      os_ << "if ( ::CORBA::is_nil (executor.in ()))" << be_idt_nl
+      os_ << "if (::CORBA::is_nil (executor.in ()))" << be_idt_nl
           << "{"<< be_idt_nl
           << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
           << "}" << be_uidt << be_nl_2;
@@ -177,7 +177,7 @@ be_visitor_home_svs::visit_factory (be_factory *node)
           << "_var _ciao_comp =" << be_idt_nl
           << global << comp_sname << "::CCM_" << comp_lname
           << "::_narrow (_ciao_ec.in ());" << be_uidt << be_nl_2
-          << "if ( ::CORBA::is_nil (_ciao_ec.in ()))" <<  be_idt_nl
+          << "if (::CORBA::is_nil (_ciao_ec.in ()))" <<  be_idt_nl
           << "{" << be_idt_nl
           << "throw ::Components::CreateFailure ();" << be_uidt_nl
           << "}" << be_uidt << be_nl_2
@@ -249,7 +249,7 @@ be_visitor_home_svs::gen_servant_class ()
           << be_uidt_nl
           << "{" << be_idt_nl;
 
-      os_ << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)"
+      os_ << "for (::CORBA::ULong i = 0; i < descr.length (); ++i)"
           << be_idt_nl
           << "{" << be_idt_nl
           << "const char * descr_name = descr[i]->name ();"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
index 7dd6916b136..bbbc1de88c0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
@@ -46,8 +46,7 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node)
       rh_skel_class_name = "POA_TAO_";
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   rh_skel_class_name += rh_base_class_name.c_str ();
 
@@ -72,8 +71,8 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node)
   *os << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << rh_skel_class_name.c_str () << " ();" << be_nl
-      << "virtual ~" << rh_skel_class_name.c_str () << " ();";
+      << rh_skel_class_name.c_str () << " () = default;" << be_nl
+      << "virtual ~" << rh_skel_class_name.c_str () << " () = default;";
 
   // Generate code for elements in the scope (e.g., operations).
   if (this->visit_scope (node) ==  -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
index c95bbdba3a1..7624f41f3dc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
@@ -64,22 +64,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node)
   ACE_CString rh_skel_class_name (rh_skel_class_name_prefix);
   rh_skel_class_name += node->local_name ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-  *os << rh_skel_full_scope_name.c_str ()
-      << "::" << rh_skel_class_name.c_str () << " ()" << be_nl
-      << ": TAO_AMH_Response_Handler ()," << be_idt_nl
-      << "::" << node->full_name () << " ()" << be_uidt << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl_2;
-
-  *os << rh_skel_full_scope_name.c_str ()
-      << "::~" << rh_skel_class_name.c_str ()
-      << " ()" << be_nl;
-  *os << "{" << be_nl;
-  *os << "}";
-
+  TAO_INSERT_COMMENT (os);
 
   // Generate code for elements in the scope (e.g., operations)
   // We'll rely on the base class (be_visitor_scope) to do the
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 995e7365f0d..4dd5df87a48 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -42,8 +42,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
   ACE_CString class_name;
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // We shall have a POA_ prefix only if we are at the topmost level.
   if (!node->is_nested ())
@@ -113,7 +112,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
   // No copy constructor for locality constraint interface.
   *os << class_name.c_str () << " (const " << class_name.c_str ()
       << "& rhs);" << be_nl
-      << "virtual ~" << class_name.c_str () << " (void);\n\n"
+      << "virtual ~" << class_name.c_str () << " () = default;\n\n"
       << be_nl
       << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2;
 
@@ -297,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/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index e792b18f3c4..6333aae01d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -61,8 +61,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
     this->generate_full_skel_name (node);
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << non_amh_name.c_str () << "*" << be_nl
       << full_skel_name
@@ -100,7 +99,6 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
 
   *os << be_uidt << be_uidt_nl
       << "}";
-
 }
 
 void
@@ -112,8 +110,7 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
     this->generate_full_skel_name (node);
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "void" << be_nl
       << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp
index ceee283915f..3b53dd70744 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp
@@ -27,9 +27,7 @@ be_visitor_ami4ccm_conn_ex_idl::visit_interface (be_interface *node)
 {
   Identifier *oln = node->original_local_name ();
 
-  os_ << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (&os_);
 
   os_ << be_nl_2
       << "module CCM_AMI::Connector_T<" << oln << ", AMI4CCM_"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp
index 4947b6291e4..76524dba839 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp
@@ -26,9 +26,7 @@ be_visitor_ami4ccm_rh_ex_idl::~be_visitor_ami4ccm_rh_ex_idl ()
 int
 be_visitor_ami4ccm_rh_ex_idl::visit_interface (be_interface *node)
 {
-  os_ << be_nl
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (&os_);
 
   os_ << be_nl_2
       << "local interface AMI4CCM_"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp
index c0bab2857f8..bdac09e87f4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp
@@ -28,9 +28,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_interface (be_interface *node)
 {
   this->iface_ = node;
 
-  os_ << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (&os_);
 
   os_ << be_nl_2
       << "local interface AMI4CCM_"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index b95446f3f0d..38a17213866 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -37,60 +37,11 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
-  be_module *module = nullptr;
-
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // emit  nested variation of any operators
-          *os << macro << " void"
-              << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-              << "_ptr); // copying" << be_nl;
-          *os << macro << " void"
-              << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-              << "_ptr *); // non-copying" << be_nl;
-          *os << macro << " ::CORBA::Boolean"
-              << " operator>>= (const ::CORBA::Any &, "
-              << node->local_name () << "_ptr &);";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
@@ -99,12 +50,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << "_ptr &);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
@@ -134,4 +80,3 @@ be_visitor_interface_any_op_ch::visit_connector (
 {
   return this->visit_interface (node);
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index b65572712f8..fd9383a8607 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -34,8 +34,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // All template specializations must be generated before the instantiations
   // in the operators.
@@ -112,87 +111,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = nullptr;
-
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace corresponding
-          // to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // emit  nested variation of any operators
-          *os << be_nl_2
-              << "/// Copying insertion." << be_nl
-              << "void" << be_nl
-              << "operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << node->local_name () << "_ptr _tao_elem)" << be_uidt_nl
-              << "{" << be_idt_nl
-              << node->local_name () << "_ptr _tao_objptr =" << be_idt_nl
-              << node->local_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
-              << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
-              << "}" << be_nl_2;
-
-          *os << "/// Non-copying insertion." << be_nl
-              << "void" << be_nl
-              << "operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << node->local_name () << "_ptr *_tao_elem)" << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << node->local_name () << "::_tao_any_destructor," << be_nl
-              << node->tc_name ()->last_component () << "," << be_nl
-              << "*_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          *os << "::CORBA::Boolean" << be_nl
-              << "operator>>= (" << be_idt << be_idt_nl
-              << "const ::CORBA::Any &_tao_any," << be_nl
-              << node->local_name () << "_ptr &_tao_elem)" << be_uidt << be_uidt_nl
-              << "{" << be_idt_nl
-              << "return" << be_idt_nl
-              << "TAO::Any_Impl_T<" << node->local_name () << ">::extract ("
-              << be_idt << be_idt_nl
-              << "_tao_any," << be_nl
-              << node->local_name () << "::_tao_any_destructor," << be_nl
-              << node->tc_name ()->last_component () << "," << be_nl
-              << "_tao_elem);" << be_uidt << be_uidt
-              << be_uidt << be_uidt_nl
-              << "}";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << be_nl_2
       << "/// Copying insertion." << be_nl
@@ -203,7 +122,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << "{" << be_idt_nl
       << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl
       << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
-      << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
+      << "_tao_any <<= std::addressof(_tao_objptr);" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "/// Non-copying insertion." << be_nl
@@ -236,12 +155,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl;
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
@@ -268,4 +182,3 @@ be_visitor_interface_any_op_cs::visit_connector (
 {
   return this->visit_interface (node);
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index 2453440ca1f..a8e5b555ff7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -37,8 +37,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index a9ac02c8953..0e4dd126a29 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -47,8 +47,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index ea9855ced65..d1235e9f0fa 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -20,9 +20,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "///////////////////////////////////////////////////////////////////////"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp
index 21130dd0ba5..3dca9ccc316 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp
@@ -24,7 +24,6 @@ be_visitor_facet_svth::~be_visitor_facet_svth ()
 int
 be_visitor_facet_svth::visit_interface (be_interface *node)
 {
-
   if (node->imported () ||
       node->svnt_src_facet_gen () ||
       idl_global->ami_connector_seen_ ||
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 102a7c67036..b875331c9f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -36,8 +36,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   AST_Component *c = dynamic_cast<AST_Component*> (node);
 
@@ -133,8 +132,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
@@ -188,7 +186,6 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       // Generate the "protected" constructor so that users cannot
       // instantiate us.
-
       if (! node->is_abstract ())
         {
           *os << "// Concrete interface only." << be_nl
@@ -218,10 +215,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       if (! node->is_abstract ())
         {
           *os << "// Concrete non-local interface only." << be_nl
-              << node->local_name () << " (" << be_idt << be_idt_nl
-              << "::IOP::IOR *ior," << be_nl
-              << "TAO_ORB_Core *orb_core);" << be_uidt
-              << be_uidt_nl << be_nl;
+              << node->local_name () << " ("
+              << "::IOP::IOR *ior, "
+              << "TAO_ORB_Core *orb_core);"
+              << be_nl << be_nl;
         }
 
       *os << "// Non-local interface only." << be_nl
@@ -243,7 +240,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   // Protected destructor.
   *os << be_nl_2
-      << "virtual ~" << node->local_name () << " ();";
+      << "virtual ~" << node->local_name () << " () = default;";
 
   // Private copy constructor and assignment operator. These are not
   // allowed, hence they are private.
@@ -410,7 +407,6 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
 
       if (d->node_type () == AST_Decl::NT_op)
         {
-
           be_operation *op = dynamic_cast<be_operation*> (d);
           op->set_local (node->is_local ());
           ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 5129d1965d2..10db08a89e3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -55,8 +55,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   if (node->is_abstract ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 072a877ecad..9ba14e43e27 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -44,8 +44,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (node->is_defined () && be_global->gen_arg_traits ())
     {
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (os);
 
       *os << be_global->core_versioning_begin ();
 
@@ -55,8 +54,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl_2
           << node->name () << "_ptr" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::duplicate ("
-          << be_idt << be_idt_nl
-          << node->name () << "_ptr p)" << be_uidt << be_uidt_nl
+          << node->name () << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "return " << node->name () << "::_duplicate (p);" << be_uidt_nl
           << "}";
@@ -64,8 +62,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl_2
           << "void" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::release ("
-          << be_idt << be_idt_nl
-          << node->name () << "_ptr p)" << be_uidt << be_uidt_nl
+          << node->name () << "_ptr p)" << be_nl
           << "{" << be_idt_nl;
 
       // Workaround for broken HP V7.4-004 on OpenVMS IA83
@@ -92,9 +89,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl_2
           << "::CORBA::Boolean" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
-          << be_idt << be_idt_nl
-          << "const " << node->name () << "_ptr p," << be_nl
-          << "TAO_OutputCDR & cdr)" << be_uidt << be_uidt_nl
+          << "const " << node->name () << "_ptr p,"
+          << "TAO_OutputCDR & cdr)" << be_nl
           << "{" << be_idt_nl
           << "return ";
 
@@ -200,15 +196,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << " ()" << be_nl;
 
       *os << "{" << be_nl;
-
-      *os << "}";
+      *os << "}" << be_nl;
     }
 
-  *os << be_nl_2
-      << node->name () << "::~" << node->local_name ()
-      << " ()" << be_nl;
-  *os << "{" << be_nl << "}" << be_nl_2;
-
   bool gen_any_destructor =
     be_global->any_support ()
     && (!node->is_local ()
@@ -391,7 +381,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (be_global->tc_support ())
     {
-
       be_visitor_context ctx = *this->ctx_;
       TAO::be_visitor_objref_typecode tc_visitor (&ctx);
 
@@ -415,8 +404,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << node->full_name () << "_ptr" << be_nl
-      << node->full_name () << "::_" << pre << " ("
-      << be_idt << be_idt_nl;
+      << node->full_name () << "::_" << pre << " (";
 
   if (node->is_abstract ())
     {
@@ -428,8 +416,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
     }
 
   *os << " _tao_objref)"
-      << be_uidt
-      << be_uidt_nl
+      << be_nl
       << "{" << be_idt_nl;
 
   if (node->is_local ())
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 448c1ebf838..0ea927be15e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -42,8 +42,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
 
   if (be_global->gen_impl_debug_info ())
     {
-      *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
     }
 
   // Now generate the class definition.
@@ -92,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_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index 0d7589dbbd4..d786778da98 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -35,8 +35,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
 
   if (be_global->gen_impl_debug_info ())
     {
-      *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
     }
 
   *os << "// Implementation skeleton constructor" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index 0dd4c94accc..9e9dcc95034 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -69,8 +69,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the skeleton class name.
   *os << be_nl_2
@@ -117,7 +116,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   // Copy constructor and destructor.
   *os << class_name.c_str () << " (const "
       << class_name.c_str () << "& rhs);" << be_nl
-      << "virtual ~" << class_name.c_str () << " ();" << be_nl_2;
+      << "virtual ~" << class_name.c_str () << " () = default;" << be_nl_2;
 
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 81256400f5f..33c5ee3bdab 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -86,8 +86,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
@@ -141,12 +140,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "{" << be_nl
       << "}" << be_nl_2;
 
-  *os << full_skel_name << "::~"
-      << local_name_prefix << node_local_name
-      << " ()" << be_nl;
-  *os << "{" << be_nl;
-  *os << "}" << be_nl;
-
   // Generate code for elements in the scope (e.g., operations).
   if (this->visit_scope (node) == -1)
     {
@@ -159,8 +152,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
@@ -359,8 +351,7 @@ be_visitor_interface_ss::this_method (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
@@ -409,8 +400,7 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index d403ce016d2..157a6386b21 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -35,8 +35,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       bt = node;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "class " << be_global->stub_export_macro ()<< " "
       << "TAO_" << node->flat_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index 2379e9acf52..37d37f6a4a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -24,7 +24,6 @@ be_visitor_interface_smart_proxy_cs::~be_visitor_interface_smart_proxy_cs ()
 
 int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 {
-
   if (be_global->gen_smart_proxies ())
     {
       TAO_OutStream *os = this->ctx_->stream ();
@@ -215,8 +214,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "return proxy;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "// Verify that an <proxy_factory_> is available else make one." << be_nl
-          << "if ("
-          <<"this->proxy_factory_ == 0)" << be_idt_nl
+          << "if (!this->proxy_factory_)" << be_idt_nl
           << "ACE_NEW_RETURN ("
           << "this->proxy_factory_," << be_idt << be_idt_nl
           << "TAO_" << node->flat_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index bc9e3aaaac4..e28fc238492 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -67,8 +67,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
     }
 
   // Now generate the class definition.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// TIE class: Refer to CORBA v2.2, Section 20.34.4" << be_nl;
   *os << "template <class T>" << be_nl;
@@ -99,7 +98,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "/// do we own it" << be_nl
       << "::CORBA::Boolean _is_owner ();" << be_nl
       << "/// set the ownership" << be_nl_2
-      << "void _is_owner ( ::CORBA::Boolean b);" << be_nl
+      << "void _is_owner (::CORBA::Boolean b);" << be_nl
       << "// overridden ServantBase operations" << be_nl
       << "PortableServer::POA_ptr _default_POA ();";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
index 7f7569743ef..156f8450123 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
@@ -75,13 +75,12 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename << " (T &t)" << be_idt_nl
       << ": ptr_ (std::addressof(t))," << be_idt_nl
-      << "poa_ ( ::PortableServer::POA::_nil ())," << be_nl
+      << "poa_ (::PortableServer::POA::_nil ())," << be_nl
       << "rel_ (false)" << be_uidt << be_uidt_nl
       << "{}" << be_nl_2;
 
@@ -89,7 +88,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << fulltiename << "<T>::" << localtiename
       << " (T &t, ::PortableServer::POA_ptr poa)" << be_idt_nl
       << ": ptr_ (std::addressof(t))," << be_idt_nl
-      << "poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl
+      << "poa_ (::PortableServer::POA::_duplicate (poa))," << be_nl
       << "rel_ (false)" << be_uidt << be_uidt_nl
       << "{}" << be_nl_2;
 
@@ -97,7 +96,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << fulltiename << "<T>::" << localtiename
       << " (T *tp, ::CORBA::Boolean release)" << be_idt_nl
       << ": ptr_ (tp)," << be_idt_nl
-      << "poa_ ( ::PortableServer::POA::_nil ())," << be_nl
+      << "poa_ (::PortableServer::POA::_nil ())," << be_nl
       << "rel_ (release)" << be_uidt << be_uidt_nl
       << "{}" << be_nl_2;
 
@@ -106,7 +105,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << " (T *tp, ::PortableServer::POA_ptr poa, ::CORBA::Boolean release)"
       << be_idt_nl
       << ": ptr_ (tp)," << be_idt_nl
-      << "poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl
+      << "poa_ (::PortableServer::POA::_duplicate (poa))," << be_nl
       << "rel_ (release)" << be_uidt << be_uidt_nl
       << "{}" << be_nl_2;
 
@@ -155,7 +154,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "}" << be_nl_2;
 
   *os << "template <class T> void" << be_nl
-      << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl
+      << fulltiename << "<T>::_is_owner (::CORBA::Boolean b)" << be_nl
       << "{" << be_idt_nl
       << "this->rel_ = b;" << be_uidt_nl
       << "}" << be_nl_2;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index 7136b8cce2e..1284b86ed48 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -45,49 +45,9 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  be_module *module = nullptr;
-
-  if (node->is_nested () &&
-      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      module = dynamic_cast<be_module*> (node->defined_in ());
-
-      if (nullptr == module)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuebox_any_op_ch::"
-                             "visit_interface_fwd - "
-                             "Error parsing nested name\n"),
-                            -1);
-        }
-
-      // Some compilers handle "any" operators in a namespace
-      // corresponding to their module, others do not.
-      *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-      be_util::gen_nested_namespace_begin (os, module);
-
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << "_ptr); // copying" << be_nl;
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << "_ptr *); // non-copying" << be_nl;
-      *os << macro << " ::CORBA::Boolean"
-          << " operator>>= (const ::CORBA::Any &, "
-          << node->local_name () << " *&);";
-
-      be_util::gen_nested_namespace_end (os, module);
-
-      // Emit #else.
-      *os << be_nl_2
-          << "#else\n\n";
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void"
       << " operator<<= (::CORBA::Any &, " << node->name ()
@@ -99,12 +59,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index 1af551c91c2..354c2ff8623 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -43,8 +43,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
index 9f27e58ac96..681fb1f8cdb 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -31,8 +31,7 @@ be_visitor_module_ch::visit_module (be_module *node)
   TAO_OutStream *os = this->ctx_->stream ();
   TAO_OutStream *aos = nullptr;
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "namespace " << node->local_name () << be_nl
       << "{" << be_idt;
@@ -41,8 +40,7 @@ be_visitor_module_ch::visit_module (be_module *node)
     {
       aos = tao_cg->anyop_header ();
 
-      *aos << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-           << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (aos);
 
       *aos << "namespace " << node->local_name () << be_nl
            << "{" << be_idt;
@@ -60,16 +58,16 @@ be_visitor_module_ch::visit_module (be_module *node)
                         -1);
     }
 
-  *os << be_uidt_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  *os << be_uidt_nl << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl
       << "} // module " << node->name ();
 
   if (be_global->gen_anyop_files ())
     {
-      *aos << be_uidt_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-           << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+      *aos << be_uidt_nl << be_nl;
+      TAO_INSERT_COMMENT (aos);
 
       *aos << be_nl
            << "} // module " << node->name () << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
index 53e787c0e30..2546eba51b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -31,8 +31,7 @@ be_visitor_module_sh::visit_module (be_module *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the skeleton class name.
 
@@ -62,12 +61,11 @@ be_visitor_module_sh::visit_module (be_module *node)
                         -1);
     }
 
-  *os << be_uidt_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  *os << be_uidt_nl << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << "} // module "
       << node->name ();
 
   return 0;
-
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
index 9017e596896..670f885ceaa 100644
--- a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
@@ -12,6 +12,7 @@
 #include "native.h"
 #include "be_visitor_typecode/typecode_decl.h"
 #include "global_extern.h"
+#include <cstring>
 
 // ********************************************************************
 // Visitor implementation for the Native type
@@ -23,11 +24,7 @@ be_visitor_native_ch::be_visitor_native_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_native_ch::~be_visitor_native_ch ()
-{
-}
-
-// Visit the native_ch node and its scope.
+/// Visit the native_ch node and its scope.
 int
 be_visitor_native_ch::visit_native (be_native *node)
 {
@@ -38,10 +35,7 @@ be_visitor_native_ch::visit_native (be_native *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__
-      << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   const char *node_name = node->full_name ();
 
@@ -71,15 +65,16 @@ be_visitor_native_ch::visit_native (be_native *node)
       // strip  the "Seq" ending to get the sample's name
       const char * node_name = node->full_name ();
       const size_t max_name_length = 2000;
-      if (ACE_OS::strlen (node_name) >= max_name_length)
+      const size_t node_name_length = std::strlen (node_name);
+      if (node_name_length >= max_name_length ||
+          node_name_length <= 3)
         {
           return -1;
         }
       char sample_name[max_name_length];
-      ACE_OS::strncpy (sample_name,
-                       node_name,
-                       ACE_OS::strlen (node_name) - 3);
-      sample_name[ACE_OS::strlen (node_name) - 3] = '\0';
+      // Copy node_name into sample_name and shorten to remove Seq suffix
+      std::strcpy (sample_name, node_name);
+      sample_name[node_name_length - 3] = '\0';
 
       *os << be_nl_2
           << "typedef ::TAO::DCPS::ZeroCopyDataSeq< "
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
index 080f6c6b715..55c754c1b2e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
@@ -56,10 +56,9 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  *os << "virtual void ";
+  *os << "void ";
 
   // Step 2: Generate the method name
   // Check if we are an attribute node in disguise.
@@ -91,7 +90,7 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << ";";
+  *os << " override;";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index 9e2e9b98cf9..ef1b11284fd 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -73,8 +73,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
   buf = nullptr;
 
   // Step 1 : Generate return type: always void
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "void" << be_nl
       << response_handler_implementation_name.c_str () << "::";
@@ -171,7 +170,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
           << "holder->raise_" << operation_name.c_str ()
           << " ();" << be_uidt_nl
           << "}" << be_nl
-          << "catch ( ::CORBA::Exception& ex)"
+          << "catch (const ::CORBA::Exception& ex)"
           << be_nl
           << "{" << be_idt_nl
           << "this->_tao_rh_send_exception (ex);" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index f926fced243..c877e53187d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -123,8 +123,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
     TAO_OutStream *os,
     const char *skel_prefix)
 {
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "static void " << skel_prefix
       << this->ctx_->port_prefix ().c_str ()
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index d188e056618..ded343c6836 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -180,7 +180,6 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
     }
 
   return 0;
-
 }
 
 int
@@ -301,8 +300,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
                                                        TAO_OutStream *os,
                                                        const char *skel_prefix)
 {
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // We need the interface node in which this operation was defined. However,
   // if this operation node was an attribute node in disguise, we get this
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index b073286e4d7..7c59fada12b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -51,8 +51,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the return type mapping. Return type is simply void.
   *os << be_nl_2
@@ -190,7 +189,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   ACE_CString::size_type len = opname.length ();
 
   *os << be_nl_2
-      << "TAO::Asynch_Invocation_Adapter _tao_call (" << be_idt << be_idt_nl
+      << "TAO::Asynch_Invocation_Adapter _invocation_call (" << be_idt << be_idt_nl
       << "this," << be_nl
       << "_the_tao_operation_signature," << be_nl
       << nargs << "," << be_nl
@@ -218,7 +217,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       << ");" << be_uidt;
 
   *os << be_nl_2
-      << "_tao_call.invoke (" << be_idt << be_idt_nl
+      << "_invocation_call.invoke (" << be_idt << be_idt_nl
       << "ami_handler," << be_nl
       << "&";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index aab0e909e4b..e24d7d6d397 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -53,8 +53,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
         }
     }
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << "void" << be_nl
       << intf->full_direct_proxy_impl_name () << "::";
@@ -130,7 +129,6 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
 }
 
 
-
 int
 be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
     be_visitor_context & /*ctx*/,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 6727ee57e58..4be92227282 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -241,7 +241,7 @@ be_visitor_operation::gen_stub_operation_body (
 
   *os << be_nl_2
       << "TAO::" << (node->is_abstract () ? "AbstractBase_" : "" )
-      << "Invocation_Adapter _tao_call (" << be_idt << be_idt_nl
+      << "Invocation_Adapter _invocation_call (" << be_idt << be_idt_nl
       << "this," << be_nl
       << "_the_tao_operation_signature," << be_nl
       << node->argument_count () + 1 << "," << be_nl
@@ -321,7 +321,7 @@ be_visitor_operation::gen_stub_operation_body (
   // case covered as well.
   if (node->exceptions ())
     {
-      *os << "_tao_call.invoke (" << be_idt << be_idt_nl
+      *os << "_invocation_call.invoke (" << be_idt << be_idt_nl
           << "_tao_" << node->flat_name ()
           << "_exceptiondata," << be_nl
           << node->exceptions ()->length () << be_uidt_nl
@@ -329,7 +329,7 @@ be_visitor_operation::gen_stub_operation_body (
     }
   else
     {
-      *os << "_tao_call.invoke (nullptr, 0);";
+      *os << "_invocation_call.invoke (nullptr, 0);";
     }
 
   if (!this->void_return_type (return_type))
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/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index ec94769a15e..0a97ddb3e8d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -84,8 +84,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
       return 0;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Retrieve the operation return type.
   be_type *bt = dynamic_cast<be_type*> (node->return_type ());
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
index 26ab9dace41..f72f65c46d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
@@ -36,8 +36,7 @@ be_visitor_operation_ih::visit_operation (be_operation *node)
 
   if (be_global->gen_impl_debug_info ())
     {
-      *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
     }
 
   // every operation is declared virtual in the client code
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
index 2de4bd8c983..8ed90f466bb 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
@@ -48,8 +48,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
 
   if (be_global->gen_impl_debug_info ())
     {
-      *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
     }
 
   be_visitor_context ctx (*this->ctx_);
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index d26e0eb61eb..4ebc3183199 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -32,8 +32,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "virtual ";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index a3256880c8e..3bccb12acba 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -164,8 +164,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
                                 intf->full_skel_name (),
                                 upcall_command_name.c_str ());
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "void " << intf->full_skel_name () << "::";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
index f238e8996d9..c2587a06faf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
@@ -118,7 +118,7 @@ be_visitor_operation_svs::gen_op_body (be_operation *node)
     }
 
   os_ << be_nl_2
-      << "if ( ::CORBA::is_nil (executor.in ()))"
+      << "if (::CORBA::is_nil (executor.in ()))"
       << be_idt_nl
       << "{"<< be_idt_nl
       << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index 87bdd4dc2da..4ccd4afe626 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -22,8 +22,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "static void" << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp
index 3a4522ffbbf..90d8bbf6583 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp
@@ -28,7 +28,6 @@ be_visitor_operation_smart_proxy_ch::~be_visitor_operation_smart_proxy_ch ()
 int
 be_visitor_operation_smart_proxy_ch::visit_operation (be_operation *node)
 {
-
   if (be_global->gen_smart_proxies ())
     {
       TAO_OutStream *os = this->ctx_->stream ();
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
index fb24e5ed20d..39fb690509f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
@@ -47,8 +47,7 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   be_visitor_context ctx (*this->ctx_);
   be_visitor_operation_rettype oro_visitor (&ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
index 6d68b3ec985..98b36380c26 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
@@ -88,8 +88,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "template <class " << template_name.c_str () << ">" << be_nl;
 
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 6cd6515a881..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
@@ -76,8 +76,7 @@ be_visitor_operation_upcall_command_ss::visit (
   // save the node.
   this->ctx_->node (node);
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the operation-specific TAO::Upcall_Command concrete
   // class.
@@ -221,9 +220,8 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
   const char *op_name = node->flat_name ();
   static const char *excep_suffix = "_excep";
   static const size_t excep_suffix_len = ACE_OS::strlen (excep_suffix);
-  bool excep_method = ((ACE_OS::strstr (op_name, excep_suffix) +
-                        excep_suffix_len) ==
-                       (op_name + ACE_OS::strlen (op_name)));
+  const char *substr = ACE_OS::strstr (op_name, excep_suffix);
+  bool excep_method = substr && substr + excep_suffix_len == op_name + ACE_OS::strlen (op_name);
 
   for (; !si.is_done (); si.next (), ++index)
     {
@@ -334,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_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
index d2cfc9934c8..100195bb188 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -152,9 +152,7 @@ be_visitor_root_ch::gen_fwd_decls ()
 {
   if (idl_global->non_local_iface_seen_)
     {
-      *o_ << be_nl_2
-          << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (o_);
 
       *o_ << be_global->core_versioning_begin () << be_nl;
 
@@ -187,9 +185,7 @@ be_visitor_root_ch::gen_ref_counting_overrides ()
   size_t index = 0;
   be_interface_fwd *ifwd = nullptr;
 
-  *o_ << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (o_);
 
   for (index = 0; index < size; ++index)
     {
@@ -233,10 +229,7 @@ be_visitor_root_ch::gen_static_corba_overrides ()
   size_t index = 0;
   AST_Interface *i = nullptr;
 
-  *o_ << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__
-      << be_nl;
+  TAO_INSERT_COMMENT (o_);
 
   *o_ << be_global->core_versioning_begin ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
index 99b145d6462..2eed2e11736 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -61,8 +61,7 @@ be_visitor_root_sth::visit_module (be_module *node)
 
   // Generate the skeleton class name.
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-               << "// " __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Now generate the class definition. The prefix POA_ is prepended to our
   // name only if we are the outermost module.
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index 5cc90dcf290..266c424cb78 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -43,8 +43,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2;
 
@@ -57,7 +56,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
       be_type *bt =
         dynamic_cast<be_type*> (node->base_type ());
 
-      name = "std::vector<";
+      name = "std::vector< ::";
       name += bt->full_name ();
       name += ">";
     }
@@ -66,70 +65,12 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
       name = node->full_name ();
     }
 
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Generate the Any <<= and >>= operators.
-          *os << macro
-              << " void"
-              << " operator<<= ( ::CORBA::Any &, const ::"
-              << name.c_str ()
-              << " &); // copying version" << be_nl;
-
-          if (!alt)
-            {
-              *os << macro
-                  << " void"
-                  << " operator<<= ( ::CORBA::Any &, ::"
-                  << name.c_str ()
-                  << "*); // noncopying version" << be_nl;
-            }
-
-          *os << macro
-              << " ::CORBA::Boolean"
-              << " operator>>= (const ::CORBA::Any &, const ::"
-              << name.c_str ()
-              << " *&);";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Generate the Any <<= and >>= operators.
   *os << macro
       << " void"
-      << " operator<<= ( ::CORBA::Any &, const "
+      << " operator<<= (::CORBA::Any &, const ::"
       << name.c_str ()
       << " &); // copying version" << be_nl;
 
@@ -137,24 +78,18 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
     {
       *os << macro
           << " void"
-          << " operator<<= ( ::CORBA::Any &, "
+          << " operator<<= (::CORBA::Any &, ::"
           << name.c_str ()
           << "*); // noncopying version" << be_nl;
     }
 
   *os << macro
       << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, const "
+      << " operator>>= (const ::CORBA::Any &, const ::"
       << name.c_str ()
       << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
-
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index a49fdcbeeb6..076280e8e6b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -40,11 +40,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   // These are no-ops for now, so we just generate them and return
   if (be_global->alt_mapping () && node->max_size ()->ev ()->u.ulval == 0)
@@ -77,10 +73,12 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           tc = ANY_OBJREF;
         }
 
+      *os << be_global->anyops_versioning_begin () << be_nl;
+
       *os << be_nl
           << "void operator<<= (" << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << "const std::vector<" << bt->full_name ()
+          << "const std::vector< ::" << bt->full_name ()
           << "> &_tao_elem)" << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::";
@@ -88,17 +86,17 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       switch (tc)
         {
         case ANY_OBJREF:
-          *os << "insert_objref_vector<"
+          *os << "insert_objref_vector< ::"
               << bt->full_name () << "_ptr> (";
 
           break;
         case ANY_ARRAY:
-          *os << "insert_array_vector<"
+          *os << "insert_array_vector< ::"
               << bt->full_name () << "_forany> (";
 
           break;
         default:
-          *os << "insert_value_vector<"
+          *os << "insert_value_vector< ::"
               << bt->full_name () << "> (";
 
           break;
@@ -112,7 +110,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       *os << be_nl_2
           << "::CORBA::Boolean operator>>= (" << be_idt_nl
           << "const ::CORBA::Any &_tao_any," << be_nl
-          << "std::vector<" << bt->full_name ()
+          << "std::vector< ::" << bt->full_name ()
           << "> &_tao_elem)" << be_uidt_nl
           << "{" << be_idt_nl
           << "return" << be_idt_nl
@@ -121,17 +119,17 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       switch (tc)
         {
         case ANY_OBJREF:
-          *os << "extract_objref_vector<"
+          *os << "extract_objref_vector< ::"
               << bt->full_name () << "_ptr> (";
 
           break;
         case ANY_ARRAY:
-          *os << "extract_array_vector<"
+          *os << "extract_array_vector< ::"
               << bt->full_name () << "_forany> (";
 
           break;
         default:
-          *os << "extract_value_vector<"
+          *os << "extract_value_vector< ::"
               << bt->full_name () << "> (";
 
           break;
@@ -143,7 +141,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "}";
 
       *os << be_nl
-          << be_global->core_versioning_end () << be_nl;
+          << be_global->anyops_versioning_end () << be_nl;
 
       node->cli_stub_any_op_gen (true);
       return 0;
@@ -157,6 +155,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   // type is inserted into an Any and then marshaled.
   if (node->is_local ())
     {
+      *os << be_global->core_versioning_begin () << be_nl;
+
       *os << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -176,114 +176,29 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "}" << be_nl;
-    }
 
-  *os << be_global->core_versioning_end () << be_nl;
+      *os << be_global->core_versioning_end () << be_nl;
+    }
 
   // If this is non-zero, we want to call its tc_name()
   // for the TypeCode to pass to the Any operator impls.
   be_typedef *td = this->ctx_->tdef ();
 
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Copying insertion.
-          *os << be_nl
-              << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Non-copying insertion.
-          *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Extraction to const pointer.
-          *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt_nl
-              << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::"  <<  node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Copying insertion.
   *os << be_nl
       << "/// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem)"
+      << "const ::" << node->name () << " &_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
+      << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
       << be_idt_nl
       << "_tao_any," << be_nl
-      << node->name () << "::_tao_any_destructor," << be_nl
-      << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
+      << "::" << node->name () << "::_tao_any_destructor," << be_nl
+      << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem);" << be_uidt
       << be_uidt_nl
       << "}" << be_nl_2;
@@ -292,14 +207,14 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   *os << "/// Non-copying insertion." << be_nl
       << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem)"
+      << "::" << node->name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
+      << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
       << be_idt_nl
       << "_tao_any," << be_nl
-      << node->name () << "::_tao_any_destructor," << be_nl
-      << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
+      << "::" << node->name () << "::_tao_any_destructor," << be_nl
+      << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem);" << be_uidt
       << be_uidt_nl
       << "}" << be_nl_2;
@@ -308,24 +223,19 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   *os << "/// Extraction to const pointer." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem)"
+      << "const ::" << node->name () << " *&_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
+      << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
       << be_idt_nl
       << "_tao_any," << be_nl
-      << node->name () << "::_tao_any_destructor," << be_nl
-      << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
+      << "::" << node->name () << "::_tao_any_destructor," << be_nl
+      << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem);" << be_uidt
       << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_stub_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index 0dd0d3522b7..e13e3d03d0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -61,8 +61,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
   be_type *bt = dynamic_cast<be_type*> (node);
   be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // If we're an anonymous sequence, we must protect against
   // being declared more than once.
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index e54fa0d0c03..1d362ba3071 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -89,8 +89,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-    << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << "#if !defined _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_" << be_nl
@@ -115,7 +114,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "::CORBA::ULong length = _tao_vector.size ();"
           << be_nl
           << "strm << length;" << be_nl_2
-          << "for ( ::CORBA::ULong i = 0UL; i < length; ++i)"
+          << "for (::CORBA::ULong i = 0UL; i < length; ++i)"
           << be_idt_nl
           << "{" << be_idt_nl
           << "if (! (strm << _tao_vector[i]))" << be_idt_nl
@@ -164,7 +163,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "_tao_vector.resize (length);" << be_nl_2
-          << "for ( ::CORBA::ULong i = 0UL; i < length; ++i)"
+          << "for (::CORBA::ULong i = 0UL; i < length; ++i)"
           << be_idt_nl
           << "{" << be_idt_nl
           << "if (! (strm >> tmp))" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index a3bb95963e2..3e280b46b43 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -95,8 +95,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   if (idl_global->dcps_sequence_type_defined (node->full_name ()))
     {
@@ -180,12 +179,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
           << "public:" << be_idt;
 
       *os << be_nl
-          << node->local_name () << " ();";
+          << node->local_name () << " () = default;";
 
       if (node->unbounded ())
         {
           *os << be_nl
-              << node->local_name () << " ( ::CORBA::ULong max);";
+              << node->local_name () << " (::CORBA::ULong max);";
         }
 
       /// If we are using std::vector, we can't implement this
@@ -230,7 +229,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
           << node->local_name () << "& operator= (" << node->local_name () << " &&) = default;"
           << be_nl;
 
-      *os << "virtual ~" << node->local_name () << " ();";
+      *os << "virtual ~" << node->local_name () << " () = default;";
 
       if (be_global->alt_mapping () && node->unbounded ())
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index 978866d68b5..5994c5bef8e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -101,17 +101,10 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   os->gen_ifdef_macro (node->flat_name ());
 
-  // default constructor
-  *os << be_nl_2
-      << node->name () << "::" << node->local_name ()
-      << " ()" << be_nl
-      << "{}";
-
   // for unbounded sequences, we have a different set of constructors
   if (node->unbounded ())
     {
@@ -201,12 +194,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
           << "{}";
   }
 
-  // Destructor.
-  *os << be_nl_2
-      << node->name () << "::~" << node->local_name ()
-      << " ()" << be_nl
-      << "{}";
-
   if (be_global->alt_mapping () && node->unbounded ())
     {
       *os << be_nl_2
@@ -218,7 +205,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 
       *os << be_nl_2
           << "void" << be_nl
-          << node->name () << "::length ( ::CORBA::ULong length)"
+          << node->name () << "::length (::CORBA::ULong length)"
           << be_nl
           << "{" << be_idt_nl
           << "this->resize (length);" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
index df8603b9463..80d1aef9cae 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
@@ -22,10 +22,6 @@ be_visitor_structure_any_op_ch::be_visitor_structure_any_op_ch (
 {
 }
 
-be_visitor_structure_any_op_ch::~be_visitor_structure_any_op_ch ()
-{
-}
-
 int
 be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
 {
@@ -38,68 +34,18 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
-              << " &); // copying version" << be_nl;
-          *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
-              << "*); // noncopying version" << be_nl;
-          *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
-              << node->name () << " *&);";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
+  TAO_INSERT_COMMENT (os);
 
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
-  *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
       << " &); // copying version" << be_nl;
-  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
-
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
@@ -188,4 +134,3 @@ be_visitor_structure_any_op_ch::visit_enum (be_enum *node)
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index aa234e85fa4..0505bb7c1dd 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -23,10 +23,6 @@ be_visitor_structure_any_op_cs::be_visitor_structure_any_op_cs (
 {
 }
 
-be_visitor_structure_any_op_cs::~be_visitor_structure_any_op_cs ()
-{
-}
-
 int
 be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
 {
@@ -38,9 +34,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
@@ -76,104 +70,19 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       *os << be_global->core_versioning_end () << be_nl;
     }
 
-
-  be_module *module = nullptr;
-  if (node->is_nested ())
-    {
-      AST_Decl *d = node;
-      AST_Decl::NodeType nt = d->node_type ();
-
-      while (nt != AST_Decl::NT_root)
-        {
-          if (nt == AST_Decl::NT_module)
-            {
-              module = dynamic_cast<be_module*> (d);
-              break;
-            }
-          else
-            {
-              d = ScopeAsDecl (d->defined_in ());
-              nt = d->node_type ();
-            }
-        }
-
-      if (module != nullptr)
-        {
-          // Some compilers handle "any" operators in a namespace corresponding
-          // to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Copying insertion.
-          *os << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);"
-              << be_uidt << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Non-copying insertion.
-          *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Extraction to const pointer.
-          *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt_nl
-              << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Copying insertion.
   *os << "/// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem)"
+      << "const ::" << node->name () << " &_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
+      << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
       << be_idt_nl
       << "_tao_any," << be_nl
-      << node->name () << "::_tao_any_destructor," << be_nl
+      << "::" << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);"
       << be_uidt << be_uidt_nl
@@ -183,13 +92,13 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
   *os << "/// Non-copying insertion." << be_nl
       << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem)"
+      << "::" << node->name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
+      << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
       << be_idt_nl
       << "_tao_any," << be_nl
-      << node->name () << "::_tao_any_destructor," << be_nl
+      << "::" << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);"
       << be_uidt << be_uidt_nl
@@ -199,24 +108,19 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
   *os << "/// Extraction to const pointer." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem)"
+      << "const ::" << node->name () << " *&_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
+      << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
       << be_idt_nl
       << "_tao_any," << be_nl
-      << node->name () << "::_tao_any_destructor," << be_nl
+      << "::" << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);"
       << be_uidt << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
index 4c873c0e7ec..a3c6bffa5c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
@@ -17,16 +17,11 @@
 // ***************************************************************************
 
 be_visitor_structure_cdr_op_ch::be_visitor_structure_cdr_op_ch (
-    be_visitor_context *ctx
-  )
+    be_visitor_context *ctx)
   : be_visitor_structure (ctx)
 {
 }
 
-be_visitor_structure_cdr_op_ch::~be_visitor_structure_cdr_op_ch ()
-{
-}
-
 int
 be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node)
 {
@@ -39,8 +34,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index ed19672a653..2327f40ae93 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -45,8 +45,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
index ecd2ee05479..f1626f3d2cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
@@ -16,10 +16,6 @@ be_visitor_structure::be_visitor_structure (be_visitor_context *ctx)
 {
 }
 
-be_visitor_structure::~be_visitor_structure ()
-{
-}
-
 int
 be_visitor_structure::visit_structure (be_structure *)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
index 24bbbdf3550..73ccf1f1a89 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -44,8 +44,7 @@ int be_visitor_structure_ch::visit_structure (be_structure *node)
 
   *os << be_nl_2;
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "struct " << be_global->stub_export_macro () << " "
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index 29028da44cb..f7652d69f8e 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -52,8 +52,7 @@ be_visitor_structure_cs::visit_structure (be_structure *node)
       TAO_OutStream *os = this->ctx_->stream ();
 
       *os << be_nl_2;
-      *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
 
       *os << "void" << be_nl
           << node->name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
index 59dce19e81c..6e3a9d6a249 100644
--- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
@@ -34,8 +34,7 @@ be_visitor_template_export::visit_root (be_root *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index ae8161b414b..305be5d4107 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -55,9 +55,7 @@ be_visitor_traits::visit_root (be_root *node)
     {
       TAO_OutStream *os = this->ctx_->stream ();
 
-      *os << be_nl_2
-          << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (os);
 
       *os << be_nl
           << be_global->core_versioning_begin ();
@@ -128,14 +126,13 @@ be_visitor_traits::visit_interface (be_interface *node)
           << " ::" << fname << ">" << be_nl
           << "{" << be_idt_nl
           << "static ::" << fname << "_ptr duplicate ("
-          << be_idt << be_idt_nl
-          << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl
-          << "static void release (" << be_idt << be_idt_nl
-          << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl
+          << "::" << fname << "_ptr p);" << be_nl
+          << "static void release ("
+          << "::" << fname << "_ptr p);" << be_nl
           << "static ::" << fname << "_ptr nil ();" << be_nl
-          << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl
-          << "const ::" << fname << "_ptr p," << be_nl
-          << "TAO_OutputCDR & cdr);" << be_uidt  << be_uidt << be_uidt_nl
+          << "static ::CORBA::Boolean marshal ("
+          << "const ::" << fname << "_ptr p,"
+          << "TAO_OutputCDR & cdr);" << be_uidt_nl
           << "};";
 
       os->gen_endif ();
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
index 59636667018..3638b222ea6 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
@@ -25,7 +25,6 @@ TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node)
 
 
   return this->common (node, base, "tk_alias");
-
 }
 
 
@@ -44,9 +43,7 @@ TAO::be_visitor_alias_typecode::common (be_type * node,
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
index 1e641558d78..394eebd109f 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
@@ -24,9 +24,7 @@ TAO::be_visitor_enum_typecode::visit_enum (be_enum * node)
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (&os);
 
   ACE_CString const tao_enumerators ("_tao_enumerators_");
   ACE_CString const enumerators_name (tao_enumerators
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
index 74177b36dbc..fdaf252ac51 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
@@ -65,9 +65,7 @@ TAO::be_visitor_objref_typecode::visit_i (char const * kind,
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Generate the TypeCode instantiation.
   os
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
index ff909252566..3455662f9f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -81,9 +81,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
   this->is_nested_ = true;
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   if (this->gen_member_typecodes (node) != 0)
     {
@@ -107,7 +105,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
     {
       // Should only be possible for user exceptions with no fields.
       os << "* const " << be_idt_nl
-         << fields_name.c_str () << " = 0;" << be_uidt_nl << be_uidt_nl;
+         << fields_name.c_str () << " = nullptr;" << be_uidt_nl << be_uidt_nl;
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
index 46b547a446b..ff485166b9e 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -30,8 +30,7 @@ be_visitor_typecode_decl::visit_type (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // If -GA is used but anyop macro isn't set, defaults to stub macro.
   const char *export_macro = (be_global->gen_anyop_files ()
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 9696d002830..63944a3a422 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -293,9 +293,7 @@ be_visitor_typecode_defn::visit_array (be_array *node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // generate typecode for the base type
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
@@ -456,9 +454,7 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // generate typecode for the base type
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
@@ -551,9 +547,7 @@ be_visitor_typecode_defn::visit_string (be_string * node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   // Multiple definition guards.
   // @todo Can we automate duplicate detection within the IDL compiler
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
index 4ed2f4d340a..d32a9d21b71 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
@@ -60,9 +60,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   be_type * const discriminant_type =
     dynamic_cast<be_type*> (node->disc_type ());
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
index 0fce2fa7734..6b711d34a80 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -60,9 +60,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl_2
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   if (this->gen_member_typecodes (node) != 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index 11ece6e78d2..888c585b085 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -175,8 +175,7 @@ be_visitor_typedef_ch::visit_array (be_array *node)
     }
   else
     {
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
 
       // Base type is simply an alias to an array node. Simply output the
       // required typedefs.
@@ -286,8 +285,7 @@ be_visitor_typedef_ch::visit_enum (be_enum *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // typedef the type and the _slice type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -317,8 +315,7 @@ be_visitor_typedef_ch::visit_interface (be_interface *node)
       bt = node;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Typedef the object.
   *os << "typedef " << bt->nested_type_name (scope) << " "
@@ -366,8 +363,7 @@ be_visitor_typedef_ch::visit_predefined_type (be_predefined_type *node)
       bt = node;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Typedef the type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -400,8 +396,7 @@ be_visitor_typedef_ch::visit_string (be_string *node)
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if (node->width () == (long) sizeof (char))
     {
@@ -459,8 +454,7 @@ be_visitor_typedef_ch::visit_sequence (be_sequence *node)
     }
   else
     {
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      TAO_INSERT_COMMENT (os);
 
       // Typedef the type.
       *os << "typedef " << bt->nested_type_name (scope)
@@ -506,8 +500,7 @@ be_visitor_typedef_ch::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Typedef the type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -552,8 +545,7 @@ be_visitor_typedef_ch::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Typedef the type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -585,8 +577,7 @@ be_visitor_typedef_ch::visit_valuebox (be_valuebox *node)
       bt = node;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Typedef the object.
   *os << "typedef " << bt->nested_type_name (scope) << " "
@@ -621,8 +612,7 @@ be_visitor_typedef_ch::visit_valuetype (be_valuetype *node)
       bt = node;
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Typedef the object.
   *os << "typedef " << bt->nested_type_name (scope) << " "
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index b8b2a3eedc9..a3e6369128c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -33,57 +33,9 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  be_module *module = nullptr;
-
-  AST_Decl *decl = node;
-  if (decl->is_nested ())
-    {
-      if (node->defined_in ()->scope_node_type () == AST_Decl::NT_interface)
-        {
-          be_interface *intf = nullptr;
-          intf = dynamic_cast<be_interface*> (node->defined_in ());
-          decl = intf;
-        }
-
-      if (decl->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-        {
-          module = dynamic_cast<be_module*> (decl->defined_in ());
-
-          if (!module)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_union_any_op_ch::"
-                                 "visit_union - "
-                                 "Error parsing nested name\n"),
-                                -1);
-            }
-
-          // Some compilers handle "any" operators in a namespace
-          // corresponding to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-
-          *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
-              << " &); // copying version" << be_nl;
-          *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
-              << "*); // noncopying version" << be_nl;
-          *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
-              << node->name () << " *&);";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
@@ -92,12 +44,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   be_visitor_context ctx (*this->ctx_);
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_localtypes);
@@ -207,4 +154,3 @@ be_visitor_union_any_op_ch::visit_structure (be_structure *node)
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index d0c95024982..034407063b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -32,9 +32,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -70,94 +68,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = nullptr;
-
-  AST_Decl *decl = node;
-  if (decl->is_nested ())
-    {
-      if (node->defined_in ()->scope_node_type () == AST_Decl::NT_interface)
-        {
-          be_interface *intf = nullptr;
-          intf = dynamic_cast<be_interface*> (node->defined_in ());
-          decl = intf;
-        }
-
-      if (decl->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-        {
-          module = dynamic_cast<be_module*> (decl->defined_in ());
-
-          if (!module)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_valuebox_any_op_cs::"
-                                 "visit_valuebox - "
-                                 "Error parsing nested name\n"),
-                                -1);
-            }
-
-          // Some compilers handle "any" operators in a namespace corresponding
-          // to their module, others do not.
-          *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-          be_util::gen_nested_namespace_begin (os, module);
-
-          // Copying insertion.
-          *os << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);"
-              << be_uidt << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Non-copying insertion.
-          *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt_nl
-              << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}" << be_nl_2;
-
-          // Extraction to const pointer.
-          *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt_nl
-              << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)"
-              << be_uidt_nl
-              << "{" << be_idt_nl
-              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt_nl
-              << "_tao_any," << be_nl
-              << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt_nl
-              << "}";
-
-          be_util::gen_nested_namespace_end (os, module);
-
-          // Emit #else.
-          *os << be_nl_2
-              << "#else\n";
-        }
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   // Copying insertion.
   *os << "/// Copying insertion." << be_nl
@@ -207,12 +118,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   be_visitor_context ctx (*this->ctx_);
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_localtypes);
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
index 142279b0dbf..9457b43b1c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
@@ -34,8 +34,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index 9072ec9a74b..fd251f41596 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -113,8 +113,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -123,8 +122,8 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
 
   *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
-      << "const " << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->name () << " &_tao_union)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   serialize_disc (os, node->udisc_type (), true /* out */);
@@ -169,8 +168,8 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
   *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
-      << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->name () << " &_tao_union)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   be_type* disc_type =
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
index 9f4f09196be..94558197453 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
@@ -63,8 +63,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // The set method.
   *os << be_nl_2
@@ -96,8 +95,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // The set method.
   *os << be_nl_2
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
index 5fe1cfe59a2..96a77ccb686 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
@@ -51,8 +51,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if ((dv.computed_ != 0) && (bu->default_index () == -1))
     {
@@ -141,8 +140,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if ((dv.computed_ != 0) && (bu->default_index () == -1))
     {
@@ -203,7 +201,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
       << "// Accessor to set the discriminant." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
-      << bu->name () << "::_d ( ::" << bt->name ()
+      << bu->name () << "::_d (::" << bt->name ()
       << " discval)" << be_nl
       << "{" << be_idt_nl
       << "this->disc_ = discval;" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
index 3943c07a55f..31cd1ffa4bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -117,8 +117,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   if ((dv.computed_ != 0) && (node->default_index () == -1))
     {
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (os);
 
       // Only if all cases are not covered AND there is no explicit
       // default, we get the _default () method.
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index 47bab908e32..09d5c0df80b 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -32,8 +32,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// *************************************************************"
       << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index 5cfcba36781..c0ab0850bbf 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -72,8 +72,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   // Now generate the operations on the union such as the copy constructor
   // and the assignment operator.
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the copy constructor and the assignment operator here.
   *os << be_nl_2
@@ -219,7 +218,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       << node->name () << " &u)" << be_nl;
   *os << "{" << be_idt_nl;
   // First check for self-assignment.
-  *os << "if (&u == this)" << be_idt_nl
+  *os << "if (std::addressof(u) == this)" << be_idt_nl
       << "{" << be_idt_nl
       << "return *this;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
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 f02c02b38a8..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
@@ -145,7 +145,7 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
           << be_idt << be_idt_nl
           << "_tao_union_tmp" << be_uidt_nl
           << ");" << be_uidt_nl
-          << "result = strm >> _tao_union_helper;" << be_nl_2
+          << "result = strm >> _tao_union_helper;" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
@@ -203,7 +203,7 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << " _tao_union_tmp =" << be_idt_nl
           << "static_cast<" << node->name () << "> (0UL);" << be_uidt_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl_2
+          << "result = strm >> _tao_union_tmp;" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
@@ -283,7 +283,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
       else
         {
           *os << node->name () << "_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.inout ();" << be_nl_2
+              << "result = strm >> _tao_union_tmp.inout ();" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union."
@@ -363,7 +363,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
       else
         {
           *os << node->name () << "_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.inout ();" << be_nl_2
+              << "result = strm >> _tao_union_tmp.inout ();" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union."
@@ -442,7 +442,7 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << "_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp.inout ();" << be_nl_2
+          << "result = strm >> _tao_union_tmp.inout ();" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union."
@@ -506,36 +506,33 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
         {
           *os << "::CORBA::Object_var _tao_union_tmp;" << be_nl;
 
-          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl_2
+          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
         }
       else if (pt == AST_PredefinedType::PT_pseudo)
         {
           *os << "::CORBA::TypeCode_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.out ();" << be_nl_2
+              << "result = strm >> _tao_union_tmp.out ();" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
         }
       else if (pt == AST_PredefinedType::PT_value)
         {
           *os << "::CORBA::ValueBase * _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp;" << be_nl_2
+              << "result = strm >> _tao_union_tmp;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name () << " (_tao_union_tmp);";
-
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
           *os << "::CORBA::Char _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_char _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl_2
+              << "result = strm >> _tao_union_helper;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -546,7 +543,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::WChar _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_wchar _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl_2
+              << "result = strm >> _tao_union_helper;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -557,7 +554,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::Octet _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_octet _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl_2
+              << "result = strm >> _tao_union_helper;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -568,7 +565,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_boolean _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl_2
+              << "result = strm >> _tao_union_helper;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -579,7 +576,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::UInt8 _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_uint8 _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl_2
+              << "result = strm >> _tao_union_helper;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -590,7 +587,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::Int8 _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_int8 _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl_2
+              << "result = strm >> _tao_union_helper;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -599,7 +596,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else
         {
           *os << node->name () << " _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp;" << be_nl_2
+              << "result = strm >> _tao_union_tmp;" << be_nl
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -735,7 +732,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
           }
 
         *os << " _tao_union_tmp;" << be_nl
-            << "result = strm >> _tao_union_tmp;" << be_nl_2
+            << "result = strm >> _tao_union_tmp;" << be_nl
             << "if (result)" << be_idt_nl
             << "{" << be_idt_nl
             << "_tao_union."
@@ -805,19 +802,19 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node)
               *os << "result = strm >> ACE_InputCDR::to_string ("
                   << "_tao_union_tmp.out (), "
                   << node->max_size ()->ev ()->u.ulval << ");"
-                  << be_nl_2;
+                  << be_nl;
             }
           else
             {
               *os << "result = strm >> ACE_InputCDR::to_wstring ("
                   << "_tao_union_tmp.out (), "
                   << node->max_size ()->ev ()->u.ulval << ");"
-                  << be_nl_2;
+                  << be_nl;
             }
         }
       else
         {
-          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl_2;
+          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl;
         }
 
       *os << "if (result)" << be_idt_nl
@@ -913,7 +910,7 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << " _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl_2
+          << "result = strm >> _tao_union_tmp;" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
@@ -1011,7 +1008,7 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << " _tao_union_tmp"
           << ";" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl_2
+          << "result = strm >> _tao_union_tmp;" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index a9aef5adc87..c3221ecb164 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -86,8 +86,7 @@ be_visitor_union_branch_private_ch::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -136,8 +135,7 @@ be_visitor_union_branch_private_ch::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -175,8 +173,7 @@ be_visitor_union_branch_private_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -214,8 +211,7 @@ be_visitor_union_branch_private_ch::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -253,8 +249,7 @@ be_visitor_union_branch_private_ch::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -292,8 +287,7 @@ be_visitor_union_branch_private_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -331,8 +325,7 @@ be_visitor_union_branch_private_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -373,8 +366,7 @@ be_visitor_union_branch_private_ch::visit_predefined_type (
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -440,8 +432,7 @@ be_visitor_union_branch_private_ch::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -470,8 +461,7 @@ be_visitor_union_branch_private_ch::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -515,8 +505,7 @@ be_visitor_union_branch_private_ch::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
@@ -595,8 +584,7 @@ be_visitor_union_branch_private_ch::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index d4cdcda11a2..9cd5e801add 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -250,9 +250,9 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 
   bool bt_is_defined = node->is_defined ();
 
-  *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+  *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
       << "{" << be_idt_nl
-      << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+      << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl;
@@ -304,8 +304,8 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
           << "u.u_." << ub->local_name ()
           << "_->in ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl;
+          << "*this);" << be_uidt
+          << be_uidt << be_uidt_nl;
     }
 
   *os << "}" << be_uidt << be_uidt_nl;
@@ -347,9 +347,9 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
 
   bool bt_is_defined = node->full_definition ()->is_defined ();
 
-  *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+  *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
       << "{" << be_idt_nl
-      << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+      << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl;
@@ -401,8 +401,8 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
           << "u.u_." << ub->local_name ()
           << "_->in ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl;
+          << "*this);" << be_uidt
+          << be_uidt << be_uidt_nl;
     }
 
   *os << "}" << be_uidt << be_uidt_nl;
@@ -460,9 +460,9 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+  *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
       << "{" << be_idt_nl
-      << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+      << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl;
@@ -489,8 +489,8 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node)
           << "this->u_." << ub->local_name () << "_," << be_nl
           << "OBJECT_FIELD (u.u_." << ub->local_name () << "_->in ()),"
           << be_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl;
+          << "*this);" << be_uidt
+          << be_uidt << be_uidt_nl;
     }
 
   *os << "}" << be_uidt << be_uidt_nl;
@@ -542,7 +542,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
           // We are generating the copy constructor.
           *os << "ACE_NEW (" << be_idt << be_idt_nl
               << "this->u_." << ub->local_name () << "_," << be_nl
-              << "OBJECT_FIELD ( ::CORBA::Object"
+              << "OBJECT_FIELD (::CORBA::Object"
               << "::_duplicate (u.u_." << ub->local_name ()
               << "_->in ()))" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl;
@@ -552,11 +552,11 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
           // We are generating the assignment operator.
           *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
               << "this->u_." << ub->local_name () << "_," << be_nl
-              << "OBJECT_FIELD ( ::CORBA::Object"
+              << "OBJECT_FIELD (::CORBA::Object"
               << "::_duplicate (u.u_." << ub->local_name ()
               << "_->in ()))," << be_nl
-              << "*this" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl;
+              << "*this);" << be_uidt
+              << be_uidt << be_uidt_nl;
         }
 
       break;
@@ -569,9 +569,9 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
     case AST_PredefinedType::PT_any:
       if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
         {
-          *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+          *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
               << "{" << be_idt_nl
-              << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+              << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
               << "}" << be_uidt_nl
               << "else" << be_idt_nl
               << "{" << be_idt_nl
@@ -584,9 +584,9 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
         }
       else
         {
-          *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+          *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
               << "{" << be_idt_nl
-              << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+              << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
               << "}" << be_uidt_nl
               << "else" << be_idt_nl
               << "{" << be_idt_nl
@@ -594,8 +594,8 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
               << "this->u_." << ub->local_name () << "_," << be_nl
               << bt->name () << " (*u.u_."
               << ub->local_name () << "_)," << be_nl
-              << "*this" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl
+              << "*this);" << be_uidt
+              << be_uidt << be_uidt_nl
               << "}" << be_uidt << be_uidt_nl;
         }
 
@@ -644,9 +644,9 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
     {
-      *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+      *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+          << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "else" << be_idt_nl
           << "{" << be_idt_nl
@@ -659,9 +659,9 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
     }
   else
     {
-      *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+      *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+          << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "else" << be_idt_nl
           << "{" << be_idt_nl
@@ -669,8 +669,8 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
           << "this->u_." << ub->local_name () << "_," << be_nl
           << bt->name () << " (*u.u_."
           << ub->local_name () << "_)," << be_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*this);" << be_uidt
+          << be_uidt << be_uidt_nl
           << "}" << be_uidt << be_uidt_nl;
     }
 
@@ -747,9 +747,9 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
     {
       if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
         {
-          *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+          *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
               << "{" << be_idt_nl
-              << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+              << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
               << "}" << be_uidt_nl
               << "else" << be_idt_nl
               << "{" << be_idt_nl
@@ -762,9 +762,9 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
         }
       else
         {
-          *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+          *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
               << "{" << be_idt_nl
-              << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+              << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
               << "}" << be_uidt_nl
               << "else" << be_idt_nl
               << "{" << be_idt_nl
@@ -772,8 +772,8 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
               << "this->u_." << ub->local_name () << "_," << be_nl
               << bt->name () << " (*u.u_."
               << ub->local_name () << "_)," << be_nl
-              << "*this" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl
+              << "*this);" << be_uidt
+              << be_uidt << be_uidt_nl
               << "}" << be_uidt << be_uidt_nl;
         }
     }
@@ -850,9 +850,9 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
     {
-      *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+      *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+          << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "else" << be_idt_nl
           << "{" << be_idt_nl
@@ -865,9 +865,9 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
     }
   else
     {
-      *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
+      *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl
+          << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "else" << be_idt_nl
           << "{" << be_idt_nl
@@ -875,8 +875,8 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
           << "this->u_." << ub->local_name () << "_," << be_nl
           << bt->name () << " (*u.u_."
           << ub->local_name () << "_)," << be_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*this);" << be_uidt
+          << be_uidt << be_uidt_nl
           << "}" << be_uidt << be_uidt_nl;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index 566027008ec..b0bc3c2e3a1 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -108,8 +108,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
 
       ctx.state (TAO_CodeGen::TAO_ROOT_CH);
 
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (os);
 
       // Now use this array as a "type" for the subsequent declarator
       // the set method.
@@ -122,8 +121,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
     }
   else
     {
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (os);
 
       // Now use this array as a "type" for the subsequent declarator
       // the set method.
@@ -185,8 +183,7 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Now use this enum as a "type" for the subsequent declarator
   // the set method.
@@ -229,8 +226,7 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << be_nl_2
@@ -272,8 +268,7 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << be_nl_2
@@ -315,8 +310,7 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << be_nl_2
@@ -358,8 +352,7 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << be_nl_2
@@ -401,8 +394,7 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << be_nl_2
@@ -445,8 +437,7 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   switch (node->pt ())
     {
@@ -533,8 +524,7 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
                             -1);
         }
 
-      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
+      TAO_INSERT_COMMENT (os);
 
       // Generate the anonymous sequence member typedef.
       // This provides a consistent name to use instead of the
@@ -544,8 +534,7 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
           << " _" << ub->local_name () << "_seq;";
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "void " << ub->local_name () << " (const "
@@ -576,8 +565,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Three methods to set the string value
   if (node->width () == (long) sizeof (char))
@@ -594,7 +582,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
   else
     {
       *os << be_nl_2
-          << "void " << ub->local_name () << " ( ::CORBA::WChar *);" << be_nl;
+          << "void " << ub->local_name () << " (::CORBA::WChar *);" << be_nl;
       *os << "void " << ub->local_name () << " (const ::CORBA::WChar *);"
           << be_nl;
       *os << "void " << ub->local_name () << " (const ::CORBA::WString_var&);"
@@ -652,8 +640,7 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "void " << ub->local_name () << " (const "
@@ -745,8 +732,7 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "void " << ub->local_name () << " (const "
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index add0becee4e..71fb2007d3e 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -153,8 +153,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
     }
 
   // Set method.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -225,8 +224,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -296,8 +294,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -386,8 +383,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -494,8 +490,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -573,8 +568,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -627,7 +621,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
         *os << "typedef ::CORBA::Object_var OBJECT_FIELD;" << be_nl
             << "ACE_NEW (" << be_idt << be_idt_nl
             << "this->u_." << ub->local_name () << "_," << be_nl
-            << "OBJECT_FIELD ( ::CORBA::Object::_duplicate (val))"
+            << "OBJECT_FIELD (::CORBA::Object::_duplicate (val))"
             << be_uidt_nl
             << ");" << be_uidt << be_uidt_nl;
 
@@ -636,7 +630,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
         *os << "typedef ::CORBA::AbstractBase_var OBJECT_FIELD;" << be_nl
             << "ACE_NEW (" << be_idt << be_idt_nl
             << "this->u_." << ub->local_name () << "_," << be_nl
-            << "OBJECT_FIELD ( ::CORBA::AbstractBase::_duplicate (val))"
+            << "OBJECT_FIELD (::CORBA::AbstractBase::_duplicate (val))"
             << be_uidt_nl
             << ");" << be_uidt << be_uidt_nl;
 
@@ -784,8 +778,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // (1) Set from a const.
   *os << "/// Accessor to set the member." << be_nl
@@ -858,8 +851,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   // Three methods to set the string value.
 
   // (1) Set method from char* or wchar*.
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -872,7 +864,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   else
     {
       *os << bu->name () << "::" << ub->local_name ()
-          << " ( ::CORBA::WChar *val)";
+          << " (::CORBA::WChar *val)";
     }
 
   *os << be_nl
@@ -1061,8 +1053,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // (1) Set from a const.
   *os << "/// Accessor to set the member." << be_nl
@@ -1228,8 +1219,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // (1) Set from a const.
   *os << "// Accessor to set the member." << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
index 8f5be509a22..b9f92332ee8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
@@ -169,7 +169,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
 
   *os << fname << "_free (this->u_." << ub->local_name ()
       << "_);" << be_nl
-      << "this->u_." << ub->local_name () << "_ = 0;" << be_nl;
+      << "this->u_." << ub->local_name () << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -216,7 +216,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *)
   *os << "delete this->u_."
       << ub->local_name () << "_;" << be_nl
       << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -243,7 +243,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *
   *os << "delete this->u_."
       << ub->local_name () << "_;" << be_nl
       << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -271,7 +271,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox (
   *os << "delete this->u_."
       << ub->local_name () << "_;" << be_nl
       << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -299,7 +299,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype (
   *os << "delete this->u_."
       << ub->local_name () << "_;" << be_nl
       << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -327,7 +327,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd (
   *os << "delete this->u_."
       << ub->local_name () << "_;" << be_nl
       << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -359,21 +359,21 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (
       *os << "delete this->u_."
           << ub->local_name () << "_;" << be_nl;
       *os << "this->u_." << ub->local_name ()
-          << "_ = 0;" << be_nl;
+          << "_ = nullptr;" << be_nl;
 
       break;
     case AST_PredefinedType::PT_pseudo:
       *os << "::CORBA::release (this->u_."
           << ub->local_name () << "_);" << be_nl;
       *os << "this->u_." << ub->local_name ()
-          << "_ = 0;" << be_nl;
+          << "_ = nullptr;" << be_nl;
 
       break;
     case AST_PredefinedType::PT_any:
       *os << "delete this->u_."
           << ub->local_name () << "_;" << be_nl
           << "this->u_." << ub->local_name ()
-          << "_ = 0;" << be_nl;
+          << "_ = nullptr;" << be_nl;
 
       break;
     case AST_PredefinedType::PT_void:
@@ -409,7 +409,7 @@ be_visitor_union_branch_public_reset_cs::visit_sequence (
       << ub->local_name () << "_;" << be_nl
       << "this->u_."
       << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -446,7 +446,7 @@ be_visitor_union_branch_public_reset_cs::visit_string (
   *os << ub->local_name () << "_);" << be_nl
       << "this->u_."
       << ub->local_name ()
-      << "_ = 0;" << be_nl;
+      << "_ = nullptr;" << be_nl;
 
   return 0;
 }
@@ -488,7 +488,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure (
           << "_;" << be_nl
           << "this->u_."
           << ub->local_name ()
-          << "_ = 0;" << be_nl;
+          << "_ = nullptr;" << be_nl;
    }
 
   return 0;
@@ -548,7 +548,7 @@ be_visitor_union_branch_public_reset_cs::visit_union (
   *os << "delete this->u_."
       << ub->local_name () << "_;" << be_nl
       << "this->u_."
-      << ub->local_name () << "_ = 0;" << be_nl;
+      << ub->local_name () << "_ = nullptr;" << be_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
index 7d17a24f206..26d130f2c0c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
@@ -39,52 +39,9 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  be_module *module = nullptr;
-
-  if (node->is_nested () &&
-      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      module = dynamic_cast<be_module*> (node->defined_in ());
-
-      if (!module)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuebox_any_op_ch::"
-                             "visit_valuebox - "
-                             "Error parsing nested name\n"),
-                            -1);
-        }
-
-      // Some compilers handle "any" operatorrs in a namespace
-      // corresponding to their module, others do not.
-      *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-      be_util::gen_nested_namespace_begin (os, module);
-
-      // emit  nested variation of any operators
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << " *); // copying" << be_nl;
-
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << " **); // non-copying" << be_nl;
-
-      *os << macro << " ::CORBA::Boolean"
-          << " operator>>= (const ::CORBA::Any &, "
-          << node->local_name () << " *&);";
-
-      be_util::gen_nested_namespace_end (os, module);
-
-      // Emit #else.
-      *os << be_nl_2
-          << "#else\n\n";
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
@@ -95,12 +52,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
index 082faf2daf5..944af69fd18 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
@@ -42,8 +42,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   // Generate the Any <<= and >>= operator declarations
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -67,77 +66,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = nullptr;
-
-  if (node->is_nested () &&
-      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      module = dynamic_cast<be_module*> (node->defined_in ());
-
-      if (!module)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuebox_any_op_cs::"
-                             "visit_valuebox - "
-                             "Error parsing nested name\n"),
-                            -1);
-        }
-
-      // Some compilers handle "any" operators in a namespace corresponding
-      // to their module, others do not.
-      *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-      be_util::gen_nested_namespace_begin (os, module);
-
-      // emit  nested variation of any operators
-      *os << "/// Copying insertion." << be_nl
-          << "void" << be_nl
-          << "operator<<= (" << be_idt_nl
-          << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem)" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "::CORBA::add_ref (_tao_elem);" << be_nl
-          << "_tao_any <<= &_tao_elem;" << be_uidt_nl
-          << "}" << be_nl_2;
-
-      *os << "/// Non-copying insertion." << be_nl
-          << "void" << be_nl
-          << "operator<<= (" << be_idt_nl
-          << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem)" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
-          << be_idt_nl
-          << "_tao_any," << be_nl
-          << node->local_name () << "::_tao_any_destructor," << be_nl
-          << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem);" << be_uidt << be_uidt_nl
-          << "}" << be_nl_2;
-
-      *os << "::CORBA::Boolean" << be_nl
-          << "operator>>= (" << be_idt << be_idt_nl
-          << "const ::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *&_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "return" << be_idt_nl
-          << "TAO::Any_Impl_T<" << node->local_name () << ">::extract ("
-          << be_idt << be_idt_nl
-          << "_tao_any," << be_nl
-          << node->local_name () << "::_tao_any_destructor," << be_nl
-          << node->tc_name ()->last_component () << "," << be_nl
-          << "_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt << be_uidt_nl
-          << "}" << be_nl_2;
-
-      be_util::gen_nested_namespace_end (os, module);
-
-      // Emit #else.
-      *os << be_nl_2
-          << "#else\n\n";
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << "/// Copying insertion." << be_nl
       << "void" << be_nl
@@ -147,7 +76,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::add_ref (_tao_elem);" << be_nl
-      << "_tao_any <<= &_tao_elem;" << be_uidt_nl
+      << "_tao_any <<= std::addressof(_tao_elem);" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "/// Non-copying insertion." << be_nl
@@ -169,8 +98,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " *&_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << " *&_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::extract ("
@@ -178,16 +107,11 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_stub_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
index 30afffb23ee..5eba86429a6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
@@ -34,9 +34,7 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
index b1dd90b58f9..06f1f396911 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
@@ -37,10 +37,9 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
   TAO_OutStream *os = this->ctx_->stream ();
   node->cli_stub_cdr_op_gen (true);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-*os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->core_versioning_begin () << be_nl;
 
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
index fa546645e9b..b5c8612f781 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
@@ -122,8 +122,7 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node)
     }
 
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "void " << field->local_name () << " (" << fname << ");" << be_nl;
 
@@ -160,8 +159,7 @@ be_visitor_valuebox_field_ch::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_get (field, bt, "", "", "const");
@@ -196,8 +194,7 @@ be_visitor_valuebox_field_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -232,8 +229,7 @@ be_visitor_valuebox_field_ch::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -282,8 +278,7 @@ be_visitor_valuebox_field_ch::visit_predefined_type (be_predefined_type *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   switch (node->pt ())
     {
@@ -335,8 +330,7 @@ be_visitor_valuebox_field_ch::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -373,8 +367,7 @@ be_visitor_valuebox_field_ch::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_set (field, bt, "const ", "");
@@ -424,8 +417,7 @@ be_visitor_valuebox_field_ch::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -484,8 +476,7 @@ be_visitor_valuebox_field_ch::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -506,7 +497,6 @@ be_visitor_valuebox_field_ch::emit_member_set (be_decl *field,
   *os << "void " << field->local_name ()
       << " (" << const_arg << field_type->name () << arg_modifier << ");"
       << be_nl;
-
 }
 
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
index 31bbb25ea69..0251e6e9b86 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
@@ -120,8 +120,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
                        bt->full_name ());
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Modifier to set the member." << be_nl;
 
@@ -174,9 +173,7 @@ be_visitor_valuebox_field_ci::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_get (field, bt, "", "", "const", "");
@@ -211,8 +208,7 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// Modifier to set the member." << be_nl;
 
@@ -257,8 +253,7 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// Modifier to set the member." << be_nl;
 
@@ -331,8 +326,7 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   switch (node->pt ())
   {
@@ -342,7 +336,7 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node)
 
       *os << "ACE_INLINE void" << be_nl
           << vb_node_->name () << "::" << field->local_name ()
-          << " ( ::" << bt->name () << "_ptr val)"
+          << " (::" << bt->name () << "_ptr val)"
           << be_nl << "{" << be_idt_nl
           << "this->_pd_value->" << field->local_name ()
           << " = ::" << bt->name() << "::_duplicate (val);" << be_uidt_nl
@@ -393,8 +387,7 @@ be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const", "");
@@ -430,8 +423,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_set (field, bt, "const ", "");
@@ -488,8 +480,7 @@ be_visitor_valuebox_field_ci::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const", "");
@@ -544,8 +535,7 @@ be_visitor_valuebox_field_ci::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const", "");
@@ -571,7 +561,6 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *field,
       << "this->_pd_value->" << field->local_name ()
       << " = val;" << be_uidt_nl
       << "}" << be_nl_2;
-
 }
 
 void
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
index 562a4fa0dea..956ac7d7ef9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
@@ -118,8 +118,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
                        bt->full_name ());
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Modifier to set the member." << be_nl;
 
@@ -171,9 +170,7 @@ be_visitor_valuebox_union_member_ci::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_get (field, bt, "", "", "const");
@@ -208,8 +205,7 @@ be_visitor_valuebox_union_member_ci::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -244,8 +240,7 @@ be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *node
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -294,8 +289,7 @@ be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type *
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   switch (node->pt ())
   {
@@ -347,8 +341,7 @@ be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -384,8 +377,7 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_set (field, bt, "const ", "");
@@ -442,8 +434,7 @@ be_visitor_valuebox_union_member_ci::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -498,8 +489,7 @@ be_visitor_valuebox_union_member_ci::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -526,7 +516,6 @@ be_visitor_valuebox_union_member_ci::emit_member_set (
       << "this->_pd_value->" << field->local_name ()
       << " (val);" << be_uidt_nl
       << "}" << be_nl_2;
-
 }
 
 void
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index 63fbc5addff..cb3dda8c2c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -37,8 +37,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
 
   this->ctx_->node (node); // save the node
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_nl_2
       << "class " << node->local_name () << ";" ;
@@ -69,7 +68,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
   // _downcast method
   *os << be_nl_2
       << "static " << node->local_name () << "* "
-      << "_downcast ( ::CORBA::ValueBase *);" << be_nl;
+      << "_downcast (::CORBA::ValueBase *);" << be_nl;
 
   // _copy_value method
   *os << "::CORBA::ValueBase * _copy_value ();" << be_nl_2;
@@ -110,8 +109,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the "protected" destructor
 
@@ -163,8 +161,7 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor();
 
@@ -192,10 +189,10 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
 
   // Overloaded subscript operators
   *os << "const " << node->full_name ()
-      << "_slice & operator[] ( ::CORBA::ULong index) const;" << be_nl;
+      << "_slice & operator[] (::CORBA::ULong index) const;" << be_nl;
 
   *os << node->full_name ()
-      << "_slice &  operator[] ( ::CORBA::ULong index);"
+      << "_slice &  operator[] (::CORBA::ULong index);"
       << be_nl_2;
 
   // Explicit conversion functions
@@ -282,15 +279,14 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
   // Indicate that this type has been used as a sequence element.
   bt->seen_in_sequence (true);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor();
 
   if (node->unbounded ())
     {
       // Public constructor with one argument of type ULong
-      *os << vb_node->local_name () << " ( ::CORBA::ULong max);" << be_nl;
+      *os << vb_node->local_name () << " (::CORBA::ULong max);" << be_nl;
     }
 
   // Public constructor for sequence with supplied buffer
@@ -347,7 +343,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
                           "base type visit failed\n"),
                          -1);
     }
-  *os << "& operator[] ( ::CORBA::ULong index);" << be_nl;
+  *os << "& operator[] (::CORBA::ULong index);" << be_nl;
 
   // Generate base type for sequence then remainder of operator []
   *os << "const ";
@@ -361,10 +357,10 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl_2
+  *os << "& operator[] (::CORBA::ULong index) const;" << be_nl_2
       << "::CORBA::ULong maximum () const;" << be_nl
       << "::CORBA::ULong length () const;" << be_nl
-      << "void length ( ::CORBA::ULong len);" << be_nl_2;
+      << "void length (::CORBA::ULong len);" << be_nl_2;
 
   // Member variable of underlying type;
   this->emit_boxed_member_var (node, "_var");
@@ -402,8 +398,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor ();
   this->emit_constructor_one_arg (node, "", "", "");
@@ -455,10 +450,10 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
 
   // Overloaded subscript operators
   *os << "// Allows access and modification using a slot." << be_nl
-      << char_type << " & operator[] ( ::CORBA::ULong slot);"
+      << char_type << " & operator[] (::CORBA::ULong slot);"
       << be_nl_2
       << "// Allows only accessing thru a slot." << be_nl
-      << char_type << " operator[] ( ::CORBA::ULong slot) const;"
+      << char_type << " operator[] (::CORBA::ULong slot) const;"
       << be_nl;
 
   // Member variable of underlying type;
@@ -474,8 +469,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor();
 
@@ -542,8 +536,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // Member variable of underlying type;
   this->emit_boxed_member_var (node, "_var");
@@ -576,8 +569,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor();
 
@@ -668,9 +660,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
+  TAO_INSERT_COMMENT (os);
 
   // Member variable of underlying type;
   this->emit_boxed_member_var (node, "_var");
@@ -686,8 +676,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor ();
 
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 1e1f560c15c..93d48a76d10 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -45,8 +45,7 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   *os << "ACE_INLINE const char*" << be_nl
       << node->name () << "::_tao_obv_static_repository_id ()" << be_nl
@@ -68,8 +67,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Public default constructor
   *os << "ACE_INLINE" << be_nl
@@ -132,14 +130,14 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
 
   // Overloaded subscript operators
   *os << "ACE_INLINE const " << node->full_name () << "_slice &" << be_nl
-      << vb_node->name () << "::operator[] ( ::CORBA::ULong index) const"
+      << vb_node->name () << "::operator[] (::CORBA::ULong index) const"
       << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[index];" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE "<< node->full_name () << "_slice &" << be_nl
-      << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" << be_nl
+      << vb_node->name () << "::operator[] (::CORBA::ULong index)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[index];" << be_uidt_nl
       << "}" << be_nl_2;
@@ -216,8 +214,7 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor_alloc (node);
   this->emit_constructor_one_arg_alloc (node);
@@ -242,7 +239,7 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
 
   // Generate length() setter
   *os << "ACE_INLINE void" << be_nl
-      << vb_node->name () << "::length ( ::CORBA::ULong length)" << be_nl
+      << vb_node->name () << "::length (::CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value->length (length);" << be_uidt_nl
       << "}" << be_nl_2;
@@ -278,8 +275,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor ();
   this->emit_constructor_one_arg (node, "");
@@ -375,13 +371,13 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
 
   // Overloaded subscript operators
   *os << "ACE_INLINE " << char_type << " &" << be_nl
-      << vb_node->name () << "::operator[] ( ::CORBA::ULong slot)" << be_nl
+      << vb_node->name () << "::operator[] (::CORBA::ULong slot)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[slot];" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << char_type << be_nl
-      << vb_node->name () << "::operator[] ( ::CORBA::ULong slot) const" << be_nl
+      << vb_node->name () << "::operator[] (::CORBA::ULong slot) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[slot];" << be_uidt_nl
       << "}" << be_nl_2;
@@ -394,8 +390,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor_alloc (node);
   this->emit_constructor_one_arg_alloc (node);
@@ -475,8 +470,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   this->emit_default_constructor_alloc (node);
   this->emit_constructor_one_arg_alloc (node);
@@ -564,7 +558,6 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
 }
 
 
-
 int
 be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
                                               const char * type_suffix,
@@ -575,8 +568,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
   // Retrieve the node being visited by this be_visitor_valuebox_ci.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if (is_any)
     {
@@ -628,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_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
index 91d897f3cd4..96f252b024c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -48,8 +48,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   this->ctx_->node (node); // save the node
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   if (node->is_defined ())
     {
@@ -82,9 +81,9 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
   // The _downcast method.
   *os << be_nl_2
       << node->name () << " *" << be_nl
-      << node->name () << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl
+      << node->name () << "::_downcast (::CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "return dynamic_cast< ::" << node->name () << " * > (v);"
+      << "return dynamic_cast<::" << node->name () << " *> (v);"
       << be_uidt_nl << "}" << be_nl_2;
 
   // _copy_value method
@@ -239,7 +238,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "::CORBA::Boolean is_null_object = false;" << be_nl
       << "::CORBA::Boolean is_indirected = false;" << be_nl
       << "TAO_InputCDR indrected_strm ((size_t) 0);" << be_nl
-      << "if ( ::CORBA::ValueBase::_tao_validate_box_type (" << be_idt
+      << "if (::CORBA::ValueBase::_tao_validate_box_type (" << be_idt
       << be_idt << be_idt_nl
       << "strm, indrected_strm," << be_nl
       << node->local_name () << "::_tao_obv_static_repository_id (),"
@@ -334,8 +333,7 @@ be_visitor_valuebox_cs::visit_array (be_array * node)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->emit_destructor ();
 
@@ -360,8 +358,7 @@ be_visitor_valuebox_cs::visit_enum (be_enum *)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->emit_destructor ();
 
@@ -477,14 +474,13 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH);
   be_visitor_sequence_buffer_type bt_visitor (&ctx);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if (node->unbounded ())
     {
       // Public constructor with one argument of type ULong
       *os << vb_node->name () << "::" << vb_node->local_name ()
-          << " ( ::CORBA::ULong max)" << be_nl
+          << " (::CORBA::ULong max)" << be_nl
           << "{" << be_idt_nl
           << node->full_name () << "* p;" << be_nl
           << "ACE_NEW (" << be_idt_nl
@@ -547,7 +543,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
     }
 
   *os << " &" << be_nl
-      << vb_node->name () << "::operator[] ( ::CORBA::ULong index)"
+      << vb_node->name () << "::operator[] (::CORBA::ULong index)"
       << be_nl
       << "{" << be_idt_nl
       << "return (";
@@ -578,7 +574,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
 
   *os << " &" << be_nl;
   *os << vb_node->name ()
-      << "::operator[] ( ::CORBA::ULong index) const" << be_nl
+      << "::operator[] (::CORBA::ULong index) const" << be_nl
       << "{" << be_idt_nl;
 
   switch (bt->node_type())
@@ -631,8 +627,7 @@ be_visitor_valuebox_cs::visit_string (be_string *str)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->emit_destructor ();
 
@@ -677,8 +672,7 @@ be_visitor_valuebox_cs::visit_structure (be_structure *)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->emit_destructor ();
 
@@ -719,8 +713,7 @@ be_visitor_valuebox_cs::visit_union (be_union *)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->emit_destructor ();
 
@@ -756,8 +749,7 @@ be_visitor_valuebox_cs::emit_for_predef_enum (char const * marshal_arg)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   this->emit_destructor ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index e36744ab7c6..c6852fa11ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -39,52 +39,9 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  be_module *module = nullptr;
-
-  if (node->is_nested () &&
-      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      module = dynamic_cast<be_module*> (node->defined_in ());
-
-      if (!module)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuebox_any_op_ch::"
-                             "visit_valuebox - "
-                             "Error parsing nested name\n"),
-                            -1);
-        }
-
-      // Some compilers handle "any" operators in a namespace
-      // corresponding to their module, others do not.
-      *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-      be_util::gen_nested_namespace_begin (os, module);
-
-      // emit  nested variation of any operators
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << " *); // copying" << be_nl;
-
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << " **); // non-copying" << be_nl;
-
-      *os << macro << " ::CORBA::Boolean"
-          << " operator>>= (const ::CORBA::Any &, "
-          << node->local_name () << " *&);";
-
-      be_util::gen_nested_namespace_end (os, module);
-
-      // Emit #else.
-      *os << be_nl_2
-          << "#else\n\n";
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
@@ -95,12 +52,7 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
@@ -111,4 +63,3 @@ be_visitor_valuetype_any_op_ch::visit_eventtype (be_eventtype *node)
 {
   return this->visit_valuetype (node);
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index e12e0aea8cf..7bcd9e89457 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -41,8 +41,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   // Generate the Any <<= and >>= operator declarations
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -66,88 +65,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = nullptr;
-
-  if (node->is_nested () &&
-      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      module = dynamic_cast<be_module*> (node->defined_in ());
-
-      if (!module)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuebox_any_op_cs::"
-                             "visit_valuebox - "
-                             "Error parsing nested name\n"),
-                            -1);
-        }
-
-      // Some compiler handle "any" operators in a namespace corresponding
-      // to their module, others do not.
-      *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-      be_util::gen_nested_namespace_begin (os, module);
-
-      // emit  nested variation of any operators
-      *os << "/// Copying insertion." << be_nl
-          << "void" << be_nl
-          << "operator<<= (" << be_idt_nl
-          << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem)"
-          << be_uidt_nl
-          << "{" << be_idt_nl
-          << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl
-          << node->local_name () << " *_tao_copy =" << be_idt_nl
-          << "_tao_elem ?" << be_idt_nl
-          << node->local_name () << "::_downcast (_tao_elem->_copy_value ())" << be_nl
-          << ": 0;" << be_uidt << be_uidt_nl
-          << "_tao_any <<= &_tao_copy;" << be_uidt_nl
-          << "#else" << be_idt_nl
-          << "::CORBA::add_ref (_tao_elem);" << be_nl
-          << "_tao_any <<= &_tao_elem;" << be_uidt_nl
-          << "#endif" << be_uidt_nl
-          << "}" << be_nl_2;
-
-      *os << "/// Non-copying insertion." << be_nl
-          << "void" << be_nl
-          << "operator<<= (" << be_idt_nl
-          << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem)"
-          << be_uidt_nl
-          << "{" << be_idt_nl
-          << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
-          << be_idt_nl
-          << "_tao_any," << be_nl
-          << node->local_name () << "::_tao_any_destructor," << be_nl
-          << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem);" << be_uidt
-          << be_uidt_nl
-          << "}" << be_nl_2;
-
-      *os << "::CORBA::Boolean" << be_nl
-          << "operator>>= (" << be_idt << be_idt_nl
-          << "const ::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *&_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "return" << be_idt_nl
-          << "TAO::Any_Impl_T<" << node->local_name () << ">::extract ("
-          << be_idt << be_idt_nl
-          << "_tao_any," << be_nl
-          << node->local_name () << "::_tao_any_destructor," << be_nl
-          << node->tc_name ()->last_component () << "," << be_nl
-          << "_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt << be_uidt_nl
-          << "}" << be_nl_2;
-
-      be_util::gen_nested_namespace_end (os, module);
-
-      // Emit #else.
-      *os << be_nl_2
-          << "#else\n\n";
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << "/// Copying insertion." << be_nl
       << "void" << be_nl
@@ -160,11 +78,11 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << node->full_name () << " *_tao_copy =" << be_idt_nl
       << "_tao_elem ?" << be_idt_nl
       << node->full_name () << "::_downcast (_tao_elem->_copy_value ())" << be_nl
-      << ": 0;" << be_uidt << be_uidt_nl
-      << "_tao_any <<= &_tao_copy;" << be_uidt_nl
+      << ": nullptr;" << be_uidt << be_uidt_nl
+      << "_tao_any <<= std::addressof(_tao_copy);" << be_uidt_nl
       << "#else" << be_idt_nl
       << "::CORBA::add_ref (_tao_elem);" << be_nl
-      << "_tao_any <<= &_tao_elem;" << be_uidt_nl
+      << "_tao_any <<= std::addressof(_tao_elem);" << be_uidt_nl
       << "#endif" << be_uidt_nl
       << "}" << be_nl_2;
 
@@ -187,8 +105,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " *&_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << " *&_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::extract ("
@@ -196,16 +114,11 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_stub_any_op_gen (true);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index d25849117d9..b7bd2760bc7 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -44,9 +44,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  *os << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index 2e5ba73463d..fd6ae6a782f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -56,8 +56,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index 772ff73a4b4..fc3ff038801 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -86,8 +86,7 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if (bt->node_type () != AST_Decl::NT_typedef
       && bt->is_child (bu))
@@ -169,8 +168,7 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   if (bt->node_type () != AST_Decl::NT_typedef
       && bt->is_child (bu))
@@ -228,11 +226,10 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
-  *os << pre_op () << "void " << ub->local_name () << " ( ::"
+  *os << pre_op () << "void " << ub->local_name () << " (::"
       << bt->name () << "_ptr"
       << ")" << post_op () << be_nl;
   // Get method.
@@ -271,8 +268,7 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -314,8 +310,7 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -357,8 +352,7 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -406,8 +400,7 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -455,15 +448,14 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_object:
       // Set method.
-      *os << pre_op () << "void " << ub->local_name () << " ( ::"
+      *os << pre_op () << "void " << ub->local_name () << " (::"
           << bt->name () << "_ptr)"
           << post_op () << be_nl;
       // Get method.
@@ -529,8 +521,7 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
@@ -604,8 +595,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os  << be_nl_2<< "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Three methods to set the string value.
   if (node->width () == (long) sizeof (char))
@@ -626,7 +616,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node)
   else
     {
       *os << pre_op ()
-          << "void " << ub->local_name () << " ( ::CORBA::WChar *val)"
+          << "void " << ub->local_name () << " (::CORBA::WChar *val)"
           << post_op () << be_nl;
       *os << pre_op ()
           << "void " << ub->local_name () << " (const ::CORBA::WChar *val)"
@@ -670,8 +660,7 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os  << be_nl_2<< "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
@@ -755,8 +744,7 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os  << be_nl_2<< "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index 1e591d5837d..7ab3dc710ec 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -138,8 +138,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
                        bt->full_name ());
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -214,8 +213,7 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op() << "void" << be_nl;
@@ -283,8 +281,7 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -352,8 +349,7 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -426,8 +422,7 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -507,8 +502,7 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -583,8 +577,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -758,8 +751,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // (1) set from a const
   *os << "/// Accessor to set the member." << be_nl
@@ -830,8 +822,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
 
   // Three methods to set the string value.
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -845,7 +836,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
     }
   else
     {
-      *os << "::" << ub->local_name () << " ( ::CORBA::WChar *val)";
+      *os << "::" << ub->local_name () << " (::CORBA::WChar *val)";
     }
 
   *os << be_nl
@@ -999,8 +990,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // (1) Set from a const.
   *os << "/// Accessor to set the member." << be_nl
@@ -1116,8 +1106,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "/// Accessor to set the member" << be_nl
       << this->pre_op () << "void" << be_nl;
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/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 201b7a51ac1..83babd234a3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -24,39 +24,17 @@ be_visitor_valuetype_marshal_cs::~be_visitor_valuetype_marshal_cs ()
 }
 
 int
-be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
+be_visitor_valuetype_marshal_cs::marshal_state (be_valuetype *node)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-  *os << "::CORBA::Boolean" << be_nl;
-
-  this->class_name (node, os);
+  TAO_OutStream *const os = this->ctx_->stream ();
 
-  *os << "::_tao_marshal_state (TAO_OutputCDR &";
-
-  be_valuetype *inh = node->statefull_inherit ();
-
-  // If the valuetype has no fields, and no stateful inherit,
-  // the stream arg is unused.
-  if (inh != nullptr || node->data_members_count () > 0)
+  if (!be_global->cdr_support ())
     {
-      *os << "strm";
-    }
-
-  *os << ", TAO_ChunkInfo&";
-  // If the valuetype has no fields, and no stateful inherit,
-  // the chunking helper arg is unused.
-  if (inh != nullptr || node->data_members_count () > 0)
-    {
-      *os << "ci";
+      *os << "return false;" << be_uidt_nl << be_nl;
+      return 0;
     }
 
-  *os << ") const" << be_nl
-      << "{" << be_idt_nl;
+  be_valuetype *const inh = node->statefull_inherit ();
 
   if (inh)
     {
@@ -105,9 +83,8 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       *os << "return false;" << be_uidt_nl << be_nl;
       *os << "CORBA::Boolean const ret = " << be_idt << be_idt_nl;
 
-  // All we have to do is to visit the scope and generate code.
-  this->gen_fields (node,
-                    *this->ctx_);
+      // All we have to do is to visit the scope and generate code.
+      this->gen_fields (node, *this->ctx_);
 
       *os << ";" << be_uidt << be_uidt_nl;
 
@@ -124,34 +101,21 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
     }
 
   *os << "return true;" << be_uidt_nl;
-  *os << "}" << be_nl_2;
-
-  // Set the substate as generating code for the input operator.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-
-  *os << "::CORBA::Boolean" << be_nl;
-
-  this->class_name (node, os);
-
-  *os << "::_tao_unmarshal_state (TAO_InputCDR &";
+  return 0;
+}
 
-  // If the valuetype has no fields, and no stateful inherit,
-  // the stream arg is unused.
-  if (inh != nullptr || node->data_members_count () > 0)
-    {
-      *os << "strm";
-    }
+int
+be_visitor_valuetype_marshal_cs::unmarshal_state (be_valuetype *node)
+{
+  TAO_OutStream *const os = this->ctx_->stream ();
 
-  *os << ", TAO_ChunkInfo&";
-  // If the valuetype has no fields, and no stateful inherit,
-  // the chunking helper arg is unused.
-  if (inh != nullptr || node->data_members_count () > 0)
+  if (!be_global->cdr_support ())
     {
-      *os << "ci";
+      *os << "return false;" << be_uidt_nl << be_nl;
+      return 0;
     }
 
-  *os << ")" << be_nl
-      << "{" << be_idt_nl;
+  be_valuetype *const inh = node->statefull_inherit ();
 
   if (inh)
     {
@@ -180,6 +144,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
         }
     }
 
+  be_visitor_context new_ctx = *this->ctx_;
   be_visitor_valuetype_field_cdr_decl field_in_cdr (&new_ctx);
 
   if (field_in_cdr.visit_scope (node) == -1)
@@ -198,9 +163,8 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       *os << "return false;" << be_uidt_nl << be_nl;
       *os << "CORBA::Boolean const ret = " << be_idt << be_idt_nl;
 
-  // All we have to do is to visit the scope and generate code.
-  this->gen_fields (node,
-                    *this->ctx_);
+      // All we have to do is to visit the scope and generate code.
+      this->gen_fields (node, *this->ctx_);
 
       *os << ";" << be_uidt << be_uidt_nl;
 
@@ -213,8 +177,89 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
     }
     else
       *os << "return true;";
+  return 0;
+}
+
+int
+be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
+
+  TAO_INSERT_COMMENT (os);
+
+  *os << "::CORBA::Boolean" << be_nl;
+
+  this->class_name (node, os);
+
+  *os << "::_tao_marshal_state (TAO_OutputCDR &";
+
+  be_valuetype *inh = node->statefull_inherit ();
+
+  // If the valuetype has no fields, and no stateful inherit,
+  // the stream arg is unused.
+  bool const named_args = be_global->cdr_support () && (inh != nullptr || node->data_members_count () > 0);
+
+  if (named_args)
+    {
+      *os << "strm";
+    }
+
+  *os << ", TAO_ChunkInfo &";
+
+  if (named_args)
+    {
+      *os << "ci";
+    }
+
+  *os << ") const" << be_nl
+      << "{" << be_idt_nl;
+
+  int const marshal_error = this->marshal_state (node);
+  if (marshal_error)
+    {
+      return marshal_error;
+    }
+
+  *os << "}" << be_nl_2;
+
+  // Set the substate as generating code for the input operator.
+  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+
+  *os << "::CORBA::Boolean" << be_nl;
+
+  this->class_name (node, os);
+
+  *os << "::_tao_unmarshal_state (TAO_InputCDR &";
+
+  if (named_args)
+    {
+      *os << "strm";
+    }
+
+  *os << ", TAO_ChunkInfo &";
+
+  if (named_args)
+    {
+      *os << "ci";
+    }
+
+  *os << ")" << be_nl
+      << "{" << be_idt_nl;
+
+  int const unmarshal_error = this->unmarshal_state (node);
+  if (unmarshal_error)
+    {
+      return unmarshal_error;
+    }
+
   *os << be_uidt_nl << "}" << be_nl_2;
 
+  if (!be_global->cdr_support ())
+    {
+      return 0;
+    }
+
   *os << "void" << be_nl;
 
   this->class_name (node, os);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
index 584916719f8..afc93201be3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -40,8 +40,7 @@ be_visitor_obv_module::visit_module (be_module *node)
 
       if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
         {
-          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+          TAO_INSERT_COMMENT (os);
 
           *os << "namespace ";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 89ec6a82ac8..fa78839f90e 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);
-
         }
     }
 
@@ -832,8 +831,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "class " << be_global->stub_export_macro ()
       << " " << node->local_name ()
@@ -844,7 +842,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node)
       << "public:" << be_idt_nl
       << "virtual ~" << node->local_name () << "_init ();" << be_nl;
 
-  *os << "virtual const char* tao_repository_id (void);\n" << be_nl;
+  *os << "virtual const char* tao_repository_id ();\n" << be_nl;
   *os << "// create () goes here" << be_nl;
   *os << be_uidt_nl << "};" << be_nl;
 
@@ -932,7 +930,6 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
 bool
 be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
 {
-
   // Just try to find a VT with concrete factory in inheritance tree.
   if (node == nullptr)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 3694cf2e480..4d25ff32d53 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -46,8 +46,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   TAO_OutStream *os = this->ctx_->stream ();
   int status = 0;
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   if (node->node_type () == AST_Decl::NT_eventtype)
     {
@@ -173,7 +172,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
     {
       // Generate the constructor and destructor and _copy_value.
       *os << be_nl_2
-          << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl
+          << node->local_name () << " (::CORBA::Exception *ex)" << be_idt_nl
           << ": exception (ex)" << be_uidt_nl
           << "{}" << be_nl_2
           << "virtual ~" << node->local_name () << " ();" << be_nl
@@ -182,7 +181,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
   *os << be_nl_2
       << "static " << node->local_name () << "* "
-      << "_downcast ( ::CORBA::ValueBase *v);" << be_nl
+      << "_downcast (::CORBA::ValueBase *v);" << be_nl
       << be_nl
       << "/// TAO extensions or internals" << be_nl
       << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl
@@ -234,8 +233,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // If we inherit from CORBA::Object and/or CORBA::AbstractBase
   // (in addition to CORBA::ValueBase) we have to add these
@@ -302,14 +300,18 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   if (node->opt_accessor ())
     {
       *os << be_uidt_nl << "protected:" << be_idt_nl;
-      *os << "::CORBA::Boolean "
-          << "_tao_marshal_state (TAO_OutputCDR &) const;" << be_nl
-          << "::CORBA::Boolean "
-          << "_tao_unmarshal_state (TAO_InputCDR &);" << be_nl
-          << "virtual void "
-          << "truncation_hook ();"
-          << be_uidt_nl << be_nl;
-      *os << "private:" << be_idt_nl;
+
+      if (be_global->cdr_support ())
+       {
+        *os << "::CORBA::Boolean "
+            << "_tao_marshal_state (TAO_OutputCDR &) const;" << be_nl
+            << "::CORBA::Boolean "
+            << "_tao_unmarshal_state (TAO_InputCDR &);" << be_nl
+            << "virtual void truncation_hook ();" << be_nl;
+       }
+
+     *os  << be_uidt_nl << be_nl
+          << "private:" << be_idt_nl;
 
       this->gen_pd (node);
     }
@@ -329,7 +331,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
                   << "_tao_unmarshal__" << node->flat_name ()
                   << " (TAO_InputCDR &, TAO_ChunkInfo &);";
             }
-          else
+          else if (be_global->cdr_support ())
             {
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_marshal__" << node->flat_name ()
@@ -392,8 +394,7 @@ be_visitor_valuetype_ch::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node); // save the node
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+  TAO_INSERT_COMMENT (os);
 
   // Every operation is declared public and virtual in the client code.
   *os << be_uidt_nl << "public:" << be_idt_nl << "virtual ";
@@ -497,7 +498,6 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *,
                                             be_interface *base,
                                             TAO_OutStream *os)
 {
-
   AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 1bdeee1b047..1280d802d42 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -40,8 +40,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << "ACE_INLINE" << be_nl;
   *os << node->name () << "::" << node->local_name () << " ()" << be_nl;
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 aef3ecbd8c3..c00607388b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -49,11 +49,13 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   if (node->is_defined ())
     {
+      *os << be_nl
+          << be_global->core_versioning_begin ();
+
       *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name  () << ">::add_ref ("
@@ -77,15 +79,18 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "{" << be_idt_nl
           << "::CORBA::remove_ref (p);" << be_uidt_nl
           << "}";
+
+      *os << be_nl
+          << be_global->core_versioning_end () << be_nl;
     }
 
   // The _downcast method.
   *os << be_nl_2
       << node->name () << " *" << be_nl << node->name ()
-      << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl
+      << "::_downcast (::CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "return dynamic_cast< ::" << node->name ()
-      << " * > (v);" << be_uidt_nl
+      << "return dynamic_cast<::" << node->name ()
+      << " *> (v);" << be_uidt_nl
       << "}" << be_nl_2;
 
   // The _tao_obv_repository_id method.
@@ -165,58 +170,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   // Nothing to marshal if abstract valuetype.
   if (!node->is_abstract () && !is_an_amh_exception_holder)
     {
-      // The virtual _tao_marshal_v method.
-      *os << "::CORBA::Boolean" << be_nl
-          << node->name ()
-          << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-          << "{" << be_idt_nl
-          << "TAO_ChunkInfo ci (this->is_truncatable_ || this->chunking_);"
-          << be_nl
-          << "return ";
-
-      if (node->opt_accessor ())
-        {
-          be_decl *scope =
-            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
-
-          *os << scope->name () << "::"
-              << node->local_name ()
-              << "::_tao_marshal_state (strm, ci);" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "this->_tao_marshal__" << node->flat_name ()
-              << " (strm, ci);" << be_uidt_nl;
-        }
-
-      *os << "}" << be_nl_2;
-
-      // The virtual _tao_unmarshal_v method.
-      *os << "::CORBA::Boolean" << be_nl
-          << node->name ()
-          << "::_tao_unmarshal_v (TAO_InputCDR & strm)"
-          << be_nl
-          << "{" << be_idt_nl
-          << "TAO_ChunkInfo ci (this->is_truncatable_ || this->chunking_, 1);"
-          << be_nl
-          << "return ";
-
-      if (node->opt_accessor ())
-        {
-          be_decl *scope =
-            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
-
-          *os << scope->name () << "::"
-              << node->local_name ()
-              <<"::_tao_unmarshal_state (strm,ci);" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "this->_tao_unmarshal__" << node->flat_name ()
-              << " (strm,ci);" << be_uidt_nl;
-        }
-
-      *os << "}" << be_nl_2;
+      this->marshal_unmarshal_v (node);
 
       *os << "::CORBA::Boolean" << be_nl
           << node->name ()
@@ -226,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)
     {
@@ -243,8 +196,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "ACE_NEW_THROW_EX (" << be_idt_nl
           << "ret_val," << be_nl
           << node->local_name () << " ()," << be_nl
-          << "::CORBA::NO_MEMORY ()" << be_uidt_nl
-          << ");" << be_nl
+          << "::CORBA::NO_MEMORY ());" << be_uidt
+          << be_nl
           << "return ret_val;" << be_uidt_nl
           << "}" << be_nl_2;
 
@@ -314,8 +267,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   *os << "::CORBA::Boolean" << be_nl << node->name()
       << "::_tao_unmarshal (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
-      << node->local_name () << " *&new_object" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->local_name () << " *&new_object)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *base {};" << be_nl
       << "::CORBA::Boolean is_indirected = false;" << be_nl
@@ -339,7 +292,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "// Now base must point to the unmarshaled object." << be_nl
       << "// Align the pointer to the right subobject." << be_nl
       << "new_object = " << node->local_name () << "::_downcast (base);" << be_nl
-      << "if (0 == new_object)" << be_idt_nl
+      << "if (nullptr == new_object)" << be_idt_nl
       << "return false;" << be_uidt_nl << be_nl
       << "if (is_indirected)" << be_idt_nl
       << "new_object->_add_ref ();" << be_uidt_nl << be_nl
@@ -386,6 +339,81 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
+void be_visitor_valuetype_cs::marshal_unmarshal_v (be_valuetype *node)
+{
+  TAO_OutStream *const os = this->ctx_->stream ();
+
+  if (!be_global->cdr_support ())
+    {
+      *os << "::CORBA::Boolean" << be_nl
+          << node->name ()
+          << "::_tao_marshal_v (TAO_OutputCDR &) const" << be_nl
+          << "{" << be_idt_nl
+          << "return false;" << be_uidt_nl
+          << "}" << be_nl_2
+          << "::CORBA::Boolean" << be_nl
+          << node->name ()
+          << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl
+          << "{" << be_idt_nl
+          << "return false;" << be_uidt_nl
+          << "}" << be_nl_2;
+      return;
+    }
+
+  // The virtual _tao_marshal_v method.
+  *os << "::CORBA::Boolean" << be_nl
+      << node->name ()
+      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+      << "{" << be_idt_nl
+      << "TAO_ChunkInfo ci (this->is_truncatable_ || this->chunking_);"
+      << be_nl
+      << "return ";
+
+  if (node->opt_accessor ())
+    {
+      be_decl *scope =
+        dynamic_cast<be_scope*> (node->defined_in ())->decl ();
+
+      *os << scope->name () << "::"
+          << node->local_name ()
+          << "::_tao_marshal_state (strm, ci);" << be_uidt_nl;
+    }
+  else
+    {
+      *os << "this->_tao_marshal__" << node->flat_name ()
+          << " (strm, ci);" << be_uidt_nl;
+    }
+
+  *os << "}" << be_nl_2;
+
+  // The virtual _tao_unmarshal_v method.
+  *os << "::CORBA::Boolean" << be_nl
+      << node->name ()
+      << "::_tao_unmarshal_v (TAO_InputCDR & strm)"
+      << be_nl
+      << "{" << be_idt_nl
+      << "TAO_ChunkInfo ci (this->is_truncatable_ || this->chunking_, 1);"
+      << be_nl
+      << "return ";
+
+  if (node->opt_accessor ())
+    {
+      be_decl *scope =
+        dynamic_cast<be_scope*> (node->defined_in ())->decl ();
+
+      *os << scope->name () << "::"
+          << node->local_name ()
+          <<"::_tao_unmarshal_state (strm,ci);" << be_uidt_nl;
+    }
+  else
+    {
+      *os << "this->_tao_unmarshal__" << node->flat_name ()
+          << " (strm,ci);" << be_uidt_nl;
+    }
+
+  *os << "}" << be_nl_2;
+}
+
 int
 be_visitor_valuetype_cs::visit_eventtype (be_eventtype *node)
 {
@@ -411,8 +439,7 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // STEP I: Generate the return type.
   be_type *bt = dynamic_cast<be_type*> (node->return_type ());
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 99b203c0540..e52833958bb 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -53,8 +53,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream& os = *(this->ctx_->stream ());
 
-  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (&os);
 
   //@@ If I'm generating concrete class I need a RefCounter.
   os << "class " << be_global->stub_export_macro ()
@@ -85,7 +84,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
   // Generate _downcast method.
   os << be_nl_2
      << "static " << node->local_name () << "_init* "
-     << "_downcast ( ::CORBA::ValueFactoryBase *);";
+     << "_downcast (::CORBA::ValueFactoryBase *);";
 
   if (factory_style == be_valuetype::FS_CONCRETE_FACTORY)
     {
@@ -136,7 +135,6 @@ be_visitor_valuetype_init_ch::visit_eventtype (be_eventtype *node)
 int
 be_visitor_valuetype_init_ch::visit_factory (be_factory *node)
 {
-
   TAO_OutStream& os = *(this->ctx_->stream ());
 
   be_valuetype *vt =
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index ed9631216f6..38b0f4a769d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -69,8 +69,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
                    "%s_init",
                    node->local_name ());
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  TAO_INSERT_COMMENT (os);
 
   // ctor
   *os << be_nl_2
@@ -85,10 +84,10 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
   // The _downcast method.
   *os << be_nl_2
       << node->name () << "_init *" << be_nl << node->name ()
-      << "_init::_downcast ( ::CORBA::ValueFactoryBase *v)" << be_nl
+      << "_init::_downcast (::CORBA::ValueFactoryBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "return dynamic_cast< ::" << node->name ()
-      << "_init * > (v);" << be_uidt_nl
+      << "return dynamic_cast<::" << node->name ()
+      << "_init *> (v);" << be_uidt_nl
       << "}";
 
   // tao_repository_id
@@ -112,8 +111,8 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
           << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
           << "ret_val," << be_nl
           << "OBV_" << node->full_name () << "," << be_nl
-          << "::CORBA::NO_MEMORY ()" << be_uidt_nl
-          << ");" << be_uidt_nl
+          << "::CORBA::NO_MEMORY ());" << be_uidt
+          << be_uidt_nl
           << "return ret_val;"
           << be_uidt_nl << "}";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 4f3c0688e53..ce0e205990b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -40,8 +40,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ ;
+  TAO_INSERT_COMMENT (os);
 
   // OBV_ class maps only to a typedef if we are optimizing accessors.
   if (node->opt_accessor ())
@@ -142,8 +141,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       // to avoid ambiguity.
       if (node->n_supports () > 0)
         {
-          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ ;
+          TAO_INSERT_COMMENT (os);
 
           *os << be_nl_2 << "virtual void _add_ref ();" << be_nl;
           *os << "virtual void _remove_ref ();";
@@ -166,7 +164,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
           *os << "OBV_";
         }
 
-      *os << node->local_name () << " ();";
+      *os << node->local_name () << " () = default;";
 
       // Initializing constructor.
       if (node->has_member ())
@@ -211,25 +209,28 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       // Map fields to private data.
       if (!node->opt_accessor ())
         {
-          *os << be_nl << be_uidt_nl << "protected:" << be_idt_nl;
-
-          *os << "virtual ::CORBA::Boolean" << be_nl
-              << "_tao_marshal__" << node->flat_name ()
-              << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;" << be_nl_2;
-
-          *os << "virtual ::CORBA::Boolean" << be_nl
-              << "_tao_unmarshal__" << node->flat_name ()
-              << " (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl_2;
-
-          *os << "::CORBA::Boolean "
-              << "_tao_marshal_state (TAO_OutputCDR &, TAO_ChunkInfo &) const;"
-              << be_nl
-              << "::CORBA::Boolean "
-              << "_tao_unmarshal_state (TAO_InputCDR &, TAO_ChunkInfo &);"
-              << be_nl
-              << "virtual void "
-              << "truncation_hook ();"
-              << be_uidt_nl << be_nl;
+          if (be_global->cdr_support ())
+            {
+              *os << be_nl << be_uidt_nl << "protected:" << be_idt_nl;
+
+              *os << "virtual ::CORBA::Boolean" << be_nl
+                  << "_tao_marshal__" << node->flat_name()
+                  << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;" << be_nl_2;
+
+              *os << "virtual ::CORBA::Boolean" << be_nl
+                  << "_tao_unmarshal__" << node->flat_name()
+                  << " (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl_2;
+
+              *os << "::CORBA::Boolean "
+                  << "_tao_marshal_state (TAO_OutputCDR &, TAO_ChunkInfo &) const;"
+                  << be_nl
+                  << "::CORBA::Boolean "
+                  << "_tao_unmarshal_state (TAO_InputCDR &, TAO_ChunkInfo &);"
+                  << be_nl
+                  << "virtual void "
+                  << "truncation_hook ();"
+                  << be_uidt_nl << be_nl;
+            }
 
           *os << "private:" << be_idt;
 
@@ -237,7 +238,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
         }
 
       *os << be_nl
-          << "CORBA::Boolean require_truncation_;" << be_uidt_nl
+          << "CORBA::Boolean require_truncation_ {false};" << be_uidt_nl
           << "};";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index ade6488acd2..f168a8421d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -40,20 +40,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-  // Default constructor.
-  *os << node->full_obv_skel_name () << "::";
-
-  if (! node->is_nested ())
-    {
-      *os << "OBV_";
-    }
-
-  *os << node->local_name () << " ()" << be_nl;
-  *os << ": require_truncation_ (false)" << be_nl
-      << "{}" << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Initializing constructor.
   if (node->has_member ())
@@ -71,7 +58,6 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       this->gen_obv_init_constructor_args (node, index);
 
       *os << ")" << be_uidt << be_uidt << be_uidt_nl
-          << ": require_truncation_ (false)" << be_nl
           << "{" << be_idt;
 
       this->gen_obv_init_constructor_inits (node);
@@ -118,8 +104,8 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
           *os << be_uidt_nl;
         }
       *os << ")," << be_nl
-          << "::CORBA::NO_MEMORY ()" << be_uidt_nl
-          << ");" << be_nl
+          << "::CORBA::NO_MEMORY ());" << be_uidt
+          << be_nl
           << "return ret_val;" << be_uidt_nl
           << "}";
     }
@@ -128,21 +114,24 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
   // or the valuetype is abstract.
   if (!node->opt_accessor ())
     {
-      *os << be_nl_2 << "::CORBA::Boolean" << be_nl
-          << node->full_obv_skel_name ()
-          << "::_tao_marshal__" << node->flat_name ()
-          <<    " (TAO_OutputCDR &strm, TAO_ChunkInfo& ci) const" << be_nl
-          << "{" << be_idt_nl
-          << "return _tao_marshal_state (strm, ci);" << be_uidt_nl
-          << "}" << be_nl_2;
+      if (be_global->cdr_support ())
+        {
+          *os << be_nl_2 << "::CORBA::Boolean" << be_nl
+              << node->full_obv_skel_name()
+              << "::_tao_marshal__" << node->flat_name()
+              << " (TAO_OutputCDR &strm, TAO_ChunkInfo& ci) const" << be_nl
+              << "{" << be_idt_nl
+              << "return _tao_marshal_state (strm, ci);" << be_uidt_nl
+              << "}" << be_nl_2;
 
-      *os << "::CORBA::Boolean" << be_nl
-          << node->full_obv_skel_name ()
-          << "::_tao_unmarshal__" << node->flat_name ()
-          << " (TAO_InputCDR &strm, TAO_ChunkInfo& ci)" << be_nl
-          << "{" << be_idt_nl
-          << "return _tao_unmarshal_state (strm, ci);" << be_uidt_nl
-          << "}";
+          *os << "::CORBA::Boolean" << be_nl
+              << node->full_obv_skel_name()
+              << "::_tao_unmarshal__" << node->flat_name()
+              << " (TAO_InputCDR &strm, TAO_ChunkInfo& ci)" << be_nl
+              << "{" << be_idt_nl
+              << "return _tao_unmarshal_state (strm, ci);" << be_uidt_nl
+              << "}";
+        }
 
       if (this->visit_scope (node) == -1)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
index c7032dde502..af8ab1d339c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
@@ -58,8 +58,7 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node)
       class_name +=  node->local_name ();
     }
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Generate the skeleton class name.
   *os << "class " << class_name.c_str () << ";" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index 2b4f1096991..b529196273c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -53,8 +53,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  *os << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   // Find if we are at the top scope or inside some module,
   // pre-compute the prefix that must be added to the local name in
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index f2debe24349..d3527c7a04b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
@@ -51,69 +51,21 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
-  be_module *module = nullptr;
-
-  if (node->is_nested () &&
-      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      module = dynamic_cast<be_module*> (node->defined_in ());
-
-      if (!module)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuebox_any_op_ch::"
-                             "visit_valuebox - "
-                             "Error parsing nested name\n"),
-                            -1);
-        }
-
-      // Some compilers handle "any" operators in a namespace
-      // corresponding to their module, others do not.
-      *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-
-      *os << be_global->core_versioning_begin () << be_nl;
-      be_util::gen_nested_namespace_begin (os, module);
-
-      // emit  nested variation of any operators
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << " *); // copying" << be_nl;
-      *os << macro << " void"
-          << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
-          << " **); // non-copying" << be_nl;
-      *os << macro << " ::CORBA::Boolean"
-          << " operator>>= (const ::CORBA::Any &, "
-          << node->local_name () << " *&);";
-
-      be_util::gen_nested_namespace_end (os, module);
-
-      *os << be_nl
-          << be_global->core_versioning_end () << be_nl;
-
-      // emit #else
-      *os << "#else\n\n";
-    }
-
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->anyops_versioning_begin () << be_nl;
 
   *os << macro << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+      << " operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
   *os << macro << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+      << " operator<<= (::CORBA::Any &, " << node->name ()
       << " **); // non-copying" << be_nl;
   *os << macro << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_end () << be_nl;
-  if (module != nullptr)
-    {
-      *os << "\n\n#endif";
-    }
+  *os << be_global->anyops_versioning_end () << be_nl;
 
   node->cli_hdr_any_op_gen (true);
   return 0;
@@ -124,4 +76,3 @@ be_visitor_valuetype_fwd_any_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
 {
   return this->visit_valuetype_fwd (node);
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
index 026f4bcd769..477ac4c7d37 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
@@ -62,8 +62,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
 
   // generate the CDR << and >> operator declarations (prototypes)
 
-  *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+  TAO_INSERT_COMMENT (os);
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index d021e5125be..02a0ffdf6be 100644
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ b/TAO/TAO_IDL/be_include/be_array.h
@@ -31,7 +31,7 @@ public:
             bool local,
             bool abstract);
 
-  ~be_array ();
+  ~be_array () override = default;
 
   /// Generate dimensions. If slice == 1, generate dimensions for the slice
   /// definition.
@@ -39,24 +39,24 @@ public:
                       unsigned short slice = 0);
 
   /// Overridden from class be_type.
-  virtual void gen_ostream_operator (TAO_OutStream *os,
-                                     bool use_underscore);
-  virtual void gen_member_ostream_operator (TAO_OutStream *os,
-                                            const char *instance_name,
-                                            bool use_underscore,
-                                            bool accessor);
+  void gen_ostream_operator (TAO_OutStream *os,
+                             bool use_underscore) override;
+  void gen_member_ostream_operator (TAO_OutStream *os,
+                                    const char *instance_name,
+                                    bool use_underscore,
+                                    bool accessor) override;
 
   // Visiting.
-  virtual int accept (be_visitor *visitor);
+  int accept (be_visitor *visitor) override;
 
   // Cleanup.
-  virtual void destroy ();
+  void destroy () override;
 
 protected:
   /// Create a name for us.
   virtual int create_name ();
 
-  virtual void compute_tc_name ();
+  void compute_tc_name () override;
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 1369ca69e02..bcbb638e7eb 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -35,7 +35,6 @@ class be_decl;
 class TAO_IDL_BE_Export TAO_CodeGen
 {
 public:
-
   // Define all the code generation states.
   // The first letter C/S of the suffix stands for client/server-side
   // The second letter H/I/S stands for header/inline/impl file.
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index a3a4a16d924..40bbaab0eef 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -437,6 +437,12 @@ public:
   /// related code.
   const char * core_versioning_end () const;
 
+  /// Get text that opens a "versioned" namespace for CORBA::Any operators
+  const char *anyops_versioning_begin () const;
+
+  /// Get text that closes a "versioned" namespace for CORBA::Any operators
+  const char *anyops_versioning_end () const;
+
   // = Set and get methods for different file name endings.
 
   /// Set the client_hdr_ending.
@@ -981,6 +987,12 @@ private:
   /// orbsvcs related code.
   ACE_CString core_versioning_end_;
 
+  /// Text that opens a "versioned" namespace for CORBA::Any operators
+  ACE_CString anyops_versioning_begin_;
+
+  /// Text that closes a "versioned" namespace for CORBA::Any operators
+  ACE_CString anyops_versioning_end_;
+
   /// Text that opens a "versioned" namespace.
   ACE_CString versioning_begin_;
 
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index 1acdf87dbc5..1dd0ca843f1 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -92,7 +92,6 @@ struct TAO_ACE_CHECK
 class TAO_OutStream
 {
 public:
-
   /// Enumerated type to indicate the stream type
   enum STREAM_TYPE
     {
@@ -186,6 +185,7 @@ public:
   }
 
   TAO_OutStream &operator<< (const char *str);
+  TAO_OutStream &operator<< (char ch);
   TAO_OutStream &operator<< (const ACE_CString &str);
   TAO_OutStream &operator<< (const ACE_CDR::UShort num);
   TAO_OutStream &operator<< (const ACE_CDR::Short num);
@@ -218,6 +218,9 @@ public:
 
   TAO_OutStream &print (AST_Expression *idl);
 
+  void insert_comment (const char *file, int line);
+#define TAO_INSERT_COMMENT(STRM) (STRM)->insert_comment (__FILE__, __LINE__)
+
 protected:
   /// The underlying low-level I/O handle
   FILE *fp_;
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 7bce2c9e839..4ec3e99e4f7 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -102,7 +102,6 @@ public:
   virtual char *gen_name ();
 
 protected:
-
   /// Computes the fully scoped typecode name.
   virtual void compute_tc_name ();
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index 761859541eb..20d1f7f4686 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -53,7 +53,6 @@ public:
   virtual int visit_valuebox (be_valuebox *node);
 
 private:
-
   bool generated (be_decl *node) const;
   void generated (be_decl *node,
                   bool val);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
index 023e96be6c2..a59b36f581c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARGUMENT_INVOKE_CS_H_
 #define _BE_VISITOR_ARGUMENT_INVOKE_CS_H_
 
-// ************************************************************
-// class be_visitor_args_invoke_cs
-// ************************************************************
-
 /**
  * @class be_visitor_args_invoke_cs
  *
@@ -95,7 +91,6 @@ public:
  private:
   int emit_common ();
   int emit_common2 (be_type *node);
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_INVOKE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
index 05e7225bd3b..1e30c14b363 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_
 #define _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_
 
-// ************************************************************
-// class be_visitor_args_marshal_ss
-// ************************************************************
-
 /**
  * @class be_visitor_args_marshal_ss
  *
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
index 42b8d547675..8f7d850574e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARGUMENT_UPCALL_SS_H_
 #define _BE_VISITOR_ARGUMENT_UPCALL_SS_H_
 
-// ************************************************************
-// class be_visitor_args_upcall_ss
-// ************************************************************
-
 /**
  * @class be_visitor_args_upcall_ss
  *
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
index 0fc6fd6c3a0..b3ea3593cb4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARGUMENT_VARDECL_SS_H_
 #define _BE_VISITOR_ARGUMENT_VARDECL_SS_H_
 
-// ************************************************************
-// class be_visitor_args_vardecl_ss
-// ************************************************************
-
 /**
  * @class be_visitor_args_vardecl_ss
  *
@@ -93,7 +89,6 @@ public:
  private:
   int emit_common (be_type *node);
   int emit_common2 (be_type *node);
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
index b6463d0753f..8b82a38a83f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARRAY_ANY_OP_CH_H_
 #define _BE_VISITOR_ARRAY_ANY_OP_CH_H_
 
-// ************************************************************
-// class be_visitor_array_any_op_ch
-// ************************************************************
-
 /**
  * @class be_visitor_array_any_op_ch
  *
@@ -28,17 +24,15 @@
  */
 class be_visitor_array_any_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_array_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_any_op_ch ();
+  ~be_visitor_array_any_op_ch () override = default;
 
   /// visit array
-  virtual int visit_array (be_array *node);
-
+  int visit_array (be_array *node) override;
 };
 
 #endif /* _BE_VISITOR_ARRAY_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
index 776a873402e..acf2f310096 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARRAY_ANY_OP_CS_H_
 #define _BE_VISITOR_ARRAY_ANY_OP_CS_H_
 
-// ************************************************************
-// class be_visitor_array_cs
-// ************************************************************
-
 /**
  * @class be_visitor_array_any_op_cs
  *
@@ -28,17 +24,15 @@
  */
 class be_visitor_array_any_op_cs : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_array_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_any_op_cs ();
+  ~be_visitor_array_any_op_cs () override = default;
 
   /// visit array
-  virtual int visit_array (be_array *node);
-
+  int visit_array (be_array *node) override;
 };
 
 #endif /* _BE_VISITOR_ARRAY_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array.h b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
index b44e9e6a4a2..515645f1d47 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
@@ -13,10 +13,6 @@
 #ifndef _BE_VISITOR_ARRAY_ARRAY_H_
 #define _BE_VISITOR_ARRAY_ARRAY_H_
 
-// ************************************************************
-// class be_visitor_array
-// ************************************************************
-
 /**
  * @class be_visitor_array
  *
@@ -75,13 +71,11 @@ public:
   virtual int visit_union (be_union *node);
 
 protected:
-
   /// helper that does the common job
   int visit_node (be_type *);
 
   /// helper that does the common job
   int emit_common (be_type *node);
-
 };
 
 #endif /* _BE_VISITOR_ARRAY_ARRAY_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
index 4f0d219a1e6..e23a3cf1e72 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
@@ -13,10 +13,6 @@
 #ifndef _BE_VISITOR_ARRAY_CH_H_
 #define _BE_VISITOR_ARRAY_CH_H_
 
-// ************************************************************
-// class be_visitor_array_ch
-// ************************************************************
-
 /**
  * @class be_visitor_array_ch
  *
@@ -31,10 +27,10 @@ public:
   be_visitor_array_ch (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_array_ch ();
+  ~be_visitor_array_ch () override = default;
 
   /// visit the array node
-  virtual int visit_array (be_array *node);
+  int visit_array (be_array *node) override;
 };
 
 #endif /* _BE_VISITOR_ARRAY_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
index 67ff101da07..ff9722bd29b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
@@ -9,14 +9,9 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_ARRAY_CI_H_
 #define _BE_VISITOR_ARRAY_CI_H_
 
-// ************************************************************
-// class be_visitor_array_ci
-// ************************************************************
-
 /**
  * @class be_visitor_array_ci
  *
@@ -31,10 +26,10 @@ public:
   be_visitor_array_ci (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_array_ci ();
+  ~be_visitor_array_ci () override = default;
 
   /// visit the array node
-  virtual int visit_array (be_array *node);
+  int visit_array (be_array *node) override;
 };
 
 #endif /* _BE_VISITOR_ARRAY_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
index 43f734b8916..57ff835a5bb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
@@ -9,14 +9,9 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_ARRAY_CS_H_
 #define _BE_VISITOR_ARRAY_CS_H_
 
-// ************************************************************
-// class be_visitor_array_cs
-// ************************************************************
-
 /**
  * @class be_visitor_array_cs
  *
@@ -31,10 +26,10 @@ public:
   be_visitor_array_cs (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_array_cs ();
+  ~be_visitor_array_cs () override = default;
 
   /// visit the array node
-  virtual int visit_array (be_array *node);
+  int visit_array (be_array *node) override;
 };
 
 #endif /* _BE_VISITOR_ARRAY_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
index fbcfc930785..2760a45df0f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARRAY_CDR_OP_CH_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CH_H_
 
-// ************************************************************
-// class be_visitor_array_cdr_op_ch
-// ************************************************************
-
 /**
  * @class be_visitor_array_cdr_op_ch
  *
@@ -28,7 +24,6 @@
  */
 class be_visitor_array_cdr_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_array_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
index d4a073e81ba..37a47bca364 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_ARRAY_CDR_OP_CI_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CI_H_
 
-// ************************************************************
-// class be_visitor_array_cdr_op_ci
-// ************************************************************
-
 /**
  * @class be_visitor_array_cdr_op_ci
  *
@@ -28,13 +24,12 @@
  */
 class be_visitor_array_cdr_op_ci : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_array_cdr_op_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_cdr_op_ci (void);
+  ~be_visitor_array_cdr_op_ci ();
 
   /// visit array
   virtual int visit_array (be_array *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
index e7d71720731..74e27770b22 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
@@ -17,10 +17,6 @@
 #ifndef _BE_VISITOR_ARRAY_CDR_OP_CS_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CS_H_
 
-// ************************************************************
-// class be_visitor_array_cdr_op_cs
-// ************************************************************
-
 /**
  * @class be_visitor_array_cdr_op_cs
  *
@@ -32,7 +28,6 @@
  */
 class be_visitor_array_cdr_op_cs : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_array_cdr_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h
index 5e3975cb5ac..a84e1631b05 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_component : public be_visitor_interface
 {
-
 public:
   be_visitor_component (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h
index 114f5683ca8..07f40ba9a42 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h
@@ -23,7 +23,7 @@ class be_visitor_executor_exs
 public:
   be_visitor_executor_exs (be_visitor_context *ctx);
 
-  ~be_visitor_executor_exs ();
+  ~be_visitor_executor_exs () = default;
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h
index b9f017e416f..d87d3309fd3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h
@@ -27,7 +27,7 @@ class be_visitor_servant_svh : public be_visitor_component_scope
 public:
   be_visitor_servant_svh (be_visitor_context *ctx);
 
-  ~be_visitor_servant_svh ();
+  ~be_visitor_servant_svh () = default;
 
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h
index f9cac557f89..eb1c0223e6d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h
@@ -24,7 +24,7 @@ class be_visitor_servant_svs
 public:
   be_visitor_servant_svs (be_visitor_context *ctx);
 
-  ~be_visitor_servant_svs ();
+  ~be_visitor_servant_svs () = default;
 
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h
index 7aa27cfb24a..b4c3d0a8e79 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_component_fwd_any_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h
index 69b53aaefe0..bcd805d6ff2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_component_fwd_cdr_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
index a5d46ffa8a7..f009b9ec830 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_ENUM_ANY_OP_CH_H_
 #define _BE_VISITOR_ENUM_ANY_OP_CH_H_
 
@@ -24,16 +23,15 @@
  */
 class be_visitor_enum_any_op_ch : public be_visitor_scope
 {
-
 public:
   /// constructor
   be_visitor_enum_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_enum_any_op_ch ();
+  ~be_visitor_enum_any_op_ch () override = default;
 
   /// visit enum
-  virtual int visit_enum (be_enum *node);
+  int visit_enum (be_enum *node) override;
 };
 
 #endif /* _BE_VISITOR_ENUM_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
index 4fd3d8f6e4b..5bd3cf696f4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_enum_any_op_cs : public be_visitor_scope
 {
-
 public:
   /// constructor
   be_visitor_enum_any_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
index 07e4f1b9609..1911a2d922d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_enum_cdr_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_enum_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
index c7a39686789..695718f6f93 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_ENUM_CDR_OP_CS_H_
 #define _BE_VISITOR_ENUM_CDR_OP_CS_H_
 
@@ -24,16 +23,15 @@
  */
 class be_visitor_enum_cdr_op_cs : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_enum_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_enum_cdr_op_cs ();
+  ~be_visitor_enum_cdr_op_cs () override = default;
 
   /// visit enum
-  virtual int visit_enum (be_enum *node);
+  int visit_enum (be_enum *node) override;
 };
 
 #endif /* _BE_VISITOR_ENUM_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
index c1514b5f712..b96a7d6955c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
@@ -24,24 +24,22 @@
 class be_visitor_enum_ch : public be_visitor_scope
 {
 public:
-  /// conenumor
+  /// constructor
   be_visitor_enum_ch (be_visitor_context *ctx);
 
-  /// deenumor
-  ~be_visitor_enum_ch ();
+  /// destructor
+  ~be_visitor_enum_ch () override = default;
 
   /// visit enum.
-  virtual int visit_enum (be_enum *node);
+  int visit_enum (be_enum *node) override;
 
   // =visit operations on syntactically valid elements in our scope
 
   /// visit enum_val
-  virtual int visit_enum_val (be_enum_val *node);
-
-  // = helper
+  int visit_enum_val (be_enum_val *node) override;
 
   /// generate a comma after each element is processed
-  virtual int post_process (be_decl *);
+  int post_process (be_decl *) override;
 };
 
 #endif /* _BE_VISITOR_ENUM_ENUM_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
index dcb06a90627..15ced5417b2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_ENUM_ENUM_CS_H_
 #define _BE_VISITOR_ENUM_ENUM_CS_H_
 
@@ -24,14 +23,14 @@
 class be_visitor_enum_cs : public be_visitor_scope
 {
 public:
-  /// conenumor
+  /// constructor
   be_visitor_enum_cs (be_visitor_context *ctx);
 
-  /// deenumor
-  ~be_visitor_enum_cs ();
+  /// destructor
+  ~be_visitor_enum_cs () override = default;
 
   /// visit enum and generate the typecode
-  virtual int visit_enum (be_enum *node);
+  int visit_enum (be_enum *node) override;
 };
 
 #endif /* _BE_VISITOR_ENUM_ENUM_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
index e49da61f6f9..be74bd2ddfa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_exception_any_op_ch : public be_visitor_scope
 {
-
 public:
   be_visitor_exception_any_op_ch (be_visitor_context *ctx);
   ~be_visitor_exception_any_op_ch ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
index 4a252adef3d..6a76beee988 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_exception_any_op_cs : public be_visitor_scope
 {
-
 public:
   be_visitor_exception_any_op_cs (be_visitor_context *ctx);
   ~be_visitor_exception_any_op_cs ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
index 462beb7214b..c87c3491f59 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_exception_cdr_op_ch : public be_visitor_exception
 {
-
 public:
   be_visitor_exception_cdr_op_ch (be_visitor_context *ctx);
   ~be_visitor_exception_cdr_op_ch ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
index ed86886f347..fcada545e8a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_exception_cdr_op_cs : public be_visitor_exception
 {
-
 public:
   be_visitor_exception_cdr_op_cs (be_visitor_context *ctx);
   ~be_visitor_exception_cdr_op_cs ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
index e7f10cd0346..ffbc746d40d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
@@ -49,7 +49,6 @@ public:
 
 private:
   int emit_common (be_type *node);
-
 };
 
 #endif /* _BE_VISITOR_EXCEPTION_CTOR_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
index c8a3e0b3a96..eb419b9481c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
@@ -23,7 +23,7 @@ class be_visitor_exception_ctor : public be_visitor_scope
 {
 public:
   be_visitor_exception_ctor (be_visitor_context *ctx);
-  ~be_visitor_exception_ctor (void);
+  ~be_visitor_exception_ctor ();
 
   virtual int post_process (be_decl *);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
index 14423fd2e60..202a3b90b48 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
@@ -23,7 +23,6 @@
  */
 class be_visitor_interface_any_op_ch : public be_visitor_interface
 {
-
 public:
   be_visitor_interface_any_op_ch (be_visitor_context *ctx);
   ~be_visitor_interface_any_op_ch ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
index 47ba221489f..b26768c60fb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
@@ -23,7 +23,6 @@
  */
 class be_visitor_interface_any_op_cs : public be_visitor_interface
 {
-
 public:
   be_visitor_interface_any_op_cs (be_visitor_context *ctx);
   ~be_visitor_interface_any_op_cs ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
index 478b6d191f9..7c042a49dae 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_interface_cdr_op_ch : public be_visitor_interface
 {
-
 public:
   be_visitor_interface_cdr_op_ch (be_visitor_context *ctx);
   ~be_visitor_interface_cdr_op_ch ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
index 79f212abee7..5328907432a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_interface_cdr_op_cs : public be_visitor_interface
 {
-
 public:
   be_visitor_interface_cdr_op_cs (be_visitor_context *ctx);
   ~be_visitor_interface_cdr_op_cs ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
index 1b10d9ab9d4..65a97639919 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
@@ -22,7 +22,6 @@
  */
 class be_visitor_interface_direct_proxy_impl_sh : public be_visitor_interface
 {
-
 public:
   // -- Ctor/Dtor Decl. --
   be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
index cf818e8a44b..b0abe123b18 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
@@ -21,7 +21,6 @@
  */
 class be_visitor_interface_direct_proxy_impl_ss : public be_visitor_interface
 {
-
 public:
   // -- Ctor/Dtor Decl. --
   be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h
index dd15ff9eb80..dd620947a1e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h
@@ -22,7 +22,6 @@
  */
 class be_visitor_interface_smart_proxy_ch : public be_visitor_interface
 {
-
 public:
   /// constructor
   be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h
index d407b35f477..3c8ade204f3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h
@@ -21,7 +21,6 @@
  */
 class be_visitor_interface_smart_proxy_cs : public be_visitor_interface
 {
-
 public:
   /// constructor
   be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
index 65986f49535..6360fa8aa6f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_interface_fwd_any_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h
index 950f3d6914e..60ea369f911 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_interface_fwd_cdr_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
index e18ae92a0f8..1675ce7f91c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_module_any_op : public be_visitor_module
 {
-
 public:
   /// constructor
   be_visitor_module_any_op (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
index c78e389a3b2..e3c25249dac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_module_cdr_op : public be_visitor_module
 {
-
 public:
   /// constructor
   be_visitor_module_cdr_op (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
index 64c12a08c6d..13673dc6aae 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_module : public be_visitor_scope
 {
-
 public:
   be_visitor_module (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h
index 3e2e37c3562..b43245c5b37 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_NATIVE_NATIVE_CH_H_
 #define _BE_VISITOR_NATIVE_NATIVE_CH_H_
 
@@ -19,19 +18,19 @@
  *
  * @brief be_visitor_native_ch
  *
- * This is the base visitor for enum for the header file
+ * This is the base visitor for native for the header file
  */
 class be_visitor_native_ch : public be_visitor_scope
 {
 public:
-  /// conenumor
+  /// constructor
   be_visitor_native_ch (be_visitor_context *ctx);
 
-  /// deenumor
-  ~be_visitor_native_ch ();
+  /// destructor
+  ~be_visitor_native_ch () override = default;
 
   /// visit native.
-  virtual int visit_native (be_native *node);
+  int visit_native (be_native *node) override;
 };
 
 #endif /* _BE_VISITOR_NATIVE_NATIVE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h
index a3bb7bd730d..56269d211e1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h
@@ -28,7 +28,6 @@ class be_visitor_amh_rh_operation_sh : public be_visitor_operation
     ~be_visitor_amh_rh_operation_sh ();
 
     int visit_operation (be_operation *node);
-
 };
 
 #endif /* AMH_RH_OPERATION_SH_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h
index 09a5a3eeb52..7954fc9b11a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h
@@ -31,7 +31,6 @@
 class be_visitor_operation_exceptlist_ss : public be_visitor_decl
 {
 public:
-
   /// constructor
   be_visitor_operation_exceptlist_ss (be_visitor_context * ctx);
 
@@ -40,7 +39,6 @@ public:
 
   /// visit the operation
   int visit_operation (be_operation * node);
-
 };
 
 #endif /* _BE_VISITOR_OPERATION_EXCEPTIONLIST_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h
index b35c5df1a10..2afcfb6d424 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h
@@ -18,7 +18,6 @@ class be_visitor_operation_upcall_command_ss
   : public be_visitor_operation
 {
 public:
-
   /// constructor
   be_visitor_operation_upcall_command_ss (be_visitor_context * ctx);
 
@@ -32,10 +31,8 @@ public:
              char const * upcall_command_name);
 
 private:
-
   /// Generate the upcall.
   int gen_upcall (be_operation * node);
-
 };
 
 #endif /* _BE_VISITOR_OPERATION_UPCALL_COMMAND_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index 3322d73e1e3..a80082fac0c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -23,7 +23,6 @@
  */
 class be_visitor_root : public be_visitor_module
 {
-
 public:
   be_visitor_root (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
index c1df47e39d3..63027ce26d2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_sequence_any_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_sequence_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
index 916eaea173b..5c1850579fa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_sequence_any_op_cs : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_sequence_any_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
index e43be03ecb5..3fec61a78c4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
@@ -58,7 +58,6 @@ public:
 protected:
   /// helper that does the common job
   int visit_node (be_type *);
-
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
index 7d6ee5e5b29..0b5ef311fe3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_sequence_cdr_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
index 530d6f85398..7d2e369a5c6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
@@ -14,10 +14,6 @@
 #ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_
 #define _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_
 
-// ************************************************************
-// class be_visitor_sequence_cs
-// ************************************************************
-
 /**
  * @class be_visitor_sequence_cdr_op_cs
  *
@@ -28,7 +24,6 @@
  */
 class be_visitor_sequence_cdr_op_cs : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_sequence_cdr_op_cs (be_visitor_context *ctx);
@@ -93,10 +88,8 @@ public:
   virtual int visit_union (be_union *node);
 
 protected:
-
   /// helper that does the common job
   int visit_node (be_type *);
-
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
index 47313216b25..9539ebbe056 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
@@ -59,7 +59,6 @@ public:
 protected:
   /// helper that does the common job
   int visit_node (be_type *);
-
 };
 
 /**
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
index c7d3270ab32..7085a6f2bd0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
@@ -26,13 +26,12 @@
  */
 class be_visitor_structure_any_op_ch : public be_visitor_structure
 {
-
 public:
   /// constructor
   be_visitor_structure_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_any_op_ch ();
+  ~be_visitor_structure_any_op_ch () = default;
 
   /// visit structure
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
index 72d670410f6..36a99eebdc2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
@@ -26,13 +26,12 @@
  */
 class be_visitor_structure_any_op_cs : public be_visitor_structure
 {
-
 public:
   /// constructor
   be_visitor_structure_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_any_op_cs ();
+  ~be_visitor_structure_any_op_cs () = default;
 
   /// visit structure
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
index a5d002c62e4..0b8058d3d22 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
@@ -26,13 +26,12 @@
  */
 class be_visitor_structure_cdr_op_ch : public be_visitor_structure
 {
-
 public:
   /// constructor
   be_visitor_structure_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_cdr_op_ch ();
+  ~be_visitor_structure_cdr_op_ch () = default;
 
   /// visit structure
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
index f307404d16a..17300ece38c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_structure_cdr_op_cs : public be_visitor_structure
 {
-
 public:
   /// constructor
   be_visitor_structure_cdr_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
index afc9cffa36e..d2c31903e83 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_H_
 
@@ -25,19 +24,19 @@
 class be_visitor_structure : public be_visitor_scope
 {
 public:
-  /// constructureor
+  /// constructur
   be_visitor_structure (be_visitor_context *ctx);
 
-  /// destructureor
-  ~be_visitor_structure ();
+  /// destructur
+  ~be_visitor_structure () override = default;
 
   /// visit structure. We provide code for this method in the derived class
-  virtual int visit_structure (be_structure *node);
+  int visit_structure (be_structure *node) override;
 
   // =visit operations on syntactically valid elements in our scope
 
   /// visit field
-  virtual int visit_field (be_field *node);
+  int visit_field (be_field *node) override;
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_STRUCTURE_H_ */
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 e3e4db8d5f4..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
@@ -15,7 +15,6 @@
 
 namespace TAO
 {
-
   /**
    * @class be_visitor_alias_typecode
    *
@@ -27,7 +26,6 @@ namespace TAO
     : public be_visitor_typecode_defn
   {
   public:
-
     /// Constructor.
     be_visitor_alias_typecode (be_visitor_context * ctx);
 
@@ -48,9 +46,7 @@ namespace TAO
     int common (be_type * node,
                 be_type * base,
                 const char * tctype);
-
   };
-
 }
 
 #endif  /* TAO_BE_VISITOR_ALIAS_TYPECODE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h
index 42e1a55ca89..d31418ef47b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h
@@ -17,7 +17,6 @@
 
 namespace TAO
 {
-
   /**
    * @class be_visitor_enum_typecode
    *
@@ -29,7 +28,6 @@ namespace TAO
     : public be_visitor_typecode_defn
   {
   public:
-
     /// Constructor.
     be_visitor_enum_typecode (be_visitor_context * ctx);
 
@@ -44,12 +42,9 @@ namespace TAO
     virtual int visit_enum (be_enum * node);
 
   private:
-
     /// Generate structure field related TypeCode code.
     int visit_members (be_enum * node);
-
   };
-
 }
 
 #endif  /* TAO_BE_VISITOR_ENUM_TYPECODE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h
index 3b104a97762..c11210fbca4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h
@@ -15,7 +15,6 @@
 
 namespace TAO
 {
-
   /**
    * @class be_visitor_struct_typecode
    *
@@ -27,7 +26,6 @@ namespace TAO
     : public be_visitor_typecode_defn
   {
   public:
-
     /// Constructor.
     be_visitor_struct_typecode (be_visitor_context * ctx);
 
@@ -52,7 +50,6 @@ namespace TAO
     virtual int visit_exception (be_exception * node);
 
   private:
-
     /// Underlying structure/exception visitor code.
     /**
      * @note Structure/exception TypeCode generation really starts in
@@ -67,7 +64,6 @@ namespace TAO
     int visit_members (AST_Structure * node);
 
   private:
-
     /// @c true if the struct is recursive.
     /**
      * @note Only applies for struct TypeCodes.  Exceptions cannot be
@@ -78,9 +74,7 @@ namespace TAO
     /// @c true if this visitor is already visiting an outer scope
     /// struct or exception
     bool is_nested_;
-
   };
-
 }
 
 #endif  /* TAO_BE_VISITOR_STRUCT_TYPECODE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
index 6f6ae5b285b..ee94b220535 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
@@ -23,7 +23,6 @@
  */
 class be_visitor_typecode_decl : public be_visitor_decl
 {
-
 public:
   be_visitor_typecode_decl (be_visitor_context *ctx);
   ~be_visitor_typecode_decl ();
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
index 242f3b0c74e..4fcfc3fb8b7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
@@ -99,7 +99,6 @@ protected:
   void gen_end_NS_for_anon ();
 
 protected:
-
   /// Queue to keep nodes
   ACE_Unbounded_Queue <QNode*> tc_queue_;
 
@@ -139,7 +138,6 @@ private:
   int pop (ACE_CDR::Long &);
 
 protected:
-
   // queue related routines
 
   const QNode *queue_insert (ACE_Unbounded_Queue <QNode*> &,
@@ -148,7 +146,6 @@ protected:
   const QNode *queue_lookup (ACE_Unbounded_Queue <QNode*> &, be_type *node);
 
   void queue_reset (ACE_Unbounded_Queue <QNode*> &);
-
 };
 
 #endif /* _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h
index 1af092e18f7..ca7aee82983 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h
@@ -15,7 +15,6 @@
 
 namespace TAO
 {
-
   /**
    * @class be_visitor_union_typecode
    *
@@ -27,7 +26,6 @@ namespace TAO
     : public be_visitor_typecode_defn
   {
   public:
-
     /// Constructor.
     be_visitor_union_typecode (be_visitor_context * ctx);
 
@@ -42,7 +40,6 @@ namespace TAO
     virtual int visit_union (be_union * node);
 
   private:
-
     /// Generate union field TypeCode declarations, if necessary.
     int gen_case_typecodes (be_union * node);
 
@@ -50,16 +47,13 @@ namespace TAO
     int visit_cases (be_union * node);
 
   private:
-
     /// @c true if the union is recursive.
     bool is_recursive_;
 
     /// @c true if this visitor is already visiting an outer scope
     /// struct or exception
     bool is_nested_;
-
   };
-
 }
 
 #endif  /* TAO_BE_VISITOR_UNION_TYPECODE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h
index e618dd2970d..7870d9ab8ac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h
@@ -15,7 +15,6 @@
 
 namespace TAO
 {
-
   /**
    * @class be_visitor_value_typecode
    *
@@ -27,7 +26,6 @@ namespace TAO
     : public be_visitor_typecode_defn
   {
   public:
-
     /// Constructor.
     be_visitor_value_typecode (be_visitor_context * ctx);
 
@@ -42,7 +40,6 @@ namespace TAO
     virtual int visit_valuetype (be_valuetype * node);
 
   private:
-
     /// Generate valuetype field TypeCode declarations, if necessary.
     int gen_member_typecodes (be_valuetype * node);
 
@@ -50,16 +47,13 @@ namespace TAO
     int visit_members (be_valuetype * node);
 
   private:
-
     /// @c true if the valuetype or eventtype is recursive.
     bool is_recursive_;
 
     /// @c true if this visitor is already visiting an outer scope
     /// struct or exception
     bool is_nested_;
-
   };
-
 }
 
 #endif  /* TAO_BE_VISITOR_VALUE_TYPECODE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
index b56dc448931..7507c9272d3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
@@ -27,7 +27,6 @@
  */
 class be_visitor_typedef_any_op_ch : public be_visitor_typedef
 {
-
 public:
   /// constructor
   be_visitor_typedef_any_op_ch (be_visitor_context *ctx);
@@ -55,7 +54,6 @@ public:
 
   /// visit a union
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
index aa4b7381f82..1fd008578ab 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
@@ -27,7 +27,6 @@
  */
 class be_visitor_typedef_any_op_cs : public be_visitor_typedef
 {
-
 public:
   /// constructor
   be_visitor_typedef_any_op_cs (be_visitor_context *ctx);
@@ -55,7 +54,6 @@ public:
 
   /// visit a union
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
index 087b3da6db2..9a57a7a736e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_typedef_cdr_op_ch : public be_visitor_typedef
 {
-
 public:
   /// constructor
   be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
index 10fc1214464..f78c72ae258 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_typedef_cdr_op_cs : public be_visitor_typedef
 {
-
 public:
   /// constructor
   be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
index d287c2a4061..bf544c41446 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_typedef : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_typedef (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
index 3426539cbde..263bbdd53e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_union_any_op_ch : public be_visitor_union
 {
-
 public:
   be_visitor_union_any_op_ch (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
index c8983f61874..99334d4b0be 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_union_any_op_cs : public be_visitor_union
 {
-
 public:
   be_visitor_union_any_op_cs (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
index 1ce2eca9e79..557847e8b9d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_union_cdr_op_ch : public be_visitor_union
 {
-
 public:
   /// constructor
   be_visitor_union_cdr_op_ch (be_visitor_context *ctx);
@@ -36,7 +35,6 @@ public:
 
   /// visit union
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
index ecfbe0ef1a7..3990644f8ea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
@@ -26,7 +26,6 @@
  */
 class be_visitor_union_cdr_op_cs : public be_visitor_union
 {
-
 public:
   /// constructor
   be_visitor_union_cdr_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
index 037f3e95ada..2b35cacd244 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
@@ -36,7 +36,6 @@ public:
   /// visit an enum. Required to generate the typecode for an enum definition
   /// appearing side the union
   virtual int visit_enum (be_enum *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_DISCRIMINANT_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
index a70a7905448..24920107c00 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
@@ -33,7 +33,6 @@ public:
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_UNION_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
index c94dda604c1..6319c6b8936 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
@@ -33,7 +33,6 @@ public:
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_UNION_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
index e7de0e48a79..de0d1a59ada 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
@@ -33,7 +33,6 @@ public:
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_UNION_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
index af566f93483..4d76addd7ad 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
@@ -52,7 +52,6 @@ public:
 
   /// visit union type
   virtual int visit_union (be_union *node);
-
 };
 
 #endif /*  _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
index 4159df97ac9..b740b24ed88 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
@@ -50,7 +50,6 @@ public:
 
 private:
   int emit_valuetype_common (be_type *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
index 4667b8f4801..ea0334aca6f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
@@ -49,7 +49,6 @@ public:
 
 private:
   int emit_valuetype_common  (be_type *node);
-
 };
 
 #endif /* _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
index 080cc5ae17b..9798cec81e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_valuebox_any_op_ch : public be_visitor_valuebox
 {
-
 public:
   /// constructor
   be_visitor_valuebox_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
index cd90d608340..24e554a25c4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_valuebox_any_op_cs : public be_visitor_valuebox
 {
-
 public:
   /// constructor
   be_visitor_valuebox_any_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
index 8b0036312bb..d520652c7c3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_valuebox_cdr_op_ch : public be_visitor_valuebox
 {
-
 public:
   /// constructor
   be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
index 37bf0fadb88..0186d84e1f4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_valuebox_cdr_op_cs : public be_visitor_valuebox
 {
-
 public:
   /// constructor
   be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx);
@@ -35,7 +34,6 @@ public:
 
   /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
-
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
index 34fefe71189..e47aa9907a7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
@@ -90,7 +90,6 @@ private:
                         const char *const_prefix,
                         const char *type_suffix,
                         const char *const_method);
-
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_FIELD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
index a51de1e2bf3..72990f109aa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
@@ -90,7 +90,6 @@ private:
 
   void emit_boxed_member_var (be_decl *node,
                               const char * type_suffix);
-
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
index 04f7d3c99f7..e2ab5f1ce56 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
@@ -62,12 +62,10 @@ public:
   virtual int visit_union (be_union *node);
 
 private:
-
   /// Generate virtual destructor.
   void emit_destructor ();
 
   int emit_for_predef_enum (char const * marshal_arg);
-
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
index 8e3bb6945de..858f46771c4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_valuetype_any_op_ch : public be_visitor_valuetype
 {
-
 public:
   /// constructor
   be_visitor_valuetype_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
index 59592143bf3..a1fe7037f1e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_valuetype_any_op_cs : public be_visitor_valuetype
 {
-
 public:
   /// constructor
   be_visitor_valuetype_any_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
index 524ff9818ce..8b16523072e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_valuetype_cdr_op_ch : public be_visitor_valuetype
 {
-
 public:
   /// constructor
   be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
index a3e0a812808..c28b7c675ee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
@@ -25,13 +25,12 @@
  */
 class be_visitor_valuetype_cdr_op_ci : public be_visitor_valuetype
 {
-
 public:
   /// constructor
   be_visitor_valuetype_cdr_op_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_cdr_op_ci (void);
+  ~be_visitor_valuetype_cdr_op_ci ();
 
   /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
index 8edf6514674..c88acdbc123 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_valuetype_cdr_op_cs : public be_visitor_valuetype
 {
-
 public:
   /// constructor
   be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
index c85bb564e38..7748d1d0e27 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
@@ -89,7 +89,6 @@ public:
 
 private:
   int valuetype_common (be_type *);
-
 };
 
 /**
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
index 4363664d7db..e422fd64e29 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
@@ -25,7 +25,6 @@
  */
 class be_visitor_valuetype_marshal_ch : public be_visitor_scope
 {
-
 public:
   /// constructor
   be_visitor_valuetype_marshal_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
index 8e23ed10fbe..0b80fbe28d2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
@@ -25,6 +25,8 @@
  */
 class be_visitor_valuetype_marshal_cs : public be_visitor_scope
 {
+  int marshal_state (be_valuetype *node);
+  int unmarshal_state (be_valuetype *node);
 
 public:
   /// constructor
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
index fe09e70ad43..3c9a80fe600 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -25,9 +25,7 @@
  */
 class be_visitor_valuetype : public be_visitor_scope
 {
-
 public:
-
   /// constructor
   be_visitor_valuetype (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
index 44e785a5013..d61b94450e4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
@@ -37,6 +37,8 @@ public:
 private:
   /// Recursive to generate for inherited members.
   void gen_ostream_operator_r (be_valuetype *node, unsigned long &index);
+
+  void marshal_unmarshal_v (be_valuetype *node);
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
index 9157b6c534c..9d8005fe94b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_valuetype_init : public be_visitor_valuetype
 {
-
 public:
   /// constructor
   be_visitor_valuetype_init (be_visitor_context *ctx);
@@ -33,7 +32,6 @@ public:
   ~be_visitor_valuetype_init ();
 
 public:
-
   void begin_public ();
   void begin_private ();
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
index 1bb2b44360f..436e47f68a8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
@@ -24,7 +24,6 @@
  */
 class be_visitor_valuetype_fwd_any_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
index 0a3761bf5f2..1fdb704a7bb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
@@ -27,7 +27,6 @@
  */
 class be_visitor_valuetype_fwd_cdr_op_ch : public be_visitor_decl
 {
-
 public:
   /// constructor
   be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 94b811bb67a..03c82030f93 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -186,7 +186,6 @@ DRV_parse_args (long ac, char **av)
   ACE_CString buffer;
   char *s = nullptr;
   long i;
-  bool has_space = false;
 
   // After -- process all arguments as files
   bool just_files = false;
@@ -230,7 +229,6 @@ DRV_parse_args (long ac, char **av)
                         ));
                       idl_global->parse_args_exit (1);
                       return;
-
                     }
                 }
               else
@@ -285,14 +283,9 @@ DRV_parse_args (long ac, char **av)
                   if (i < ac - 1)
                     {
                       idl_global->append_idl_flag (av[i + 1]);
-                      has_space = FE_Utils::hasspace (av[i + 1]);
 
-                      // If the include path has a space, we need to
-                      // add literal "s.
                       ACE_CString arg = av[i];
-                      arg += (has_space ? "\"" : "");
                       arg += av[i + 1];
-                      arg += (has_space ? "\"" : "");
 
                       DRV_cpp_putarg (arg.c_str ());
                       idl_global->add_include_path (arg.substr (2).c_str (), false);
@@ -305,14 +298,8 @@ DRV_parse_args (long ac, char **av)
                 }
               else
                 {
-                  has_space = FE_Utils::hasspace (av[i]);
-
-                  // If the include path has a space, we need to
-                  // add literal "s.
                   ACE_CString arg (av[i], 2);
-                  arg += (has_space ? "\"" : "");
                   arg += av[i] + 2;
-                  arg += (has_space? "\"" : "");
 
                   idl_global->add_include_path (arg.substr (2).c_str (), false);
                   DRV_cpp_putarg (arg.c_str ());
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 9a188c9fa25..e1638f94bb1 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -88,6 +88,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_sys_stat.h"
 
 // Storage for preprocessor args.
 unsigned long const DRV_MAX_ARGCOUNT = 1024;
@@ -143,22 +144,11 @@ DRV_cpp_putarg (const char *str)
   char *replace = nullptr;
   if (str)
     {
-      const char *const first_quote = ACE_OS::strchr (str, '"');
       bool allocate_error = false;
 
-      if (ACE_OS::strchr (str, ' ') && !first_quote)
-        {
-          ACE_NEW_NORETURN (replace, char[ACE_OS::strlen (str) + 3]);
-          allocate_error = !replace;
-          if (replace)
-            {
-              replace[0] = '"';
-              ACE_OS::strcpy (replace + 1, str);
-              ACE_OS::strcat (replace, "\"");
-            }
-        }
 #ifdef ACE_WIN32
-      else if (first_quote)
+      const char *const first_quote = ACE_OS::strchr (str, '"');
+      if (first_quote)
         {
           // Escape Doublequotes on Windows
 
@@ -188,6 +178,17 @@ DRV_cpp_putarg (const char *str)
             }
         }
 #endif
+      if (ACE_OS::strchr (str, ' '))
+        {
+          ACE_NEW_NORETURN (replace, char[ACE_OS::strlen (str) + 3]);
+          allocate_error = !replace;
+          if (replace)
+            {
+              replace[0] = '"';
+              ACE_OS::strcpy (replace + 1, str);
+              ACE_OS::strcat (replace, "\"");
+            }
+        }
 
       if (allocate_error)
         {
@@ -485,13 +486,8 @@ DRV_sweep_dirs (const char *rel_path,
             {
               if (!include_added)
                 {
-                  /// Surround the path name with quotes, in
-                  /// case the original path argument included
-                  /// spaces. If it didn't, no harm done.
-                  ACE_CString incl_arg ("-I ");
-                  incl_arg += '\"';
+                  ACE_CString incl_arg ("-I");
                   incl_arg += bname;
-                  incl_arg += '\"';
                   DRV_cpp_putarg (incl_arg.c_str ());
                   idl_global->add_rel_include_path (bname.c_str ());
                   full_path = ACE_OS::realpath ("", abspath);
@@ -1123,6 +1119,27 @@ DRV_stripped_name (char *fn)
 void
 DRV_pre_proc (const char *myfile)
 {
+  // Check to see that the file is a normal file. If we don't and the file is a
+  // directory, then the copy would be blank and any error message later might
+  // not be helpful.
+  ACE_stat file_stat;
+  if (ACE_OS::stat (myfile, &file_stat) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "%C: ERROR: Unable to open file (stat) \"%C\": %m\n",
+                  idl_global->prog_name (),
+                  myfile));
+      throw Bailout ();
+    }
+  else if ((file_stat.st_mode & S_IFREG) != S_IFREG)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "%C: ERROR: This is not a regular file: \"%C\"\n",
+                  idl_global->prog_name (),
+                  myfile));
+      throw Bailout ();
+    }
+
   const char* tmpdir = idl_global->temp_dir ();
   static const char temp_file_extension[] = ".cpp";
 
@@ -1194,14 +1211,12 @@ DRV_pre_proc (const char *myfile)
   // Rename temporary files so that they have extensions accepted
   // by the preprocessor.
   FILE * const file = ACE_OS::fopen (myfile, "r");
-
   if (file == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: ERROR: Unable to open file : %m\n",
+                  "%C: ERROR: Unable to open file (fopen) \"%C\": %m\n",
                   idl_global->prog_name (),
                   myfile));
-
       (void) ACE_OS::unlink (tmp_ifile);
       (void) ACE_OS::unlink (tmp_file);
       throw Bailout ();
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index d22f815b466..4f8615a1a40 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -146,8 +146,8 @@
 #include <fe_utils.h>
 
 void tao_yyerror (const char *);
-int tao_yylex (void);
-extern "C" int tao_yywrap (void);
+int tao_yylex ();
+extern "C" int tao_yywrap ();
 
 extern char tao_yytext[];
 extern int tao_yyleng;
@@ -709,7 +709,6 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
 
 
 
-
 #ifdef short
 # undef short
 #endif
@@ -2446,7 +2445,6 @@ int yydebug;
 
 
 
-
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
@@ -2476,13 +2474,12 @@ int yynerrs;
 
 
 
-
 /*----------.
 | yyparse.  |
 `----------*/
 
 int
-yyparse (void)
+yyparse ()
 {
     yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
@@ -2514,7 +2511,6 @@ yyparse (void)
   YYSTYPE yyval;
 
 
-
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   /* The number of symbols on the RHS of the reduced rule.
@@ -10123,7 +10119,6 @@ yyreduce:
   case 566: /* formal_parameter: formal_parameter_type IDENTIFIER  */
 #line 6685 "fe/idl.ypp"
         {
-
           ACE_NEW_RETURN ((yyval.pival),
                           FE_Utils::T_Param_Info,
                           1);
@@ -10906,7 +10901,7 @@ yyreturn:
  * ???
  */
 int
-tao_yywrap (void)
+tao_yywrap ()
 {
   return 1;
 }
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index b4759822f45..566e026cb55 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -543,10 +543,10 @@ YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
 void yy_delete_buffer ( YY_BUFFER_STATE b  );
 void yy_flush_buffer ( YY_BUFFER_STATE b  );
 void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state ( void );
+void yypop_buffer_state ();
 
-static void yyensure_buffer_stack ( void );
-static void yy_load_buffer_state ( void );
+static void yyensure_buffer_stack ();
+static void yy_load_buffer_state ();
 static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
 #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
@@ -591,9 +591,9 @@ int yylineno = 1;
 
 extern char yytext[];
 
-static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_get_previous_state ();
 static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
-static int yy_get_next_buffer ( void );
+static int yy_get_next_buffer ();
 static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
@@ -1468,34 +1468,34 @@ static AST_Decl *           idl_find_node (const char *);
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals ( void );
+static int yy_init_globals ();
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy ( void );
+int yylex_destroy ();
 
-int yyget_debug ( void );
+int yyget_debug ();
 
 void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE yyget_extra ( void );
+YY_EXTRA_TYPE yyget_extra ();
 
 void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in ( void );
+FILE *yyget_in ();
 
 void yyset_in  ( FILE * _in_str  );
 
-FILE *yyget_out ( void );
+FILE *yyget_out ();
 
 void yyset_out  ( FILE * _out_str  );
 
-            int yyget_leng ( void );
+            int yyget_leng ();
 
-char *yyget_text ( void );
+char *yyget_text ();
 
-int yyget_lineno ( void );
+int yyget_lineno ();
 
 void yyset_lineno ( int _line_number  );
 
@@ -1505,9 +1505,9 @@ void yyset_lineno ( int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap ( void );
+extern "C" int yywrap ();
 #else
-extern int yywrap ( void );
+extern int yywrap ();
 #endif
 #endif
 
@@ -1527,9 +1527,9 @@ static int yy_flex_strlen ( const char * );
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput ( void );
+static int yyinput ();
 #else
-static int input ( void );
+static int input ();
 #endif
 
 #endif
@@ -1614,9 +1614,9 @@ static int input ( void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int yylex (void);
+extern int yylex ();
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex ()
 #endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -2712,7 +2712,7 @@ ECHO;
  *    EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *    EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
+static int yy_get_next_buffer ()
 {
         char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
     char *source = (yytext_ptr);
@@ -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 )
@@ -2820,7 +2819,7 @@ static int yy_get_next_buffer (void)
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
+    static yy_state_type yy_get_previous_state ()
 {
     yy_state_type yy_current_state;
     char *yy_cp;
@@ -2914,9 +2913,9 @@ static int yy_get_next_buffer (void)
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput (void)
+    static int yyinput ()
 #else
-    static int input  (void)
+    static int input  ()
 #endif
 
 {
@@ -2995,7 +2994,6 @@ static int yy_get_next_buffer (void)
  */
     void yyrestart  (FILE * input_file )
 {
-
     if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
         YY_CURRENT_BUFFER_LVALUE =
@@ -3012,7 +3010,6 @@ static int yy_get_next_buffer (void)
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
     /* TODO. We should be able to replace this entire function body
      * with
      *        yypop_buffer_state();
@@ -3041,7 +3038,7 @@ static int yy_get_next_buffer (void)
     (yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void yy_load_buffer_state  (void)
+static void yy_load_buffer_state  ()
 {
         (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
     (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
@@ -3085,7 +3082,6 @@ static void yy_load_buffer_state  (void)
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-
     if ( ! b )
         return;
 
@@ -3189,7 +3185,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
  *  The next element becomes the new top.
  *
  */
-void yypop_buffer_state (void)
+void yypop_buffer_state ()
 {
         if (!YY_CURRENT_BUFFER)
         return;
@@ -3208,12 +3204,11 @@ void yypop_buffer_state (void)
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void yyensure_buffer_stack (void)
+static void yyensure_buffer_stack ()
 {
     yy_size_t num_to_alloc;
 
     if (!(yy_buffer_stack)) {
-
         /* First allocation is just for 2 elements, since we don't know if this
          * scanner will even need a stack. We use 2 instead of 1 to avoid an
          * immediate realloc on the next call.
@@ -3233,7 +3228,6 @@ static void yyensure_buffer_stack (void)
     }
 
     if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
         /* Increase the buffer to prepare for a possible push. */
         yy_size_t grow_size = 8 /* arbitrary grow size */;
 
@@ -3296,7 +3290,6 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
  */
 YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
-
     return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
@@ -3369,16 +3362,15 @@ static void yynoreturn yy_fatal_error (const char* msg )
 /** Get the current line number.
  *
  */
-int yyget_lineno  (void)
+int yyget_lineno  ()
 {
-
     return yylineno;
 }
 
 /** Get the input stream.
  *
  */
-FILE *yyget_in  (void)
+FILE *yyget_in  ()
 {
         return yyin;
 }
@@ -3386,7 +3378,7 @@ FILE *yyget_in  (void)
 /** Get the output stream.
  *
  */
-FILE *yyget_out  (void)
+FILE *yyget_out  ()
 {
         return yyout;
 }
@@ -3394,7 +3386,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  *
  */
-int yyget_leng  (void)
+int yyget_leng  ()
 {
         return yyleng;
 }
@@ -3403,7 +3395,7 @@ int yyget_leng  (void)
  *
  */
 
-char *yyget_text  (void)
+char *yyget_text  ()
 {
         return yytext;
 }
@@ -3414,7 +3406,6 @@ char *yyget_text  (void)
  */
 void yyset_lineno (int  _line_number )
 {
-
     yylineno = _line_number;
 }
 
@@ -3434,7 +3425,7 @@ void yyset_out (FILE *  _out_str )
         yyout = _out_str ;
 }
 
-int yyget_debug  (void)
+int yyget_debug  ()
 {
         return yy_flex_debug;
 }
@@ -3444,7 +3435,7 @@ void yyset_debug (int  _bdebug )
         yy_flex_debug = _bdebug ;
 }
 
-static int yy_init_globals (void)
+static int yy_init_globals ()
 {
         /* Initialization is the same as for the non-reentrant scanner.
      * This function is called from yylex_destroy(), so don't allocate here.
@@ -3478,9 +3469,8 @@ static int yy_init_globals (void)
 }
 
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
+int yylex_destroy  ()
 {
-
     /* Pop the buffer stack, destroying each element. */
     while(YY_CURRENT_BUFFER){
         yy_delete_buffer( YY_CURRENT_BUFFER  );
@@ -3509,7 +3499,6 @@ int yylex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
-
     int i;
     for ( i = 0; i < n; ++i )
         s1[i] = s2[i];
@@ -3534,7 +3523,6 @@ void *yyalloc (yy_size_t  size )
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
 {
-
     /* The cast to (char *) in the following accommodates both
      * implementations that use char* generic pointers, and those
      * that use void* generic pointers.  It works with the latter
diff --git a/TAO/TAO_IDL/include/ast_annotation_appls.h b/TAO/TAO_IDL/include/ast_annotation_appls.h
index 0686717622e..20f5580edc3 100644
--- a/TAO/TAO_IDL/include/ast_annotation_appls.h
+++ b/TAO/TAO_IDL/include/ast_annotation_appls.h
@@ -1,9 +1,9 @@
 #ifndef AST_ANNOTATION_APPL_VECTOR_HEADER
 #define AST_ANNOTATION_APPL_VECTOR_HEADER
 
-#include "ace/Vector_T.h"
-#include "ace/Mutex.h"
 #include "ace/Bound_Ptr.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Vector_T.h"
 
 #include "TAO_IDL_FE_Export.h"
 
@@ -17,7 +17,9 @@ class AST_Annotation_Decl;
  */
 class TAO_IDL_FE_Export AST_Annotation_Appls {
 public:
-  typedef ACE_Strong_Bound_Ptr<AST_Annotation_Appl, ACE_Mutex> AST_Annotation_Appl_Ptr;
+//FUZZ: disable check_for_ACE_SYNCH_MUTEX
+  typedef ACE_Strong_Bound_Ptr<AST_Annotation_Appl, ACE_SYNCH_MUTEX> AST_Annotation_Appl_Ptr;
+//FUZZ: enable check_for_ACE_SYNCH_MUTEX
   typedef ACE_Vector<AST_Annotation_Appl_Ptr> AST_Annotation_Appl_Ptrs;
   typedef AST_Annotation_Appl_Ptrs::iterator iterator;
   typedef AST_Annotation_Appl_Ptrs::const_iterator const_iterator;
@@ -43,7 +45,7 @@ public:
   bool empty () const;
   size_t size () const;
 
-  /// Iterate through ACE_Strong_Bound_Ptr<AST_Annotation_Appl, ACE_Mutex>
+  /// Iterate through vector_
   ///{
   iterator begin ();
   iterator end ();
diff --git a/TAO/TAO_IDL/include/ast_annotation_decl.h b/TAO/TAO_IDL/include/ast_annotation_decl.h
index 28ae96220e4..184d2aab6c8 100644
--- a/TAO/TAO_IDL/include/ast_annotation_decl.h
+++ b/TAO/TAO_IDL/include/ast_annotation_decl.h
@@ -13,7 +13,6 @@
 class TAO_IDL_FE_Export AST_Annotation_Decl : public virtual AST_Structure
 {
 public:
-
   AST_Annotation_Decl (UTL_ScopedName *name);
 
   virtual ~AST_Annotation_Decl ();
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index cd00db1cfbe..106110d9821 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -69,7 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Class for all concrete types.
 // This is useful to group together IDL types other than objects.
-
 class TAO_IDL_FE_Export AST_ConcreteType : public virtual AST_Type
 {
 public:
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index c018be50aba..62064434224 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -236,7 +236,7 @@ public:
 
   void set_name (UTL_ScopedName *n);
 
-  Identifier *local_name ();
+  Identifier *local_name () const;
   void local_name (Identifier *id);
 
   Identifier *compute_local_name (const char *prefix,
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index 92eb7908cc9..70387c74934 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -66,7 +66,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _AST_EXTERN_AST_EXTERN_HH
 
 
-
 class AST_Type;
 class AST_Decl;
 
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index db8a9c0f11a..a120f8b7410 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -73,43 +73,42 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 //
 // This is useful wherever any IDL type defining construct can appear
 // such as the base type for a typedef or array.
-
 class TAO_IDL_FE_Export AST_Type : public virtual AST_Decl
 {
 public:
+  /// Indicates if we are fixed size or variable. Most useful for structs,
+  /// unions, and arrays.
   enum SIZE_TYPE
   {
     SIZE_UNKNOWN,
     FIXED,
     VARIABLE
   };
-  // Indicates if we are fixed size or variable. Most useful for structs,
-  // unions, and arrays.
 
   AST_Type (AST_Decl::NodeType nt,
             UTL_ScopedName *n);
 
   virtual ~AST_Type ();
 
-  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Determine if we are involved in some kind of limited recursion.
   // Most types cannot be involved except structs and unions.
   // The head element of the list the possibly recursed type we are checking for.
   // If the list is empty, we are trying to determine this for ourselves.
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
 
-  virtual void size_type (SIZE_TYPE);
   // Set the size type.
+  virtual void size_type (SIZE_TYPE);
 
-  virtual SIZE_TYPE size_type ();
   // Return our size type.
+  virtual SIZE_TYPE size_type ();
 
   // Accessors/mutators for the private members.
 
-  bool has_constructor ();
   // Accessor for protected member.
+  bool has_constructor ();
 
-  void has_constructor (bool value);
   // Mutator for protected member.
+  void has_constructor (bool value);
 
   bool ifr_added ();
   void ifr_added (bool val);
@@ -117,18 +116,18 @@ public:
   bool ifr_fwd_added ();
   void ifr_fwd_added (bool val);
 
+  // Type name of a node used when generating declarations.
   const char *nested_type_name (AST_Decl *d,
                                 const char *suffix = 0,
                                 const char *prefix = 0);
-  // Type name of a node used when generating declarations.
 
-  AST_Type *unaliased_type ();
   // Utility function to make sure we are using the unaliased type.
+  AST_Type *unaliased_type ();
 
-  virtual bool legal_for_primary_key () const;
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
+  virtual bool legal_for_primary_key () const;
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -137,15 +136,15 @@ public:
   virtual void destroy ();
 
 protected:
-  virtual int compute_size_type ();
   // Determine our size type and set it if it is unknown.
+  virtual int compute_size_type ();
 
+  // Type name of a node used when generating declarations.
   const char *nested_name (const char *local_name,
                            const char *full_name,
                            AST_Decl *use_scope,
                            const char *suffix,
                            const char *prefix);
-  // Type name of a node used when generating declarations.
 
   bool match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list);
 
@@ -157,21 +156,21 @@ protected:
   // Has this node been forward declared in this IDL file?
   bool ifr_fwd_added_;
 
-  SIZE_TYPE size_type_;
   // Whether we are fixed or variable size (by default fixed).
+  SIZE_TYPE size_type_;
 
-  bool has_constructor_;
   // Attribute that helps a union determine whether a member
   // should be included by value or by reference.
+  bool has_constructor_;
 
-  char *nested_type_name_;
   // For the corresponding method.
+  char *nested_type_name_;
 
-  long in_recursion_;
   // Storage once the value has been computed.
+  long in_recursion_;
 
-  mutable bool recursing_in_legal_pk_;
   // Node-specific flag to abort recursion in legal_for_primary_key().
+  mutable bool recursing_in_legal_pk_;
 };
 
 #endif           // _AST_TYPE_AST_TYPE_HH
diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h
index 55280e7ade4..c723d14fce4 100644
--- a/TAO/TAO_IDL/include/fe_component_header.h
+++ b/TAO/TAO_IDL/include/fe_component_header.h
@@ -15,7 +15,6 @@ class AST_Component;
 class FE_ComponentHeader : public FE_InterfaceHeader
 {
 public:
-
   FE_ComponentHeader (UTL_ScopedName *n,
                       UTL_ScopedName *base_component,
                       UTL_NameList *supports,
diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h
index 0dc51b91176..876830c8e06 100644
--- a/TAO/TAO_IDL/include/fe_obv_header.h
+++ b/TAO/TAO_IDL/include/fe_obv_header.h
@@ -12,7 +12,6 @@ class AST_ValueType;
 class TAO_IDL_FE_Export FE_OBVHeader : public FE_InterfaceHeader
 {
 public:
-
   FE_OBVHeader (UTL_ScopedName *n,
                 UTL_NameList *inherits,
                 UTL_NameList *supports,
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
index a70b9d0ff5d..4705e85be83 100644
--- a/TAO/TAO_IDL/include/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_list.h
@@ -120,7 +120,6 @@ private:
 class TAO_IDL_FE_Export UTL_ListActiveIterator
 {
 public:
-
   UTL_ListActiveIterator (UTL_List *s);
 
   virtual ~UTL_ListActiveIterator () {}
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 7b6d788df13..de9d4884456 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -93,7 +93,7 @@ public:
   virtual void dump (ACE_OSTREAM_TYPE &o);
   // Dump to the ostream.
 
-  char *get_string () {return this->p_str;}
+  char *get_string () const {return this->p_str;}
   // Get contents of utl_string.
 
   char *get_canonical_rep ();
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
index c4e67c16404..60d4447e7ca 100644
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ b/TAO/TAO_IDL/narrow/narrow.cpp
@@ -153,7 +153,7 @@ DeclAsScope (AST_Decl *d)
        * field and iterating
        */
       d = (dynamic_cast<AST_InterfaceFwd*> (d))->full_definition ();
-      // fallthrough
+      ACE_FALLTHROUGH;
     case AST_Decl::NT_interface:
       return dynamic_cast<AST_Interface*> (d);
     case AST_Decl::NT_valuetype:
diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc
index 51f10083268..91757abcc57 100644
--- a/TAO/TAO_IDL/tao_idl_be.mpc
+++ b/TAO/TAO_IDL/tao_idl_be.mpc
@@ -53,7 +53,7 @@ project(TAO_IDL_BE) : acelib, install_lib, tao_rules, tao_output, tao_vc8warning
   }
 }
 
-project(TAO_IDL_BE_VIS_A) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_A) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_A
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE
@@ -82,7 +82,7 @@ project(TAO_IDL_BE_VIS_A) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_C) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_C) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_C
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_A
@@ -112,7 +112,7 @@ project(TAO_IDL_BE_VIS_C) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_E) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_E) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_E
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_C
@@ -142,7 +142,7 @@ project(TAO_IDL_BE_VIS_E) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_I) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_I) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_I
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_E
@@ -172,7 +172,7 @@ project(TAO_IDL_BE_VIS_I) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_O) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_O) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_O
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_I
@@ -200,7 +200,7 @@ project(TAO_IDL_BE_VIS_O) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_S) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_S) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_S
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_O
@@ -231,7 +231,7 @@ project(TAO_IDL_BE_VIS_S) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_U) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_U) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_U
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_S
@@ -260,7 +260,7 @@ project(TAO_IDL_BE_VIS_U) : acelib, install_lib, tao_output, tao_vc8warnings, ta
   }
 }
 
-project(TAO_IDL_BE_VIS_V) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE_VIS_V) : acelib, install_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE_VIS_V
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_BE_VIS_U
@@ -278,10 +278,10 @@ project(TAO_IDL_BE_VIS_V) : acelib, install_lib, tao_output, tao_vc8warnings, ta
 
   Source_Files {
     conditional(prop:static) {
-    be/be_visitor_valuebox
-    be/be_visitor_valuetype
-    be/be_visitor_valuetype_fwd
-  }
+      be/be_visitor_valuebox
+      be/be_visitor_valuetype
+      be/be_visitor_valuetype_fwd
+    }
   }
 
   Header_Files {
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 2a080172dda..f0daaed36c4 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -759,7 +759,7 @@ UTL_Error::error1 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c);
   ACE_ERROR ((LM_ERROR, " - "));
-  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
 }
@@ -770,10 +770,10 @@ UTL_Error::error2 (UTL_Error::ErrorCode c,
                    AST_Decl *d2)
 {
   idl_error_header (c);
-  d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               ", "));
-  d2->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d2->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
 }
@@ -785,13 +785,13 @@ UTL_Error::error3 (UTL_Error::ErrorCode c,
                    AST_Decl *d3)
 {
   idl_error_header (c);
-  d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               ", "));
-  d2->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d2->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               ", "));
-  d3->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d3->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
 }
@@ -878,7 +878,7 @@ UTL_Error::lookup_error (UTL_ScopedName *n)
 {
   if (idl_global->ignore_lookup_errors_) return;
   idl_error_header (EIDL_LOOKUP_ERROR);
-  n->dump (*ACE_DEFAULT_LOG_STREAM);;
+  n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
 }
@@ -889,7 +889,7 @@ UTL_Error::lookup_warning (UTL_ScopedName *n)
   if (idl_global->print_warnings ())
     {
       idl_warning_header (EIDL_LOOKUP_ERROR);
-      n->dump (*ACE_DEFAULT_LOG_STREAM);;
+      n->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR, "\n"));
     }
 }
@@ -962,7 +962,7 @@ UTL_Error::inheritance_error (UTL_ScopedName *n,
                               AST_Decl *d)
 {
   idl_error_header (EIDL_CANT_INHERIT);
-  n->dump (*ACE_DEFAULT_LOG_STREAM);;
+  n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " attempts to inherit from "));
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -996,7 +996,7 @@ UTL_Error::supports_error (UTL_ScopedName *n,
   n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " attempts to support "));
-  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
 }
@@ -1333,7 +1333,7 @@ UTL_Error::fwd_decl_lookup (AST_Interface *d,
   idl_error_header (EIDL_FWD_DECL_LOOKUP);
   ACE_ERROR ((LM_ERROR,
               "trying to look up "));
-  n->dump (*ACE_DEFAULT_LOG_STREAM);;
+  n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " in undefined forward declared interface "));
   d->local_name ()->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1367,7 +1367,7 @@ UTL_Error::not_a_type (AST_Decl *d)
     }
   else
     {
-      d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+      d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
     }
 
   ACE_ERROR ((LM_ERROR,
@@ -1596,10 +1596,10 @@ UTL_Error::invalid_annotation_param_error (
   bool is_builtin = decl->builtin ();
   idl_error_header (EIDL_ANNOTATION_PARAM_ERROR,
     static_cast<AST_Decl*>(appl));
-  invalid_id->dump (*ACE_DEFAULT_LOG_STREAM);;
+  invalid_id->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR, ACE_TEXT (" is not a member of %Cannotation "),
     is_builtin ? "builtin " : ""));
-  decl->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  decl->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   if (!is_builtin)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT (" declared in \"%C\" on line %d"),
@@ -1628,7 +1628,7 @@ UTL_Error::invalid_annotation_param_type (
         get_filename (member), get_lineno (member)));
     }
   ACE_ERROR ((LM_ERROR, ACE_TEXT (" can not be set to ")));
-  offending_value->dump (*ACE_DEFAULT_LOG_STREAM);;
+  offending_value->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR, ACE_TEXT (" because the types are incompatible!\n")));
 }
 
diff --git a/TAO/TAO_IDL/util/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_exceptlist.cpp
index 93e55ebbb17..b99c8fa420b 100644
--- a/TAO/TAO_IDL/util/utl_exceptlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exceptlist.cpp
@@ -95,7 +95,6 @@ UTL_ExceptList::head ()
 // class UTL_List's private member). This is so we
 // can avoid copying the contained quantity, an
 // AST_Exception.
-
 void
 UTL_ExceptList::destroy ()
 {
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
index 4dbc54f91d5..fb54813d80f 100644
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_idlist.cpp
@@ -307,7 +307,7 @@ UTL_IdList::get_string_copy ()
     {
       if (n > delimiter_start)
         {
-          ACE_OS::strncat (buffer, "::", 2);
+          ACE_OS::strcat (buffer, "::");
         }
       const char *item = i.item ()->get_string ();
       ACE_OS::strcat (buffer, item);
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index cfced51297f..c6d7eccdc16 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 3.0.3, released Wed Aug 04 08:59:38 CEST 2021
+This is TAO version 3.0.10, released Thu Nov 17 09:46:24 CET 2022
 
 If you have any problems with or questions about TAO, please open
 a issue or discussion on the ACE_TAO github project at
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index ef1bfed3e72..ea47acd20b5 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -71,13 +71,13 @@ TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/tests/Bug_1020_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 QUICK
 TAO/tests/Bug_1254_Regression/run_test.pl:
 TAO/tests/Bug_1330_Regression/run_test.pl:
-TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !IRIX !QUICK
-TAO/tests/Bug_1361_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !IRIX QUICK
+TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !QUICK
+TAO/tests/Bug_1361_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 QUICK
 TAO/tests/Bug_1476_Test/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/tests/Bug_1482_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK !LynxOS
 TAO/tests/Bug_1482_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK !LynxOS
-TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IRIX !OpenVMS_IA64Crash !QUICK
-TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IRIX !OpenVMS_IA64Crash QUICK
+TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash !QUICK
+TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash QUICK
 TAO/tests/Bug_1636_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_1639_Regression/run_test.pl: !CORBA_E_MICRO
 TAO/tests/Bug_1676_Regression/run_test.pl:
@@ -267,7 +267,7 @@ TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/MT_Server/run_test.pl: !ST
 TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Connect_Strategy_Test/run_test.pl:
-# DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64
+# DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST
 TAO/tests/Server_Leaks/run_test.pl: !ANDROID
 TAO/tests/SHMIOP/run_test_collocated.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/SHMIOP/run_test.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index d88af4dd0e6..f3be0eeaa57 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -186,7 +186,7 @@ TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !COR
 TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
 TAO/orbsvcs/tests/Notify/Timeout/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IRIX !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index c0377eb4673..03f0fa6a8f3 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -375,7 +375,7 @@
     <P>
     <h3>IIOP Endpoint Examples</h3>
     <P>
-      Here are some additional examples of IIOP endoints:
+      Here are some additional examples of IIOP endpoints:
     <UL>
       <LI><CODE>-ORBListenEndpoints iiop://1.0@foo1:0</CODE>
       <LI><CODE>-ORBListenEndpoints iiop://1.0@foo:0,1.1@bar,baz:3456</CODE>
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index febadd5e653..ff514f532bd 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -813,7 +813,7 @@ is set. The default is true. </td>
       <tr>
         <td><code>-ORBUseParallelConnects</code> <em>boolean (0|1)</em></td>
         <td><a name="-ORBUseParallelConnects"></a>This option allows users to
-        specify the ORB attempt to connect simultaniously to all endpoints
+        specify the ORB attempt to connect simultaneously to all endpoints
         listed in profiles, rather than stepping through individual endpoints,
         trying and possibly failing, before moving on to the next. For this
         feature to work, the server must be using shared profiles.
diff --git a/TAO/docs/documentation.html b/TAO/docs/documentation.html
index 38bfe9d57db..546922dc2c6 100644
--- a/TAO/docs/documentation.html
+++ b/TAO/docs/documentation.html
@@ -21,9 +21,9 @@ bgcolor="#ffffff">
     guides are also good sources of information about TAO and CORBA:</P>
 
     <UL>
-      <DT> <img alt="o" src="redball.gif"> <A HREF="http://www.dre.vanderbilt.edu/Doxygen/">Doxygen Documentation</A> <P>
+      <DT> <img alt="o" src="redball.gif"> <A HREF="https://www.dre.vanderbilt.edu/Doxygen/">Doxygen Documentation</A> <P>
 
-      <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.theaceorb.com/product/index.html">OCI TAO Developer's Guide</a> </dt><P>
+      <dt> <img alt="o" src="redball.gif"> <a HREF="https://objectcomputing.com/products/tao/tao-developers-guide">OCI TAO Developer's Guide</a> </dt><P>
 
       <dt> <img alt="o" src="redball.gif"> <a HREF="https://www.remedy.nl/opensource/corbapg.html">Remedy IT CORBA Programmer's Guide</a> </dt><P>
 
diff --git a/TAO/docs/minimumTAO.html b/TAO/docs/minimumTAO.html
index 048f9aedbf5..1824e870480 100644
--- a/TAO/docs/minimumTAO.html
+++ b/TAO/docs/minimumTAO.html
@@ -72,7 +72,7 @@ The <a
 href="../../ACE-INSTALL.html#flags">make
 flags</a> options used were: <P>
 
-<code> debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0 </code> <P>
+<code> debug=0 optimize=1 static_libs_only=1</code> <P>
 
 These options translate into:<P>
 <UL>
diff --git a/TAO/docs/performance.html b/TAO/docs/performance.html
index 39e569365cf..a15552cf7d4 100644
--- a/TAO/docs/performance.html
+++ b/TAO/docs/performance.html
@@ -593,7 +593,7 @@ platform_macros.GNU file: </P>
 <pre>
 optimize=1
 debug=0
-CPPFLAGS += -DACE_USE_RCSID=0 -DACE_NLOGGING=1
+CPPFLAGS += -DACE_NLOGGING=1
 </pre>
 </code>
 
diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
index 1d12efe41f5..aca571691e6 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
@@ -25,7 +25,6 @@ public:
   void price_excep (::Messaging::ExceptionHolder *);
 
 private:
-
   int *response_count_;
 };
 
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 7cf9c1ae5b9..40171e90be4 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -12,7 +12,7 @@ public:
   void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin);
 
   void push (const CORBA::Any& data);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
 private:
 };
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index 337409350ee..836bdff3939 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -41,7 +41,7 @@ Stock_Consumer::push (const CORBA::Any& data)
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (void)
+Stock_Consumer::disconnect_push_consumer ()
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index 8fd4162b954..b5cb7b1d334 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -16,7 +16,7 @@ public:
   // Disconnect from the event channel.
 
   void push (const CORBA::Any& data);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
 private:
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
index 9bc325773f4..c7a7008f896 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
@@ -42,7 +42,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (void)
+Quoter_Stock_i::disconnect_push_supplier ()
 {
   // Forget about the consumer it is not there anymore
   this->consumer_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index fdac1364844..e23c712b60d 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -19,7 +19,7 @@ public:
   CORBA::Double price ();
   void set_price (CORBA::Double new_price);
 
-  void disconnect_push_supplier (void);
+  void disconnect_push_supplier ();
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
index 7a7734f739a..6b22f03ed8d 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
@@ -25,7 +25,6 @@ public:
   void price_excep (::Messaging::ExceptionHolder *);
 
 private:
-
   int *response_count_;
 };
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
index 5319478805d..823553c7262 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
@@ -13,10 +13,8 @@ Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
                                            const char *,
                                            void * & cookie)
 {
-
   // Check to see if the object ID is valid
   try {
-
     // Get the ObjectID in string format
     CORBA::String_var oid_str =
       PortableServer::ObjectId_to_string (oid);
@@ -46,7 +44,6 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                             void * cookie,
                                             PortableServer::Servant servant)
 {
-
   // Delete the servant as it is no longer needed.
   PortableServer::Servant my_servant = (PortableServer::Servant) cookie;
   if (servant == my_servant)
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index 5fd51694afd..f420f2e7392 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -26,7 +26,6 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
 
  private:
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* STOCK_FACTORY_LOCATOR_I_H */
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
index 746362c2a14..eec81a98842 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
@@ -39,4 +39,3 @@ Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol,
 }
 
 
-
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/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
index dd802e0045b..c87cb018e8a 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
@@ -55,7 +55,7 @@ Stock_StockBroker_i::Stock_StockBroker_i (CORBA::ORB_ptr orb,
 }
 
 // Implementation skeleton destructor
-Stock_StockBroker_i::~Stock_StockBroker_i (void)
+Stock_StockBroker_i::~Stock_StockBroker_i ()
 {
 }
 
@@ -83,7 +83,7 @@ void Stock_StockBroker_i::connect_quoter_info (::Stock::StockQuoter_ptr c)
 }
 
 void
-Stock_StockBroker_i::shutdown (void)
+Stock_StockBroker_i::shutdown ()
 {
   // Unsubscribe
   ACE_DEBUG ((LM_DEBUG, "Shutdown unsubscribing notifiers\n"));
@@ -126,7 +126,7 @@ Stock_StockBrokerHome_i::Stock_StockBrokerHome_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i (void)
+Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i ()
 {
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
index 2d7fd13d37d..245e5bb3c43 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
@@ -37,7 +37,7 @@ public:
                        const char *stock_name);
 
   /// Destructor
-  virtual ~Stock_StockBroker_i (void);
+  virtual ~Stock_StockBroker_i ();
 
   /**
    * Return the StockNameConsumer object created by the Constructor.
@@ -108,7 +108,7 @@ public:
   Stock_StockBrokerHome_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~Stock_StockBrokerHome_i (void);
+  virtual ~Stock_StockBrokerHome_i ();
 
   /**
    * Return the StockBroker object created by the Constructor.
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index d5e0b70a470..11b281a5f22 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -27,7 +27,7 @@ StockDistributor_i::StockDistributor_i (RTPortableServer::POA_ptr poa)
 }
 
 // Implementation skeleton destructor
-StockDistributor_i::~StockDistributor_i (void)
+StockDistributor_i::~StockDistributor_i ()
 {
   this->active_ = false;
 }
@@ -241,12 +241,12 @@ StockDistributor_i::operator () (std::vector <std::string> &stocks)
 }
 
 // Implementation skeleton constructor
-StockQuoter_i::StockQuoter_i (void)
+StockQuoter_i::StockQuoter_i ()
 {
 }
 
 // Implementation skeleton destructor
-StockQuoter_i::~StockQuoter_i (void)
+StockQuoter_i::~StockQuoter_i ()
 {
 }
 
@@ -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)
     {
@@ -351,7 +350,7 @@ StockDistributorHome_i::StockDistributorHome_i (CORBA::ORB_ptr orb)
 }
 
 // Implementation skeleton destructor
-StockDistributorHome_i::~StockDistributorHome_i (void)
+StockDistributorHome_i::~StockDistributorHome_i ()
 {
 }
 
@@ -408,7 +407,7 @@ StockDistributorHome_i::handle_signal (int,
 }
 
 void
-StockDistributorHome_i::create_distributor (void)
+StockDistributorHome_i::create_distributor ()
 {
   // Create a new instance of the <StockDistributor_i>. Then
   // activate the <distributor> under the located POA. This will cause
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
index 9d8e072b74e..55db5024adb 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
@@ -43,7 +43,7 @@ public:
   StockDistributor_i (RTPortableServer::POA_ptr poa);
 
   /// Destructor
-  virtual ~StockDistributor_i (void);
+  virtual ~StockDistributor_i ();
 
   /**
    * Insert StockNameConsumer object and its priority into the StockDistributor
@@ -90,19 +90,19 @@ public:
    * Set the active state of the StockDistributor object to true and create a thread
    * to publish the stock information to the Stock Broker clients.
    */
-  virtual void start (void);
+  virtual void start ();
 
   /**
    * Set the active state of StockDistributor object to false.
    */
-  virtual void stop (void);
+  virtual void stop ();
 
   virtual void shutdown ();
 
   /// Callback for stock database.
   void operator () (std::vector <std::string> &stocks);
 
-  int svn (void);
+  int svn ();
 
   /// The map that stores the subscribed StockNameConsumer object.
   typedef std::map <std::string,
@@ -137,10 +137,10 @@ class  StockQuoter_i
 {
 public:
   /// Constructor.
-  StockQuoter_i (void);
+  StockQuoter_i ();
 
   /// Destructor.
-  virtual ~StockQuoter_i (void);
+  virtual ~StockQuoter_i ();
 
   /**
    * Get detailed stock information.
@@ -170,7 +170,7 @@ public:
   StockDistributorHome_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~StockDistributorHome_i (void);
+  virtual ~StockDistributorHome_i ();
 
   /**
    * Return the StockDistributor object created by the Constructor.
@@ -183,7 +183,7 @@ public:
                              siginfo_t * = 0,
                              ucontext_t * = 0);
 private:
-  void create_distributor (void);
+  void create_distributor ();
 
   /// Cached ORB used to shut down the system
   CORBA::ORB_var orb_;
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index 167b035f472..7373c49bc1e 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -11,7 +11,7 @@ Stock_StockNameConsumer_i::Stock_StockNameConsumer_i (Stock_StockBroker_i &conte
 }
 
 // Implementation skeleton destructor
-Stock_StockNameConsumer_i::~Stock_StockNameConsumer_i (void)
+Stock_StockNameConsumer_i::~Stock_StockNameConsumer_i ()
 {
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
index 9636f90e23b..239a382d4ce 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
@@ -47,7 +47,7 @@ public:
                              const char *stock_name);
 
   /// Destructor.
-  virtual ~Stock_StockNameConsumer_i (void);
+  virtual ~Stock_StockNameConsumer_i ();
 
   /**
    * Push an event to the consumer.
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
index 97f06a54d54..cf88000c2e4 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
@@ -66,7 +66,7 @@ public:
 
   struct StockInfo
   {
-    StockInfo (void)
+    StockInfo ()
       : name_(""), high_ (0), low_ (0), last_ (0)
     {};
 
@@ -98,10 +98,10 @@ public:
   void update_rate (u_int rate);
 
   /// Launch the active object
-  void start (void);
+  void start ();
 
   /// Stop the active object
-  void stop (void);
+  void stop ();
 
   typedef std::map <std::string, StockInfo> Stock_Map;
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
index 4eac82cfc32..6a6559a1fd3 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
@@ -7,7 +7,7 @@
 //
 // Stock::Priority_Mapping
 //
-Stock::Priority_Mapping::Priority_Mapping (void)
+Stock::Priority_Mapping::Priority_Mapping ()
   : TAO_Linear_Priority_Mapping (ACE_SCHED_OTHER)
 {
 }
@@ -15,7 +15,7 @@ Stock::Priority_Mapping::Priority_Mapping (void)
 //
 // ~Stock::Priority_Mapping
 //
-Stock::Priority_Mapping::~Priority_Mapping (void)
+Stock::Priority_Mapping::~Priority_Mapping ()
 {
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
index b114b2124d3..ff8d218587f 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
@@ -30,10 +30,10 @@ namespace Stock
   {
   public:
     /// Default constructor.
-    Priority_Mapping (void);
+    Priority_Mapping ();
 
     /// Default destructor.
-    virtual ~Priority_Mapping (void);
+    virtual ~Priority_Mapping ();
 
     /// Stock priorities.
     enum Priority
@@ -48,7 +48,6 @@ namespace Stock
     /// Register mapping.
     static void register_mapping (CORBA::ORB_ptr orb);
   };
-
 }
 
 #endif  // !defined STOCK_PRIORITYMAPPING_
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html
index 39393afd5f4..080620025f7 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html
@@ -98,7 +98,7 @@ a daemon that can be started and stopped by a system administrator. <P>
 interface StockNameConsumer
 {
   void push_StockName (in StockName the_stockname);
-  
+
   attribute Cookie cookie;
 };
 </PRE>
@@ -134,18 +134,18 @@ interface StockDistributor : Trigger
 {
   /// Event source operation to establish connectivity.
   Cookie subscribe_notifier (in Stock::StockNameConsumer c, in RTCORBA::Priority priority);
-  
+
   /// Event source operation to discontinue connectivity.
   Stock::StockNameConsumer unsubscribe_notifier (in Cookie ck)
-    raises (Invalid_Subscription);;
+    raises (Invalid_Subscription);
 
   /// Factory operation to return StockQuoter object reference.
   StockQuoter provide_quoter_info ()
-    raises (Invalid_Subscription);;
-  
+    raises (Invalid_Subscription);
+
   /// Shutdown the object and terminate the application.
   oneway void shutdown ();
-  
+
   /// Controls rate of updates.
   attribute long notification_rate;
 };
@@ -157,7 +157,7 @@ clients with the Stock Distributor servers. <P>
 The provide_quoter_info() factory operation returns StockQuoter object references that Stock Broker clients can
 use to get more information about a particular stock. <P>
 The shutdown() operation is a oneway operation which shuts down the object and terminates the application. <P>
-The notification_rate attribute stands for the notification frequency that the Stock Distributor servers used 
+The notification_rate attribute stands for the notification frequency that the Stock Distributor servers used
 to communicate with the Stock Broker clients. <P>
 
 <PRE>
@@ -191,7 +191,7 @@ interface StockBroker
 
   /// Gets the current quoter connection.
   StockQuoter get_connection_quoter_info ();
-  
+
   /// Shutdown the object and terminate the application.
   oneway void shutdown ();
 };
@@ -199,9 +199,9 @@ interface StockBroker
 
 This is the interface definition for Stock Broker clients. <P>
 The get_consumer_notifier() operation returns an object reference of the StockNameConsumer interface
-shown earlier. When the stock quoter system is initialized, this factory operation will be used to 
+shown earlier. When the stock quoter system is initialized, this factory operation will be used to
 return the StockNameConsumer object that belongs to the StockBroker object. <P>
-The connect_quoter_info() and disconnect_quoter_info() operations are used to connect/disconnect the StockBroker 
+The connect_quoter_info() and disconnect_quoter_info() operations are used to connect/disconnect the StockBroker
 object with the StockQuoter object that's provided by the StockDistributor interface described next. <P>
 The get_connection_quoter_info() operation is used to get the current connected StockQuoter object. <P>
 The shutdown() operation is a oneway operation which shuts down the object and terminates the application. <P>
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
index 0a841e5a7d6..75b122b801d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
@@ -47,7 +47,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data)
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (void)
+Stock_Consumer::disconnect_push_consumer ()
 {
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index 670b9829912..e493fd2d1df 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -18,7 +18,7 @@ public:
   // Disconnect from the event channel.
 
   void push (const RtecEventComm::EventSet& data);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
 private:
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index ebdbf22b52f..fc37e331163 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -14,12 +14,12 @@ protected:
       ref_count_(0) {}
 
 public:
-  virtual void _add_ref (void)
+  virtual void _add_ref ()
   {
     ++this->ref_count_;
   }
 
-  virtual void _remove_ref (void)
+  virtual void _remove_ref ()
   {
     CORBA::ULong new_count = --this->ref_count_;
 
@@ -38,7 +38,7 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
   this->data_.price = price;
 }
 
-Quoter_Stock_i::~Quoter_Stock_i (void)
+Quoter_Stock_i::~Quoter_Stock_i ()
 {
   if (consumer_proxy_.in ())
     consumer_proxy_->disconnect_push_consumer ();
@@ -90,7 +90,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (void)
+Quoter_Stock_i::disconnect_push_supplier ()
 {
   // Forget about the consumer it is not there anymore
   this->consumer_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 6d4318d4b02..b9190335beb 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -13,14 +13,14 @@ public:
   Quoter_Stock_i (const char *symbol,
                   const char *full_name,
                   CORBA::Double price);
-  ~Quoter_Stock_i (void);
+  ~Quoter_Stock_i ();
 
   char *symbol ();
   char *full_name ();
   CORBA::Double price ();
   void set_price (CORBA::Double new_price);
 
-  void disconnect_push_supplier (void);
+  void disconnect_push_supplier ();
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
index 590e83f26a5..731c72a293c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
@@ -18,7 +18,6 @@
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
-
     // Initialze the ORB.
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
index 84f390bf6a5..5bfc5d4e5a4 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
@@ -17,7 +17,6 @@
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-
     // Initialze the ORB.
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen
index ca0d465a7a2..94ebe0b4cfa 100644
--- a/TAO/etc/tao.doxygen
+++ b/TAO/etc/tao.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1211,7 +1218,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1221,7 +1228,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1328,8 +1335,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1488,16 +1499,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1570,11 +1593,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1587,15 +1628,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1775,29 +1822,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1842,8 +1891,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1856,16 +1904,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1946,16 +1984,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2052,15 +2080,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2572,8 +2591,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen
index e4a805b1567..52dd22b687c 100644
--- a/TAO/etc/tao_anytypecode.doxygen
+++ b/TAO/etc/tao_anytypecode.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen
index 1ee93d23a5c..50d0ff7e498 100644
--- a/TAO/etc/tao_av.doxygen
+++ b/TAO/etc/tao_av.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -881,10 +888,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1212,7 +1219,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1222,7 +1229,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1329,8 +1336,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1489,16 +1500,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1571,11 +1594,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1588,15 +1629,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1776,29 +1823,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1843,8 +1892,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1857,16 +1905,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1947,16 +1985,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2053,15 +2081,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2574,8 +2593,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen
index 152b9331b73..586b192f456 100644
--- a/TAO/etc/tao_compression.doxygen
+++ b/TAO/etc/tao_compression.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen
index ff03b8e0a1f..77d37fc7fc8 100644
--- a/TAO/etc/tao_cosevent.doxygen
+++ b/TAO/etc/tao_cosevent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -880,10 +887,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = CEC_*.cpp \
                          CEC_*.h \
@@ -1211,7 +1218,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1221,7 +1228,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1328,8 +1335,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1488,16 +1499,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1570,11 +1593,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1587,15 +1628,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1775,29 +1822,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1842,8 +1891,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1856,16 +1904,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1946,16 +1984,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2052,15 +2080,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2575,8 +2594,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen
index 2287c0b895a..40432002b70 100644
--- a/TAO/etc/tao_cosnaming.doxygen
+++ b/TAO/etc/tao_cosnaming.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -879,10 +886,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1210,7 +1217,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1220,7 +1227,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1327,8 +1334,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1487,16 +1498,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1569,11 +1592,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1586,15 +1627,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1774,29 +1821,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1841,8 +1890,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1855,16 +1903,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1945,16 +1983,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2051,15 +2079,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2572,8 +2591,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen
index 91821d08a40..325895cb652 100644
--- a/TAO/etc/tao_cosnotification.doxygen
+++ b/TAO/etc/tao_cosnotification.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -885,10 +892,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1215,7 +1222,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1225,7 +1232,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1332,8 +1339,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1492,16 +1503,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1574,11 +1597,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1591,15 +1632,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1779,29 +1826,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1846,8 +1895,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1860,16 +1908,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1950,16 +1988,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2056,15 +2084,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2580,8 +2599,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen
index 4fc4d8e1982..bb3e76e5ade 100644
--- a/TAO/etc/tao_costime.doxygen
+++ b/TAO/etc/tao_costime.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -879,10 +886,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1210,7 +1217,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1220,7 +1227,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1327,8 +1334,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1487,16 +1498,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1569,11 +1592,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1586,15 +1627,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1774,29 +1821,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1841,8 +1890,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1855,16 +1903,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1945,16 +1983,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2051,15 +2079,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2573,8 +2592,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen
index 414a9163c1b..a478367463f 100644
--- a/TAO/etc/tao_costrader.doxygen
+++ b/TAO/etc/tao_costrader.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -881,10 +888,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1211,7 +1218,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1221,7 +1228,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1328,8 +1335,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1488,16 +1499,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1570,11 +1593,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1587,15 +1628,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1775,29 +1822,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1842,8 +1891,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1856,16 +1904,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1946,16 +1984,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2052,15 +2080,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2574,8 +2593,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen
index 9e39798876a..1de06966275 100644
--- a/TAO/etc/tao_dynamicany.doxygen
+++ b/TAO/etc/tao_dynamicany.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen
index b894adf1dc9..7f5009c4c35 100644
--- a/TAO/etc/tao_dynamicinterface.doxygen
+++ b/TAO/etc/tao_dynamicinterface.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen
index 768d7a6ba2b..bc3cd1cfc2e 100644
--- a/TAO/etc/tao_esf.doxygen
+++ b/TAO/etc/tao_esf.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1209,7 +1216,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1219,7 +1226,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1326,8 +1333,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1486,16 +1497,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1568,11 +1591,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1585,15 +1626,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1773,29 +1820,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1840,8 +1889,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1854,16 +1902,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1944,16 +1982,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2050,15 +2078,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2571,8 +2590,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen
index 11f5bdce7c2..86d8615f3ab 100644
--- a/TAO/etc/tao_ifr.doxygen
+++ b/TAO/etc/tao_ifr.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h
@@ -1206,7 +1213,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1216,7 +1223,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,8 +1330,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1483,16 +1494,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1565,11 +1588,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1582,15 +1623,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1770,29 +1817,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1837,8 +1886,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1851,16 +1899,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1941,16 +1979,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2047,15 +2075,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2570,8 +2589,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen
index 36c3fc3e42e..00497095425 100644
--- a/TAO/etc/tao_implrepo.doxygen
+++ b/TAO/etc/tao_implrepo.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2572,8 +2591,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen
index 44cc77cf8af..392ad99a6ba 100644
--- a/TAO/etc/tao_iormanip.doxygen
+++ b/TAO/etc/tao_iormanip.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen
index 04b8af678a0..e3c3f940536 100644
--- a/TAO/etc/tao_iortable.doxygen
+++ b/TAO/etc/tao_iortable.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen
index b79aee92f54..368b631b8d7 100644
--- a/TAO/etc/tao_pi.doxygen
+++ b/TAO/etc/tao_pi.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2570,8 +2589,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen
index 0241391d3df..d9f0bc63d1e 100644
--- a/TAO/etc/tao_pi_server.doxygen
+++ b/TAO/etc/tao_pi_server.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2570,8 +2589,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen
index 06b84922ad2..af11624666a 100644
--- a/TAO/etc/tao_portablegroup.doxygen
+++ b/TAO/etc/tao_portablegroup.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -880,10 +887,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1210,7 +1217,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1220,7 +1227,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1327,8 +1334,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1487,16 +1498,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1569,11 +1592,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1586,15 +1627,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1774,29 +1821,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1841,8 +1890,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1855,16 +1903,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1945,16 +1983,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2051,15 +2079,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2573,8 +2592,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen
index 5e7e515b0af..abd833322b3 100644
--- a/TAO/etc/tao_portableserver.doxygen
+++ b/TAO/etc/tao_portableserver.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2570,8 +2589,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen
index 3f3097374fc..8eceb57cbdd 100644
--- a/TAO/etc/tao_rtcorba.doxygen
+++ b/TAO/etc/tao_rtcorba.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2570,8 +2589,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen
index 1f519587b88..391c45e2294 100644
--- a/TAO/etc/tao_rtevent.doxygen
+++ b/TAO/etc/tao_rtevent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -887,10 +894,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = EC_*.cpp \
                          EC_*.h \
@@ -1220,7 +1227,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1230,7 +1237,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1337,8 +1344,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1497,16 +1508,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1579,11 +1602,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1596,15 +1637,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1784,29 +1831,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1851,8 +1900,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1865,16 +1913,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1955,16 +1993,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2061,15 +2089,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2584,8 +2603,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen
index 6944222b402..cf2f4f42ea3 100644
--- a/TAO/etc/tao_rtportableserver.doxygen
+++ b/TAO/etc/tao_rtportableserver.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2570,8 +2589,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen
index 2972f3ad96f..570bfe157ba 100644
--- a/TAO/etc/tao_security.doxygen
+++ b/TAO/etc/tao_security.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -883,10 +890,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1214,7 +1221,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1224,7 +1231,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1331,8 +1338,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1491,16 +1502,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1573,11 +1596,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1590,15 +1631,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1778,29 +1825,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1845,8 +1894,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1859,16 +1907,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1949,16 +1987,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2055,15 +2083,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2576,8 +2595,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen
index e2b07632d43..1af2227aece 100644
--- a/TAO/etc/tao_smartproxies.doxygen
+++ b/TAO/etc/tao_smartproxies.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2569,8 +2588,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen
index 357c730d953..cc699e6b3d8 100644
--- a/TAO/etc/tao_ssliop.doxygen
+++ b/TAO/etc/tao_ssliop.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -883,10 +890,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1214,7 +1221,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1224,7 +1231,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1331,8 +1338,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1491,16 +1502,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1573,11 +1596,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1590,15 +1631,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1778,29 +1825,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1845,8 +1894,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1859,16 +1907,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1949,16 +1987,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2055,15 +2083,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2577,8 +2596,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen
index 7ecbf6cc64f..cd6d48927c0 100644
--- a/TAO/etc/tao_strategies.doxygen
+++ b/TAO/etc/tao_strategies.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2574,8 +2593,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen
index 94f80200de0..03c55528aae 100644
--- a/TAO/etc/tao_transportcurrent.doxygen
+++ b/TAO/etc/tao_transportcurrent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2571,8 +2590,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen
index fb411308b59..705cf1c9c1d 100644
--- a/TAO/etc/tao_ziop.doxygen
+++ b/TAO/etc/tao_ziop.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.9.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -248,16 +240,16 @@ TAB_SIZE               = 8
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -302,8 +294,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -456,7 +448,7 @@ LOOKUP_CACHE_SIZE      = 0
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
@@ -600,6 +592,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -757,7 +755,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -803,18 +802,26 @@ WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -878,10 +885,10 @@ INPUT_ENCODING         = UTF-8
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.cpp \
                          *.h \
@@ -1208,7 +1215,7 @@ HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1218,7 +1225,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,8 +1332,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1485,16 +1496,28 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATOR_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1567,11 +1590,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1584,15 +1625,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1772,29 +1819,31 @@ PAPER_TYPE             = a4wide
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1839,8 +1888,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1853,16 +1901,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1943,16 +1981,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -2049,15 +2077,6 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -2571,8 +2590,8 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index fa2aaabfe7f..3a57123dae8 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -19,7 +19,7 @@ AMH_Servant::AMH_Servant (CORBA::ORB_ptr orb)
   this->reactor_ = orb->orb_core ()->reactor ();
 }
 
-AMH_Servant::~AMH_Servant (void)
+AMH_Servant::~AMH_Servant ()
 {
 }
 
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
index 5ccffa8d0fb..e94e132c5d6 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
@@ -24,7 +24,7 @@ class AMH_Servant
 public:
   AMH_Servant (CORBA::ORB_ptr orb);
 
-  virtual ~AMH_Servant (void);
+  virtual ~AMH_Servant ();
 
   /// parse arguments from command line for sleep time
   virtual int parse_args (int &argc, ACE_TCHAR **argv);
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 19a8ab7a5f3..23511c46da6 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -18,12 +18,12 @@ Base_Server::Base_Server (int &argc, ACE_TCHAR **argv)
 {
 }
 
-Base_Server::~Base_Server (void)
+Base_Server::~Base_Server ()
 {
 }
 
 int
-Base_Server::parse_args (void)
+Base_Server::parse_args ()
 {
   // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux
   // systems!!! ***
@@ -64,7 +64,7 @@ Base_Server::parse_args (void)
 }
 
 void
-Base_Server::try_RT_scheduling (void)
+Base_Server::try_RT_scheduling ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -90,7 +90,7 @@ Base_Server::try_RT_scheduling (void)
 }
 
 int
-Base_Server::shutdown_orb_and_poa (void)
+Base_Server::shutdown_orb_and_poa ()
 {
   try
     {
@@ -112,7 +112,7 @@ Base_Server::shutdown_orb_and_poa (void)
 }
 
 int
-Base_Server::start_orb_and_poa (void)
+Base_Server::start_orb_and_poa ()
 {
   try
     {
@@ -165,7 +165,7 @@ Base_Server::register_servant (AMH_Servant *servant)
 
 
 void
-Base_Server::run_event_loop (void)
+Base_Server::run_event_loop ()
 {
   try
     {
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index c6ea1f74654..09b43d569ad 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -44,25 +44,25 @@ public:
   // entry in the vtbl) and if, by chance, someone does delete a
   // derived-class though this classes ptr, we are still safe.  The
   // short answer to your question is : I don't know. :)
-  virtual ~Base_Server (void);
+  virtual ~Base_Server ();
 
   // Just parse the command line for the output-file (-o) option.
   // return -1 if -o option is not present
-  virtual int parse_args (void);
+  virtual int parse_args ();
 
   /// try and schedule using FIFO
-  void try_RT_scheduling (void);
+  void try_RT_scheduling ();
 
   /// ORB inititalisation stuff
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
-  int shutdown_orb_and_poa (void);
+  int shutdown_orb_and_poa ();
 
   /// register the servant with the poa
   virtual void register_servant (AMH_Servant *servant);
 
   /// orb-perform_work () abstraction
-  virtual void run_event_loop (void);
+  virtual void run_event_loop ();
 
 public:
   // @@ Mayur, please put inlined methods in a separate `.inl' file,
@@ -71,7 +71,7 @@ public:
   // Mayur: A separate file for just one method? AAAGH. OK.
 
   /// Accesor method (for servants) to the initialised ORB
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 protected:
   int &argc_;
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.inl b/TAO/examples/AMH/Sink_Server/Base_Server.inl
index 87240a2232c..1f966fa6302 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.inl
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.inl
@@ -1,7 +1,7 @@
 #include "Base_Server.h"
 
 ACE_INLINE CORBA::ORB_ptr
-Base_Server::orb (void)
+Base_Server::orb ()
 {
   return this->orb_.in();
 }
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index a04b0456469..4025854a4e9 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (int &argc, ACE_TCHAR **argv)
 }
 
 int
-Client_Task::parse_args (void)
+Client_Task::parse_args ()
 {
     ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:O:");
     int c;
@@ -53,7 +53,7 @@ Client_Task::parse_args (void)
 }
 
 void
-Client_Task::try_RT_scheduling (void)
+Client_Task::try_RT_scheduling ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -106,7 +106,7 @@ Client_Task::narrow_servant (CORBA::ORB_ptr orb)
 }
 
 int
-Client_Task::run_test (void)
+Client_Task::run_test ()
 {
   ACE_hrtime_t test_start = 0;
   ACE_hrtime_t test_end = 0;
@@ -147,7 +147,7 @@ Client_Task::run_test (void)
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h
index 1eff57f05a6..fcfc9e8fd7f 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.h
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.h
@@ -28,13 +28,13 @@ public:
   /// Constructor
   Client_Task (int &argc, ACE_TCHAR **argv);
 
-  int parse_args (void);
+  int parse_args ();
 
-  void try_RT_scheduling (void);
+  void try_RT_scheduling ();
 
   int narrow_servant (CORBA::ORB_ptr orb);
 
-  int run_test (void);
+  int run_test ();
 
 protected:
   /// The service method
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index 33e6ccb54ab..b3a17de1124 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -10,7 +10,7 @@ MT_AMH_Server::MT_AMH_Server (int &argc, ACE_TCHAR **argv)
 {
 }
 
-MT_AMH_Server::~MT_AMH_Server (void)
+MT_AMH_Server::~MT_AMH_Server ()
 {
 }
 
@@ -32,9 +32,8 @@ MT_AMH_Server::usage (const char *message)
 
 
 int
-MT_AMH_Server::parse_args (void)
+MT_AMH_Server::parse_args ()
 {
-
   // Let the base server parse it's argumrents first
   if (Base_Server::parse_args () != 1)
     {
@@ -77,7 +76,7 @@ MT_AMH_Server::parse_args (void)
 }
 
 void
-MT_AMH_Server::start_threads (void)
+MT_AMH_Server::start_threads ()
 {
   // Each of this thread runs the event loop
   this->activate (THR_NEW_LWP | THR_JOINABLE, this->nthreads_, 1);
@@ -85,7 +84,7 @@ MT_AMH_Server::start_threads (void)
 }
 
 int
-MT_AMH_Server::svc (void)
+MT_AMH_Server::svc ()
 {
   run_event_loop ();
   return 1;
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
index 098cc852039..9e80fdea655 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
@@ -25,19 +25,19 @@ class MT_AMH_Server
 public:
   MT_AMH_Server (int &argc, ACE_TCHAR **argv);
 
-  ~MT_AMH_Server (void);
+  ~MT_AMH_Server ();
 
   // print usage text
   void usage (const char *message);
 
   // We need to parse an extra thread_count parameter for
   // multi-threraded server.
-  int parse_args (void);
+  int parse_args ();
 
-  void start_threads (void);
+  void start_threads ();
 
   // the service method
-  int svc (void);
+  int svc ();
 
 private:
   int nthreads_;
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 738ca29e114..a64e45258b3 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -24,22 +24,22 @@ Peer_Handler_i::request_excep (
 }
 
 void
-Peer_Handler_i::start (void)
+Peer_Handler_i::start ()
 {
 }
 
 void
-Peer_Handler_i::shutdown (void)
+Peer_Handler_i::shutdown ()
 
 {
 }
 
-Peer_i::Peer_i (void)
+Peer_i::Peer_i ()
   :  reply_handler_ (this)
 {
 }
 
-Peer_i::~Peer_i (void)
+Peer_i::~Peer_i ()
 {
 }
 
@@ -91,7 +91,7 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (void)
+Peer_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -112,7 +112,7 @@ Peer_Task::Peer_Task (const PeerSet& the_peers,
 }
 
 int
-Peer_Task::svc (void)
+Peer_Task::svc ()
 {
   for (int i = 0; i != this->iterations_; ++i)
     {
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index 77c00e57588..91e6debb516 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -26,9 +26,9 @@ public:
 
   virtual void request_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void start (void);
+  virtual void start ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The real implementation
@@ -39,10 +39,10 @@ class Peer_i : public POA_Peer
 {
 public:
   /// Constructor
-  Peer_i (void);
+  Peer_i ();
 
   /// Destructor
-  virtual ~Peer_i (void);
+  virtual ~Peer_i ();
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
@@ -58,7 +58,7 @@ public:
   void start (const PeerSet& the_peers,
               CORBA::Long iterations);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The reply_handler
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 681573b7627..6b4643b44ed 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -33,7 +33,7 @@ public:
   CORBA::Long bind (Peer_ptr a_peer);
 
   /// Start the peers...
-  void start (void);
+  void start ();
 
 private:
   /// The callback method
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 18a884e8675..c4dcc225ef7 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -157,7 +157,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting event loop\n"));
   this->orb_->run ();
diff --git a/TAO/examples/Advanced/ch_12/icp.cpp b/TAO/examples/Advanced/ch_12/icp.cpp
index 369d5addf5c..25fa92c8557 100644
--- a/TAO/examples/Advanced/ch_12/icp.cpp
+++ b/TAO/examples/Advanced/ch_12/icp.cpp
@@ -127,7 +127,6 @@ vary_temp (long temp)
   if (ACE_OS::rand() % 2)
     delta = -delta;
   return temp + delta;
-
 }
 
 // Function object. Locates a thermostat that is in the same room as
diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp
index eb1414201b5..e47116181f8 100644
--- a/TAO/examples/Advanced/ch_12/server.cpp
+++ b/TAO/examples/Advanced/ch_12/server.cpp
@@ -470,7 +470,6 @@ find (CCS::Controller::SearchSeq & slist)
   CORBA::ULong listlen = slist.length ();
   for  (CORBA::ULong i = 0; i < listlen; i++)
     {
-
       AssetMap::iterator where;   // Iterator for asset set
       int num_found = 0;          // Num matched per iteration
 
diff --git a/TAO/examples/Advanced/ch_18/icp.cpp b/TAO/examples/Advanced/ch_18/icp.cpp
index 1717861115a..7f22eb1e084 100644
--- a/TAO/examples/Advanced/ch_18/icp.cpp
+++ b/TAO/examples/Advanced/ch_18/icp.cpp
@@ -12,7 +12,6 @@
 
 
 
-
 #include    <string>
 #include    <map>
 #include    <algorithm>
@@ -133,7 +132,6 @@ vary_temp(long temp)
     if (ACE_OS::rand() % 2)
       delta = -delta;
   return temp + delta;
-
 }
 
 //----------------------------------------------------------------
diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp
index 6f3408411ba..78903c6cff0 100644
--- a/TAO/examples/Advanced/ch_18/server.cpp
+++ b/TAO/examples/Advanced/ch_18/server.cpp
@@ -259,7 +259,6 @@ Thermostat_impl::set_nominal_temp (CCS::TempType new_temp)
 
   // Now set the nominal temperature to the new value.
   if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) {
-
     // If ICP_set () failed, read this thermostat's minimum
     // and maximum so we can initialize the BadTemp exception.
     CCS::Thermostat::BtData btd;
@@ -423,7 +422,6 @@ create_thermostat (
     assert (ICP_set (anum, "location", loc) == 0);
     // Set the nominal temperature.
     if (ICP_set (anum, "nominal_temp", &temp) != 0) {
-
         // If ICP_set () failed, read this thermostat's minimum
         // and maximum so we can initialize the BadTemp exception.
         CCS::Thermostat::BtData btd;
@@ -518,7 +516,6 @@ Controller_impl::find (CCS::Controller::SearchSeq & slist)
     // Loop over input list and lookup each device.
     CORBA::ULong listlen = slist.length ();
     for (CORBA::ULong i = 0; i < listlen; i++) {
-
         AssetMap::iterator where;   // Iterator for asset set
         int num_found = 0;          // Num matched per iteration
 
diff --git a/TAO/examples/Advanced/ch_18/server.h b/TAO/examples/Advanced/ch_18/server.h
index 97b6ed266ba..d3c9e58be7e 100644
--- a/TAO/examples/Advanced/ch_18/server.h
+++ b/TAO/examples/Advanced/ch_18/server.h
@@ -12,7 +12,6 @@
 
 
 
-
 #ifndef server_HH_
 #define server_HH_
 
diff --git a/TAO/examples/Advanced/ch_21/icp.cpp b/TAO/examples/Advanced/ch_21/icp.cpp
index 2cb291765f9..8a66d24aba3 100644
--- a/TAO/examples/Advanced/ch_21/icp.cpp
+++ b/TAO/examples/Advanced/ch_21/icp.cpp
@@ -12,7 +12,6 @@
 
 
 
-
 #include    <string>
 #include    <map>
 #include    <algorithm>
@@ -132,7 +131,6 @@ vary_temp(long temp)
     if (ACE_OS::rand() % 2)
         delta = -delta;
     return temp + delta;
-
 }
 
 //----------------------------------------------------------------
@@ -388,6 +386,3 @@ static ICP_Persist mydb("/tmp/CCS_DB");
 
 
 
-
-
-
diff --git a/TAO/examples/Advanced/ch_21/icp.h b/TAO/examples/Advanced/ch_21/icp.h
index 367dba07e09..6174b4b9b17 100644
--- a/TAO/examples/Advanced/ch_21/icp.h
+++ b/TAO/examples/Advanced/ch_21/icp.h
@@ -37,5 +37,3 @@ extern "C" {
 
 
 
-
-
diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp
index 4ffc422b94a..2c7b2208f84 100644
--- a/TAO/examples/Advanced/ch_21/server.cpp
+++ b/TAO/examples/Advanced/ch_21/server.cpp
@@ -237,7 +237,6 @@ Thermostat_impl::set_nominal_temp (CCS::TempType new_temp)
 
     // Now set the nominal temperature to the new value.
     if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) {
-
         // If ICP_set () failed, read this thermostat's minimum
         // and maximum so we can initialize the BadTemp exception.
         CCS::Thermostat::BtData btd;
@@ -406,7 +405,6 @@ create_thermostat (
     assert (ICP_set (anum, "location", loc) == 0);
     // Set the nominal temperature.
     if (ICP_set (anum, "nominal_temp", &temp) != 0) {
-
         // If ICP_set () failed, read this thermostat's minimum
         // and maximum so we can initialize the BadTemp exception.
         CCS::Thermostat::BtData btd;
@@ -510,7 +508,6 @@ find (CCS::Controller::SearchSeq & slist)
     // Loop over input list and lookup each device.
     CORBA::ULong listlen = slist.length ();
     for (CORBA::ULong i = 0; i < listlen; i++) {
-
         AssetSet::iterator where;   // Iterator for asset set
         int num_found = 0;          // Num matched per iteration
 
diff --git a/TAO/examples/Advanced/ch_21/server.h b/TAO/examples/Advanced/ch_21/server.h
index f0c94184bc1..ed8bba2774e 100644
--- a/TAO/examples/Advanced/ch_21/server.h
+++ b/TAO/examples/Advanced/ch_21/server.h
@@ -12,7 +12,6 @@
 
 
 
-
 #ifndef server_HH_
 #define server_HH_
 
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index b59b38df1c2..2bc56efe05e 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -22,7 +22,7 @@
 
 TimeOfDay
 Time_impl::
-get_gmt (void)
+get_gmt ()
 {
   time_t time_now = ACE_OS::time (0);
   struct tm *time_p = ACE_OS::gmtime (&time_now);
@@ -81,5 +81,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
 
-
-
diff --git a/TAO/examples/Advanced/ch_3/server.h b/TAO/examples/Advanced/ch_3/server.h
index a61cc86259e..afeefeb30c9 100644
--- a/TAO/examples/Advanced/ch_3/server.h
+++ b/TAO/examples/Advanced/ch_3/server.h
@@ -19,7 +19,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (void);
+  virtual TimeOfDay get_gmt ();
 };
 
 #endif /* server_HH_ */
diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.cpp b/TAO/examples/Advanced/ch_8_and_10/icp.cpp
index 4788e48ac07..c0223f2b86c 100644
--- a/TAO/examples/Advanced/ch_8_and_10/icp.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/icp.cpp
@@ -12,7 +12,6 @@
 
 
 
-
 #include    <string>
 #include    <map>
 #include    <algorithm>
diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp
index eb7563d3760..8847fab5345 100644
--- a/TAO/examples/Advanced/ch_8_and_10/server.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp
@@ -190,7 +190,6 @@ set_nominal_temp (CCS::TempType new_temp)
 
     // Now set the nominal temperature to the new value.
     if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) {
-
         // If ICP_set () failed, read this thermostat's minimum
         // and maximum so we can initialize the BadTemp exception.
         CCS::Thermostat::BtData btd;
@@ -336,7 +335,6 @@ find (CCS::Controller::SearchSeq & slist)
     // Loop over input list and look up each device.
     CORBA::ULong listlen = slist.length ();
     for (CORBA::ULong i = 0; i < listlen; i++) {
-
         AssetMap::iterator where;   // Iterator for asset map
         int num_found = 0;          // Num matched per iteration
 
diff --git a/TAO/examples/Advanced/ch_8_and_10/server.h b/TAO/examples/Advanced/ch_8_and_10/server.h
index 45d0c88a980..925de61a5b2 100644
--- a/TAO/examples/Advanced/ch_8_and_10/server.h
+++ b/TAO/examples/Advanced/ch_8_and_10/server.h
@@ -12,7 +12,6 @@
 
 
 
-
 #ifndef server_HH_
 #define server_HH_
 
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index 996a0865fb6..a73397fcaec 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -8,13 +8,13 @@ USEFORM("ChatClientWnd.cpp", ChatClientWindow);
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 
-void ace_init(void)
+void ace_init()
 {
   ACE::init();
 }
 #pragma startup ace_init
 
-void ace_fini(void)
+void ace_fini()
 {
   ACE::fini();
 }
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index b002be26a23..f3412e15a68 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -69,7 +69,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void)
+  void shutdown ()
   {
   }
   //FUZZ: enable check_for_lack_ACE_OS
@@ -229,7 +229,6 @@ setup_buffering_constraints (CORBA::ORB_ptr orb)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
@@ -326,6 +325,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return -1;
     }
 
-
   return 0;
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 3ec9498c709..69c6ad2c7ef 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -17,7 +17,7 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h
index eadcac9b5c0..082c495bb58 100644
--- a/TAO/examples/Buffered_AMI/test_i.h
+++ b/TAO/examples/Buffered_AMI/test_i.h
@@ -28,7 +28,7 @@ public:
   void method (CORBA::ULong request_number,
                CORBA::ULong_out reply_number);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index 1bf1affe144..394ca3f9b12 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -18,7 +18,6 @@
 #include "ace/Read_Buffer.h"
 
 
-
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
@@ -113,7 +112,6 @@ parse_args (int argc, ACE_TCHAR **argv)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
@@ -311,6 +309,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return -1;
     }
 
-
   return 0;
 }
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 0956a0c58c1..5b0cd76c6b0 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -3,7 +3,6 @@
 #include "ace/OS_NS_stdio.h"
 
 
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index a35f50caa4d..e9a575b0587 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -1,7 +1,6 @@
 #include "test_i.h"
 
 
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
@@ -16,7 +15,7 @@ test_i::method (CORBA::ULong request_number)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h
index 42cbe3f40a6..7abab357bf2 100644
--- a/TAO/examples/Buffered_Oneways/test_i.h
+++ b/TAO/examples/Buffered_Oneways/test_i.h
@@ -27,7 +27,7 @@ public:
   // = The test interface methods.
   void method (CORBA::ULong request_number);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
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/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
index 137791f75c5..3c0b73b2607 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
@@ -8,7 +8,6 @@
 class ClientApp
 {
   public:
-
     ClientApp();
     ~ClientApp();
 
@@ -16,7 +15,6 @@ class ClientApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index ddcf4f4e82f..8b42daabd9f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -22,7 +22,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -39,7 +39,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -65,14 +65,14 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
-  ++this->count_op5_;;
+  ++this->count_op5_;
 }
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index 9751030b8ae..a1040204585 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -9,25 +9,23 @@
 class Foo_i : public virtual POA_Foo
 {
   public:
-
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
-
     CORBA::Long value_;
     unsigned num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
index f9d1517383f..788ddcc9c57 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
@@ -9,7 +9,6 @@
 class ServerApp
 {
   public:
-
     ServerApp();
     ~ServerApp();
 
@@ -17,7 +16,6 @@ class ServerApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
index 035329c2b13..ef25dc055cb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
@@ -86,7 +86,6 @@ ClientApp::run(int argc, ACE_TCHAR* argv[])
 }
 
 
-
 int
 ClientApp::parse_args(int argc, ACE_TCHAR* argv[])
 {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
index eb50cb27a4f..2df9e8939d1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
@@ -9,7 +9,6 @@
 class ClientApp
 {
   public:
-
     ClientApp();
     ~ClientApp();
 
@@ -17,7 +16,6 @@ class ClientApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index b688a1991d9..baf65e459b6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -69,7 +69,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa)
 
 
 void
-FooServantList::client_done(void)
+FooServantList::client_done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index efab29f4187..03e77be65a7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -18,7 +18,7 @@ public:
 
   void create_and_activate(PortableServer::POA_ptr poa);
 
-  void client_done(void);
+  void client_done();
 
 private:
   PortableServer::ServantBase_var* servants_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index eca9c5e79db..12bf846557a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -20,7 +20,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -37,7 +37,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -63,14 +63,14 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
 }
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index 4e191c54b2a..b8ba20b54a2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -11,25 +11,23 @@ class FooServantList;
 class Foo_i : public virtual POA_Foo
 {
   public:
-
     Foo_i(const ACE_TCHAR* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
-
     CORBA::Long value_;
 
     unsigned count_op1_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
index 0f5b1e1a040..9f0be76663d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
@@ -8,7 +8,6 @@
 class ServerApp
 {
   public:
-
     ServerApp();
     ~ServerApp();
 
@@ -16,7 +15,6 @@ class ServerApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
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/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
index eb50cb27a4f..2df9e8939d1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
@@ -9,7 +9,6 @@
 class ClientApp
 {
   public:
-
     ClientApp();
     ~ClientApp();
 
@@ -17,7 +16,6 @@ class ClientApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index 5018a78c872..1f87afbdb21 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -15,7 +15,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
 }
 
@@ -28,13 +28,12 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   return this->value_;
 }
 
 
-
 void
 Foo_i::op4(CORBA::Long value)
 {
@@ -43,14 +42,14 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   throw FooException();
 }
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index ea7db122e12..230ca09f03f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -7,24 +7,22 @@
 class Foo_i : public virtual POA_Foo
 {
   public:
-
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
   private:
-
     CORBA::Long value_;
     unsigned num_clients_;
 };
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
index 76e7619aca6..0c89c7606e7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
@@ -9,7 +9,6 @@
 class ServerApp
 {
   public:
-
     ServerApp();
     ~ServerApp();
 
@@ -17,7 +16,6 @@ class ServerApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index ce50c43b3e6..099bdc5a585 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -16,6 +16,5 @@ Callback_i::test_method (
 )
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n"));
-
 }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index 5a013fe4f88..dca0793904f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -7,14 +7,12 @@
 class Callback_i : public virtual POA_Callback
 {
   public:
-
     Callback_i();
 
     virtual ~Callback_i();
 
     virtual void test_method (
     );
-
 };
 
 
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/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 50984c0332d..453918983b5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -19,7 +19,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -36,7 +36,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -62,13 +62,13 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n"));
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n"));
   unsigned newcount = ++this->count_op5_;
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Counter is now %d.\n", newcount));
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));;
+  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));
 }
 
 
@@ -223,7 +223,7 @@ Foo_i::test_callback (
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   static ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients = 2;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index 651e3c1d151..eb1bd9de1eb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -12,19 +12,18 @@ class FooServantList;
 class Foo_i : public virtual POA_Foo
 {
   public:
-
     Foo_i(const char* servant_name);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
@@ -78,11 +77,10 @@ class Foo_i : public virtual POA_Foo
     virtual void test_callback (
       );
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
-
     CORBA::Long value_;
 
     unsigned count_op1_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
index fba7ea86b08..7cdd32318fc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
@@ -8,7 +8,6 @@
 class ServerApp
 {
   public:
-
     ServerApp();
     ~ServerApp();
 
@@ -16,7 +15,6 @@ class ServerApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index ce50c43b3e6..099bdc5a585 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -16,6 +16,5 @@ Callback_i::test_method (
 )
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n"));
-
 }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index ce967dfe29b..dca0793904f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -7,7 +7,6 @@
 class Callback_i : public virtual POA_Callback
 {
   public:
-
     Callback_i();
 
     virtual ~Callback_i();
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
index 689c7371573..8eab095a92e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
@@ -10,7 +10,6 @@ class ClientTask;
 class ClientApp
 {
   public:
-
     ClientApp();
     ~ClientApp();
 
@@ -18,7 +17,6 @@ class ClientApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
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/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 00a50947930..3a985f08026 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -130,7 +130,7 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
 
 
 void
-FooServantList::client_done(void)
+FooServantList::client_done()
 {
   unsigned num_left;
 
@@ -158,7 +158,7 @@ FooServantList::collocated_client () const
 
 
 void
-FooServantList::deactivate_servant (void)
+FooServantList::deactivate_servant ()
 {
   for (unsigned i = 0; i < this->num_servants_; i++)
     {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index 4a06102f735..e0779ed05fd 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -12,7 +12,6 @@ class Foo_i;
 class FooServantList
 {
   public:
-
     FooServantList(const ACE_TCHAR* prefix,
                    unsigned num_servants,
                    unsigned num_clients,
@@ -24,11 +23,11 @@ class FooServantList
     void create_and_activate(CORBA::ORB_ptr orb,
                              PortableServer::POA_ptr poa);
 
-    void client_done(void);
+    void client_done();
 
     ClientTask* collocated_client () const;
 
-    void deactivate_servant (void);
+    void deactivate_servant ();
 
   private:
     Foo_i** servants_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index 7a5925b63b9..227b8faa73a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -21,7 +21,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -38,7 +38,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
 
@@ -70,7 +70,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
   throw FooException();
@@ -228,7 +228,7 @@ Foo_i::test_callback (
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index 3e127b18a6c..1a940771368 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -14,15 +14,15 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
@@ -63,7 +63,7 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_callback ();
 
-    virtual void done(void);
+    virtual void done();
 
     void active (bool flag);
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
index 6f390f129cc..fe582ee5f86 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
@@ -8,7 +8,6 @@
 class ServerApp
 {
   public:
-
     ServerApp();
     ~ServerApp();
 
@@ -16,7 +15,6 @@ class ServerApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
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/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
index eb50cb27a4f..2df9e8939d1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
@@ -9,7 +9,6 @@
 class ClientApp
 {
   public:
-
     ClientApp();
     ~ClientApp();
 
@@ -17,7 +16,6 @@ class ClientApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index a5a2f905d7e..f2caf9a65ff 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -23,7 +23,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -40,7 +40,7 @@ Foo_i::op2(CORBA::Long value)
 
 
 CORBA::Long
-Foo_i::op3(void)
+Foo_i::op3()
 {
   ++this->count_op3_;
   return this->value_;
@@ -66,7 +66,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   ++this->count_op5_;
   throw FooException();
@@ -74,7 +74,7 @@ Foo_i::op5(void)
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index 858fc65a6da..ef2f2f41a20 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -7,25 +7,23 @@
 class Foo_i
 {
   public:
-
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void);
+    virtual CORBA::Long op3();
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
   private:
-
     CORBA::Long value_;
     unsigned num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index eb21e8b2c91..eb6810fee6b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -45,7 +45,7 @@ ServerApp::run (int argc, ACE_TCHAR* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      throw TestException();;
+      throw TestException();
     }
 
   PortableServer::POA_var root_poa
@@ -55,7 +55,7 @@ ServerApp::run (int argc, ACE_TCHAR* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      throw TestException();;
+      throw TestException();
     }
 
   PortableServer::POAManager_var poa_manager
@@ -77,7 +77,7 @@ ServerApp::run (int argc, ACE_TCHAR* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to create the child POA.\n"));
-      throw TestException();;
+      throw TestException();
     }
 
   policies[0]->destroy ();
@@ -92,7 +92,7 @@ ServerApp::run (int argc, ACE_TCHAR* argv[])
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
-      throw TestException();;
+      throw TestException();
     }
 
   // Create the Foo_i object.
@@ -108,7 +108,7 @@ ServerApp::run (int argc, ACE_TCHAR* argv[])
     {
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Failed to activate servant foo_tie_i.\n"));
-      throw TestException();;
+      throw TestException();
     }
 
   // Stringify the object reference
@@ -123,7 +123,7 @@ ServerApp::run (int argc, ACE_TCHAR* argv[])
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Cannot open output file for writing IOR: %s",
                  this->ior_filename_.c_str()));
-      throw TestException();;
+      throw TestException();
     }
 
   ACE_OS::fprintf(ior_file, "%s", ior.in ());
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
index f9d1517383f..788ddcc9c57 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
@@ -9,7 +9,6 @@
 class ServerApp
 {
   public:
-
     ServerApp();
     ~ServerApp();
 
@@ -17,7 +16,6 @@ class ServerApp
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
diff --git a/TAO/examples/Callback_Quoter/Consumer.idl b/TAO/examples/Callback_Quoter/Consumer.idl
index 07bc8ba9afe..7223f23c9fd 100644
--- a/TAO/examples/Callback_Quoter/Consumer.idl
+++ b/TAO/examples/Callback_Quoter/Consumer.idl
@@ -2,56 +2,44 @@
 #if !defined (_CONSUMER_IDL)
 #define _CONSUMER_IDL
 
+/// This module contains the data structure defined to store
+/// information and the consumer interface.
 module Callback_Quoter
 {
-  // = TITLE
-  // This module contains the data structure defined to store
-  // information and the consumer interface.
-
+  // Requested stock does not exist.
   exception Invalid_Stock
   {
-    // = TITLE
-    //   Requested stock does not exist.
-
+    /// The message which declares the reason for this exception.
     string reason;
-    // The message which declares the reason for this exception.
-
   };
 
+  /// Requested object does not exist.
   exception Invalid_Handle
   {
-    // = TITLE
-    //   Requested object does not exist.
-
+    /// The actual reason which caused the exception.
     string reason;
-    // The actual reason which caused the exception.
-
   };
 
+  /// The information passed by the Notifier to the consumer.
   struct Info
   {
-    // = TITLE
-    // The information passed by the Notifier to the consumer.
-
+    /// This is the name of the stock about whom the consumer
+    /// is seeking information.
     string stock_name;
-    // This is the name of the stock about whom the consumer
-    // is seeking information.
 
+    /// This is the market price of the stock.
     long value;
-    // This is the market price of the stock.
   };
 
+  /// The Consumer interface which is utilized by the Notifier
+  /// to pass information to the consumer.
   interface Consumer
     {
-      // = TITLE
-      // The Consumer interface which is utilized by the Notifier
-      // to pass information to the consumer.
-
+      /// Notifier sends data to the consumer.
       void push (in Callback_Quoter::Info data);
-      // Notifier sends data to the consumer.
 
+      /// the process shuts down.
       void shutdown ();
-      // the process shuts down.
     };
 };
 
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 6d93850e49f..96809c6d364 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -23,7 +23,7 @@
 #include "ace/Event_Handler.h"
 #include "ace/OS_NS_fcntl.h"
 
-Consumer_Handler::Consumer_Handler (void)
+Consumer_Handler::Consumer_Handler ()
   : stock_name_ ("Unknown"),
     threshold_value_ (0),
     server_ (),
@@ -34,13 +34,11 @@ Consumer_Handler::Consumer_Handler (void)
     use_naming_service_ (1),
     interactive_ (1)
 {
-
 }
 
-Consumer_Handler::~Consumer_Handler (void)
+Consumer_Handler::~Consumer_Handler ()
 {
   // Make sure to cleanup the STDIN handler.
-
   if (this->interactive_ == 1)
     {
       if (ACE_Event_Handler::remove_stdin_handler
@@ -53,7 +51,6 @@ Consumer_Handler::~Consumer_Handler (void)
 }
 
 // Reads the Server factory IOR from a file.
-
 int
 Consumer_Handler::read_ior (ACE_TCHAR *filename)
 {
@@ -83,9 +80,8 @@ Consumer_Handler::read_ior (ACE_TCHAR *filename)
 }
 
 // Parses the command line arguments and returns an error status.
-
 int
-Consumer_Handler::parse_args (void)
+Consumer_Handler::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("a:t:d:f:xk:xs"));
   int c;
@@ -124,7 +120,6 @@ Consumer_Handler::parse_args (void)
         this->threshold_value_ = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
-
       case 'x':
         this->shutdown_ = 1;
         break;
@@ -149,10 +144,9 @@ Consumer_Handler::parse_args (void)
   return 0;
 }
 
-// this method uses the naming service to obtain the server object refernce.
-
+// This method uses the naming service to obtain the server object reference.
 int
-Consumer_Handler::via_naming_service (void)
+Consumer_Handler::via_naming_service ()
 {
   try
     {
@@ -174,8 +168,6 @@ Consumer_Handler::via_naming_service (void)
       // the <_narrow> method.
       this->server_ =
         Notifier::_narrow (notifier_obj.in ());
-
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -191,7 +183,6 @@ Consumer_Handler::via_naming_service (void)
 int
 Consumer_Handler::init (int argc, ACE_TCHAR **argv)
 {
-
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -253,7 +244,6 @@ Consumer_Handler::init (int argc, ACE_TCHAR **argv)
          }
       else
         {
-
           if (this->ior_ == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "%s: no ior specified\n",
@@ -284,9 +274,8 @@ Consumer_Handler::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Consumer_Handler::run (void)
+Consumer_Handler::run ()
 {
-
   try
     {
       // Obtain and activate the RootPOA.
@@ -313,7 +302,6 @@ Consumer_Handler::run (void)
 
       if (this->interactive_ == 0)
         {
-
           // Register with the server.
           this->server_->register_callback (this->stock_name_.c_str (),
                                             this->threshold_value_,
@@ -329,7 +317,6 @@ Consumer_Handler::run (void)
 
       // Run the ORB.
       this->orb_->run ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index de5d729bc63..71d4b469979 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
  *  @file    Consumer_Handler.h
@@ -10,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef CONSUMER_HANDLER_H
 #define CONSUMER_HANDLER_H
 
@@ -45,16 +42,16 @@ class Consumer_Handler
 {
 public:
   /// Constructor.
-  Consumer_Handler (void);
+  Consumer_Handler ();
 
   /// Destructor.
-  ~Consumer_Handler (void);
+  ~Consumer_Handler ();
 
   /// Initialize the client communication with the server.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Start the ORB object.
-  int run (void);
+  int run ();
 
   /// the name of the stock the consumer is interested in.
   ACE_CString stock_name_;
@@ -66,7 +63,7 @@ public:
   Notifier_var server_;
 
   /// The consumer object.
-  Consumer_i *consumer_servant_;
+  Consumer_i *consumer_servant_ {};
 
   /// Pointer to the consumer object registered with the ORB.
   Callback_Quoter::Consumer_var consumer_var_;
@@ -83,7 +80,6 @@ public:
   int unregistered_;
 
 private:
-
   /// Our orb.
   CORBA::ORB_var orb_;
 
@@ -92,11 +88,11 @@ private:
 
   /// Parse the command line arguments.  Returns 0 on success, -1 on
   /// error.
-  int parse_args (void);
+  int parse_args ();
 
-  /// This method initialises the naming service and registers the
+  /// This method initializes the naming service and registers the
   /// object with the POA.
-  int via_naming_service (void);
+  int via_naming_service ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index fb97e50820c..004dc0f4733 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -8,17 +8,15 @@
  */
 //=============================================================================
 
-
 #include "Consumer_Input_Handler.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_ctype.h"
 
 Consumer_Input_Handler::Consumer_Input_Handler (Consumer_Handler *consumer_handler)
-  {
-    consumer_handler_ = consumer_handler;
-
-  }
+{
+  consumer_handler_ = consumer_handler;
+}
 
 int
 Consumer_Input_Handler::handle_input (ACE_HANDLE)
@@ -28,10 +26,7 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE)
   // The string could read contains \n\0 hence using ACE_OS::read
   // which returns the no of bytes read and hence i can manipulate
   // and remove the devil from the picture i.e '\n' ! ;)
-
-  ssize_t strlen = ACE_OS::read (ACE_STDIN,
-                                 buf,
-                                 sizeof buf);
+  ssize_t strlen = ACE_OS::read (ACE_STDIN, buf, sizeof buf);
   if (buf[strlen -1] == '\n')
     buf[strlen -1] = '\0';
 
@@ -56,20 +51,15 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE)
   return 0;
 }
 
-
 int
 Consumer_Input_Handler::register_consumer ()
 {
-
   // Get the stockname the consumer is interested in.
   static char stockname[BUFSIZ];
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Stockname?"));
+  ACE_DEBUG ((LM_DEBUG, "Stockname?"));
 
-  ssize_t strlen = ACE_OS::read (ACE_STDIN,
-                                 stockname,
-                                 sizeof stockname - 1);
+  ssize_t strlen = ACE_OS::read (ACE_STDIN, stockname, sizeof stockname - 1);
 
   // Taking care of platforms where an carriage return is padded with newline.
   if (stockname[strlen -2] == '\n' || stockname[strlen -2] == '\r')
@@ -78,7 +68,6 @@ Consumer_Input_Handler::register_consumer ()
     if (stockname[strlen -1] == '\n' || stockname[strlen -1] == '\r')
       stockname[strlen -1] = '\0';
 
-
   this->consumer_handler_->stock_name_ = stockname;
 
   // Get the threshold value.
@@ -99,7 +88,6 @@ Consumer_Input_Handler::register_consumer ()
 
   try
     {
-
       // Register with the server.
       this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_.c_str (),
                                                            this->consumer_handler_->threshold_value_,
@@ -110,9 +98,7 @@ Consumer_Input_Handler::register_consumer ()
       consumer_handler_->unregistered_ = 0;
 
       // @@ Up to this point..
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "registeration done!\n"));
+      ACE_DEBUG ((LM_DEBUG, "Registration done!\n"));
     }
   catch (const CORBA::Exception& ex)
     {
@@ -124,14 +110,11 @@ Consumer_Input_Handler::register_consumer ()
 return 0;
 }
 
-
-
 int
 Consumer_Input_Handler::unregister_consumer ()
 {
   // Only if the consumer is registered can the
   // unregistration take place.
-
   if (consumer_handler_->registered_ == 1)
     {
       this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in());
@@ -145,7 +128,6 @@ Consumer_Input_Handler::unregister_consumer ()
     ACE_DEBUG ((LM_DEBUG,
                 " Invalid Operation: Consumer not Registered\n"));
 
-
   return 0;
 }
 
@@ -192,8 +174,3 @@ Consumer_Input_Handler::quit_consumer_process ()
 
   return 0;
 }
-
-Consumer_Input_Handler::~Consumer_Input_Handler (void)
-{
-  // No-op
-}
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h
index 883673c2251..89f857d14c3 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h
@@ -25,7 +25,6 @@
 // Creating a class to handle input events.
 // Since only inputs need to be handled, only the handle_input
 // method is overlaoded.
-
 class Consumer_Handler;
 
 /**
@@ -39,49 +38,45 @@ class Consumer_Handler;
  */
 class Consumer_Input_Handler : public ACE_Event_Handler
 {
-
 public:
   /// Constructor.
   Consumer_Input_Handler (Consumer_Handler *consumer_handler);
 
   /// Handle the user input.
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
   /// Registration with the notifier.
-  int register_consumer (void);
+  int register_consumer ();
 
   /// Cancelling the registration with the notifier.
-  int unregister_consumer (void);
+  int unregister_consumer ();
 
   /// Ends the consumer process.
-  int quit_consumer_process (void);
-
-  enum
+  int quit_consumer_process ();
+
+  ///   A set of values for the execution of the consumer.
+  ///
+  ///   Used so that the process of registering, unregistering
+  ///   and exiting neednt be dependent on 'r' 'u' and 'q'.
+  ///   Also, #define clutters up the global namespace.
+enum
   {
-    // =  TITLE
-    //   A set of values for the execution of the consumer.
-    //
-    // = DESCRIPTION
-    //   Used so that the process of registering, unregistering
-    //   and exiting neednt be dependent on 'r' 'u' and 'q'.
-    //   Also, #define clutters up the global namespace.
-
+    /// The character that the user must type to register the consumer with
+    /// the Notifier_server.
     REGISTER = 'r',
-    // The character that the user must type to register the consumer with
-    // the Notifier_server.
 
+    /// The character that the user must type to unregister the consumer with
+    /// the Notifier_server.
     UNREGISTER = 'u',
-    // The character that the user must type to unregister the consumer with
-    // the Notifier_server.
 
+    /// The character the user must type to quit the consumer client
+    /// application.
     EXIT = 'q'
-    // The character the user must type to quit the consumer client
-    // application.
   };
 
 protected:
-  /// the destructor.
-  ~Consumer_Input_Handler (void);
+  /// Destructor.
+  ~Consumer_Input_Handler () = default;
 
 private:
   /// The Consumer_Handler object.
diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
index 9298cad5ce2..0d7f1084e24 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "Consumer_Signal_Handler.h"
 
 Consumer_Signal_Handler::Consumer_Signal_Handler (Consumer_Handler *consumer_handler)
@@ -18,18 +17,13 @@ Consumer_Signal_Handler::Consumer_Signal_Handler (Consumer_Handler *consumer_han
 {
 }
 
-Consumer_Signal_Handler:: ~Consumer_Signal_Handler (void)
-{
-}
-
 // Method to handle the ^C signal.
 int
 Consumer_Signal_Handler::handle_signal (int /* signum */,
                                         siginfo_t*,
                                         ucontext_t*)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              " Exiting on receiving ^C\n"));
+  ACE_DEBUG ((LM_DEBUG, " Exiting on receiving ^C\n"));
 
   quit_on_signal ();
 
@@ -38,8 +32,7 @@ Consumer_Signal_Handler::handle_signal (int /* signum */,
 
 // Method called before the Event_Handler dies.
 int
-Consumer_Signal_Handler::handle_close (ACE_HANDLE,
-                                       ACE_Reactor_Mask)
+Consumer_Signal_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 {
   // End of the signal handler.
   delete this;
@@ -48,12 +41,10 @@ Consumer_Signal_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-Consumer_Signal_Handler::quit_on_signal (void)
+Consumer_Signal_Handler::quit_on_signal ()
 {
   // Only if the consumer is registered and wants to shut down, its
   // necessary to unregister and then shutdown.
-
-
   try
     {
       if (consumer_handler_->unregistered_ != 1
diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.h
index 9cd7463ae4e..6043fd02f4e 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.h
@@ -31,32 +31,30 @@ class Consumer_Handler;
 class Consumer_Signal_Handler : public ACE_Event_Handler
 {
 public:
-
-  /// The consumer_handler refernce will be used to access the servant
+  /// The consumer_handler reference will be used to access the servant
   /// methods.
   Consumer_Signal_Handler (Consumer_Handler *consumer_handler);
 
   /// This method takes action on an signal event.
   int handle_signal (int signum,
                      siginfo_t*,
-                     ucontext_t*);
+                     ucontext_t*) override;
 
   /**
    * For removal of the signal handler from the dispatch tables.  When
    * the handle_signal () returns < 0 this method will be executed
    * automatically.
    */
-  int handle_close (ACE_HANDLE handle,
-                    ACE_Reactor_Mask close_mask);
+  int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) override;
 
 protected:
   /// Protected destructor so that the signal handler is always created
   /// dynamically and hence the heap doesnt get corrupted.
-  ~Consumer_Signal_Handler (void);
+  ~Consumer_Signal_Handler () = default;
 
 private:
   /// Exit gracefully on a signal.
-  int quit_on_signal (void);
+  int quit_on_signal ();
 
   /// Reference to the Consumer_Handler which is used in accessing the
   /// servant methods.
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp
index 35f47f2df2d..2e37f82b1c6 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp
@@ -10,17 +10,8 @@
  */
 //=============================================================================
 
-
 #include "Consumer_i.h"
 
-Consumer_i::Consumer_i (void)
-{
-}
-
-Consumer_i::~Consumer_i (void)
-{
-}
-
 void
 Consumer_i::push (const Callback_Quoter::Info &data)
 {
@@ -34,11 +25,9 @@ Consumer_i::push (const Callback_Quoter::Info &data)
 }
 
 void
-Consumer_i::shutdown (void)
+Consumer_i::shutdown ()
 {
-
   // Instruct the ORB to shutdown.
-
   ACE_DEBUG ((LM_DEBUG,
               " consumer shutting down \n"));
 
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index 23fa3e574e0..c9c85e1534d 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -29,16 +29,16 @@ class Consumer_i : public POA_Callback_Quoter::Consumer
 {
 public:
   /// Constructor.
-  Consumer_i (void);
+  Consumer_i () = default;
 
   /// Destructor.
-  ~Consumer_i (void);
+  ~Consumer_i () = default;
 
   /// Gets the stock information from the Notifier.
-  void push (const Callback_Quoter::Info & data);
+  void push (const Callback_Quoter::Info & data) override;
 
   /// Used to get the consumer to shut down.
-  virtual void shutdown (void);
+  void shutdown () override;
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
@@ -47,9 +47,6 @@ private:
   /// ORB pointer.
   CORBA::ORB_var orb_;
 
-  /// If 1 denotes that the consumer is dead else alive.
-  int quit_;
-
   // @@ Please rename to Notifier.
   /// Smart pointer to the Notifier object.
   Notifier_var server_;
diff --git a/TAO/examples/Callback_Quoter/Notifier.idl b/TAO/examples/Callback_Quoter/Notifier.idl
index bfce4c6eb7c..cb46d0f0932 100644
--- a/TAO/examples/Callback_Quoter/Notifier.idl
+++ b/TAO/examples/Callback_Quoter/Notifier.idl
@@ -4,30 +4,28 @@
 
 #include "Consumer.idl"
 
+///  The Notifier interface in the Callback_Quoter example which
+///  contains the methods by which the consumer can register,
+///  unregister from the Notifier.
 interface Notifier
 {
-  // = TITLE
-  //  The Notifier interface in the Callback_Quoter example which
-  //  contains the methods by which the consumer can register,
-  //  unregister from the Notifier.
-
+  /// Register a distributed callback handler that is invoked when the
+  /// given stock reaches the desired threshold value.
   void register_callback (in string stock_name,
                           in long threshold_value,
                           in Callback_Quoter::Consumer consumer_handler)
     raises (Callback_Quoter::Invalid_Stock);
-  // Register a distributed callback handler that is invoked when the
-  // given stock reaches the desired threshold value.
 
+  /// Remove the handler.
   void unregister_callback (in Callback_Quoter::Consumer consumer_handler)
     raises (Callback_Quoter::Invalid_Handle);
-  // Remove the handler.
 
+  /// Get market status.
   void market_status (in string stock_name,
                       in long stock_value);
-  // Get market status.
 
-   void shutdown ();
-  // Shuts the server down.
+  /// Shuts the server down.
+  void shutdown ();
 };
 
 #endif /* _NOTIFIER_IDL */
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index 112232beb13..d88b3ad1849 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    Notifier_Input_Handler.cpp
@@ -9,7 +8,6 @@
  */
 //=============================================================================
 
-
 #include "Notifier_Input_Handler.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -18,8 +16,7 @@
 #include "ace/OS_NS_ctype.h"
 
 // Constructor.
-
-Notifier_Input_Handler::Notifier_Input_Handler (void)
+Notifier_Input_Handler::Notifier_Input_Handler ()
   : ior_output_file_ (0),
     argc_ (0),
     argv_ (0),
@@ -28,27 +25,22 @@ Notifier_Input_Handler::Notifier_Input_Handler (void)
 }
 
 // Destructor.
-
-Notifier_Input_Handler::~Notifier_Input_Handler (void)
+Notifier_Input_Handler::~Notifier_Input_Handler ()
 {
    // Make sure to cleanup the STDIN handler.
-
   if (ACE_Event_Handler::remove_stdin_handler
       (this->notifier_i_.orb_->orb_core ()->reactor (),
        this->notifier_i_.orb_->orb_core ()->thr_mgr ()) == -1)
      ACE_ERROR ((LM_ERROR,
                "%p\n",
                "remove_stdin_handler"));
-
 }
 
 // The naming service is initialized and the naming context as well as
 // the object name is bound to the naming server.
-
 int
-Notifier_Input_Handler::init_naming_service (void)
+Notifier_Input_Handler::init_naming_service ()
 {
-
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   if (this->naming_server_.init (orb.in ()) == -1)
@@ -68,7 +60,6 @@ Notifier_Input_Handler::init_naming_service (void)
 
       naming_server_->rebind (notifier_obj_name,
                               notifier_obj.in());
-
     }
   catch (const CosNaming::NamingContext::AlreadyBound&)
     {
@@ -83,7 +74,7 @@ Notifier_Input_Handler::init_naming_service (void)
 
 // Parse the command-line arguments and set options.
 int
-Notifier_Input_Handler::parse_args (void)
+Notifier_Input_Handler::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:s "));
   int c;
@@ -125,15 +116,12 @@ Notifier_Input_Handler::parse_args (void)
 }
 
 // Initialize the server.
-
 int
 Notifier_Input_Handler::init (int argc,
                               ACE_TCHAR *argv[])
 {
-
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create the child poa under the root POA.
-
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -192,21 +180,16 @@ Notifier_Input_Handler::init (int argc,
 }
 
 int
-Notifier_Input_Handler::run (void)
+Notifier_Input_Handler::run ()
 {
   // Run the main event loop for the ORB.
+  ACE_DEBUG ((LM_DEBUG, " Type \"q\" to quit \n"));
 
-
-  ACE_DEBUG ((LM_DEBUG,
-              " Type \"q\" to quit \n"));
-
-  int result = this->orb_manager_.run ();
+  int const result = this->orb_manager_.run ();
 
   if (result == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Notifier_Input_Handler::run"),
-                        -1);
+      ACE_ERROR_RETURN ((LM_ERROR, "Notifier_Input_Handler::run"), -1);
     }
 
   return 0;
@@ -215,23 +198,19 @@ Notifier_Input_Handler::run (void)
 int
 Notifier_Input_Handler::handle_input (ACE_HANDLE)
 {
-  char buf[BUFSIZ];
-
-
   try
     {
+      char buf[BUFSIZ];
+
       // The string could read contains \n\0 hence using ACE_OS::read
       // which returns the no of bytes read and hence i can manipulate
       // and remove the devil from the picture i.e '\n' ! ;)
-
-      ssize_t strlen = ACE_OS::read (ACE_STDIN,
-                                     buf,
-                                     sizeof buf);
+      ssize_t const strlen = ACE_OS::read (ACE_STDIN, buf, sizeof buf);
       if (buf[strlen -1] == '\n')
         buf[strlen -1] = '\0';
 
       ACE_DEBUG ((LM_DEBUG,
-                  "%s",
+                  "%C",
                   buf));
 
       if (ACE_OS::ace_tolower(buf[0]) == 'q')
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index a19bbeabf5e..e26fa584eba 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -34,32 +34,30 @@ class Notifier_Input_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Notifier_Input_Handler (void);
+  Notifier_Input_Handler ();
 
   /// Destructor.
-  ~Notifier_Input_Handler (void);
+  ~Notifier_Input_Handler ();
 
   /// Initialize the Notifier who plays the role of the server here.
-  int init (int argc,
-            ACE_TCHAR *argv[]);
+  int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// Handle the user input.
-   virtual int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
 private:
-
-  /// The tao orb manager object.
+  /// The TAO orb manager object.
   TAO_ORB_Manager orb_manager_;
 
   /// Parses the command line arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Initialises the name server and registers the Notifier object
   /// name with the name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// File where the IOR of the Notifier object is stored.
   FILE *ior_output_file_;
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 64855f0766d..675bfedf1e1 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -10,24 +10,10 @@
  */
 //=============================================================================
 
-
 #include "Notifier_i.h"
 
-
-Notifier_i::Notifier_i (void)
-  : notifier_exited_(0)
-{
-  // No-op
-}
-
-Notifier_i::~Notifier_i (void)
-{
-  // No-op
-}
-
 // Register a distributed callback handler that is invoked when the
 // given stock reaches the desired threshold value.
-
 void
 Notifier_i::register_callback (const char *stock_name,
                                CORBA::Long threshold_value,
@@ -88,7 +74,6 @@ Notifier_i::register_callback (const char *stock_name,
 }
 
 // Obtain a pointer to the orb.
-
 void
 Notifier_i::orb (CORBA::ORB_ptr orb)
 {
@@ -96,7 +81,6 @@ Notifier_i::orb (CORBA::ORB_ptr orb)
 }
 
 // Remove the client handler.
-
 void
 Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer)
 {
@@ -140,13 +124,12 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer)
 
 // Gets the market status and sends the information to the consumer
 // who is interested in it.
-
 void
 Notifier_i::market_status (const char *stock_name,
                            CORBA::Long stock_value)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Notifier_i:: The stockname is %s with price %d\n",
+              "Notifier_i:: The stockname is %C with price %d\n",
               stock_name,
               stock_value));
 
@@ -186,11 +169,10 @@ Notifier_i::market_status (const char *stock_name,
                 " Stock Not Present!\n"));
   // Raising an exception caused problems as they were caught by the Market daemon
   // who exited prematurely.
-
 }
 
 void
-Notifier_i::shutdown (void)
+Notifier_i::shutdown ()
 {
   if ( this->consumer_map_.close () > 0)
     ACE_ERROR ((LM_ERROR,
@@ -206,7 +188,6 @@ Notifier_i::shutdown (void)
 
   // Instruct the ORB to shutdown.
   this->orb_->shutdown ();
-
 }
 
 bool
@@ -219,4 +200,3 @@ Notifier_i::Consumer_Data::operator== (const Consumer_Data &rhs) const
 
   return this->consumer_->_is_equivalent (rhs.consumer_.in ());
 }
-
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index 23a283c28c7..283c6611f9a 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -38,34 +38,30 @@ class Notifier_i : public POA_Notifier
 {
 public:
   /// Constructor.
-  Notifier_i (void);
+  Notifier_i () = default;
 
   /// Destructor.
-  ~Notifier_i (void);
+  ~Notifier_i () = default;
 
   /// Register a distributed callback handler that is invoked when the
   /// given stock reaches the desired threshold value.
-  virtual void register_callback (const char *stock_name,
-                                  CORBA::Long threshold_value,
-                                  Callback_Quoter::Consumer_ptr consumer_handler);
+  void register_callback (const char *stock_name,
+                          CORBA::Long threshold_value,
+                          Callback_Quoter::Consumer_ptr consumer_handler) override;
 
   /// Remove the consumer object.
-  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler);
+  void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler) override;
+
 
   /// Get the market status.
-  virtual void market_status (const char *stock_name,
-                              CORBA::Long stock_value);
+  void market_status (const char *stock_name, CORBA::Long stock_value) override;
 
   /// Get the orb pointer.
   void orb (CORBA::ORB_ptr orb);
 
   /// Shutdown the Notifier.
-  virtual void shutdown (void);
-
-  // CONSUMER_MAP* get_consumer_map_ptr ();
-  // Returns the consumer map ptr.
+  void shutdown () override;
 
-  //private:
 public:
   /// The ORB manager.
   CORBA::ORB_var orb_;
@@ -88,11 +84,9 @@ public:
     CORBA::Long desired_value_;
   };
 
-  typedef ACE_Unbounded_Set<Consumer_Data>
-          CONSUMERS;
+  typedef ACE_Unbounded_Set<Consumer_Data> CONSUMERS;
 
-  typedef ACE_Hash_Map_Manager<ACE_CString, CONSUMERS *, ACE_Null_Mutex>
-          CONSUMER_MAP;
+  typedef ACE_Hash_Map_Manager<ACE_CString, CONSUMERS *, ACE_Null_Mutex> CONSUMER_MAP;
 
   /// This is the hash map with each hash_entry consisting of the stockname
   /// and an unbounded set of consumer object pointer and the desired stockvalue.
@@ -100,9 +94,7 @@ public:
 
   ///This marks the exit of the notifier. This should be taken care of
   /// before the consumer tries to unregister after the notifier quits.
-  int notifier_exited_;
-
-
+  int notifier_exited_ {0};
 };
 
 #endif /* NOTIFIER_I_H */
diff --git a/TAO/examples/Callback_Quoter/README b/TAO/examples/Callback_Quoter/README
index 71c1aee8d2c..efda13a1935 100644
--- a/TAO/examples/Callback_Quoter/README
+++ b/TAO/examples/Callback_Quoter/README
@@ -1,5 +1,3 @@
-
-
 ******************************************************************************
 CALLBACK QUOTER TEST EXAMPLE                           -- Kirthika Parameswaran
                                                           <kirthika@cs.wustl.edu>
@@ -15,7 +13,6 @@ There are three parts to the Callback Quoter Example.
 2) Notifier
 3) Consumer
 
-
 In detail:
 _________
 
@@ -59,8 +56,6 @@ There are 3  parts to it:
 
 ./notifier
 
-
-
 2) shell 2: type at the command prompt:
 
 ./consumer
@@ -71,8 +66,6 @@ Now wait for information to arrive.
 
 You can  unregister by typing 'u' and quit by typing 'q'.
 
-
-
 3) shell 3: type at the command prompt:
 
 ./supplier -ifilename
@@ -94,8 +87,6 @@ There are 3  parts to it:
 
 ./notifier -fior_file -s
 
-
-
 2) shell 2: type at the command prompt:
 
 ./consumer -fior_file -s
@@ -106,8 +97,6 @@ Now wait for information to arrive.
 
 You can  unregister by typing 'u' and quit by typing 'q'.
 
-
-
 3) shell 3: type at the command prompt:
 
 ./supplier -ifilename -fior_file -s
diff --git a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
index 23ec944277b..b984aa94fc7 100644
--- a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
@@ -6,14 +6,11 @@
  */
 //=============================================================================
 
-
 #include "ace/ACE.h"
-
 #include "Supplier_Timer_Handler.h"
 
 // The supplier refernce is got so that the mathods in the supplier
 // can be accessed.
-
 Supplier_Timer_Handler:: Supplier_Timer_Handler (Supplier *supplier,
                                                  ACE_Reactor *reactor,
                                                  FILE *file_ptr)
@@ -21,23 +18,13 @@ Supplier_Timer_Handler:: Supplier_Timer_Handler (Supplier *supplier,
      reactor_ (reactor),
      file_ptr_ (file_ptr)
 {
-  // No-op.
-}
-
-// Destructor.
-
- Supplier_Timer_Handler::~Supplier_Timer_Handler (void)
-{
-  // No-op.
 }
 
 // Method which will be called by the reactor on timeout.
-
 int
 Supplier_Timer_Handler:: handle_timeout (const ACE_Time_Value & /* tv */,
                                          const void * /* arg */)
 {
-
   ACE_DEBUG ((LM_DEBUG,
               "Sending Stock Market Information to Notifier...\n"));
 
@@ -62,9 +49,8 @@ Supplier_Timer_Handler:: handle_timeout (const ACE_Time_Value & /* tv */,
 }
 
 // Get the stock information from a file.
-
 int
-Supplier_Timer_Handler::get_stock_information (void)
+Supplier_Timer_Handler::get_stock_information ()
 {
   // Scan the file and obtain the stock information.
   if (fscanf (file_ptr_,
@@ -85,4 +71,3 @@ Supplier_Timer_Handler::get_stock_information (void)
       return -1;
     }
 }
-
diff --git a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h
index 8d20adf09fa..913815fb0c1 100644
--- a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef SUPPLIER_TIMER_HANDLER_H
 #define SUPPLIER_TIMER_HANDLER_H
 #include "ace/Reactor.h"
@@ -36,22 +35,20 @@ class Supplier;
 class Supplier_Timer_Handler : public ACE_Event_Handler
 {
 public:
-  /// Initilization.
+  /// Initialization.
   Supplier_Timer_Handler (Supplier *supplier,
                           ACE_Reactor *reactor,
                           FILE *file_ptr);
 
   /// Destructor.
-  ~Supplier_Timer_Handler (void);
+  ~Supplier_Timer_Handler () = default;
 
   /// Method which will be called by the Reactor when timeout occurs.
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg = 0);
+  int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0) override;
 
 private:
-
   /// The values of the stock and its rate are got from the file.
-  int get_stock_information (void);
+  int get_stock_information ();
 
   /// The supplier instance.
   Supplier *supplier_obj_;
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 7e48e7d3af4..97b4b7ae79f 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #include "Supplier_i.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
@@ -20,8 +19,7 @@
 #include "ace/OS_NS_fcntl.h"
 
 // Constructor.
-
-Supplier::Supplier (void)
+Supplier::Supplier ()
   : ior_ (0),
     use_naming_service_ (1),
     notifier_ (),
@@ -29,10 +27,9 @@ Supplier::Supplier (void)
     loop_count_ (10),
     period_value_ (1)
 {
-  // No-op.
 }
 
-Supplier::~Supplier (void)
+Supplier::~Supplier ()
 {
   // Release the memory allocated for ior_.
   ACE_OS::free (this->ior_);
@@ -45,7 +42,6 @@ Supplier::~Supplier (void)
 }
 
 // Reads the Server factory IOR from a file.
-
 int
 Supplier::read_ior (ACE_TCHAR *filename)
 {
@@ -75,9 +71,8 @@ Supplier::read_ior (ACE_TCHAR *filename)
 }
 
 // Parses the command line arguments and returns an error status.
-
 int
-Supplier::parse_args (void)
+Supplier::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:f:i:xk:xs"));
 
@@ -142,15 +137,11 @@ Supplier::parse_args (void)
 }
 
 // Give the stock status information to the Notifier.
-
 int
-Supplier::send_market_status (const char *stock_name,
-                              long value)
+Supplier::send_market_status (const char *stock_name, long value)
 {
-
   try
     {
-
       // Make the RMI.
       this->notifier_->market_status (stock_name,
                                       value);
@@ -171,11 +162,9 @@ Supplier::send_market_status (const char *stock_name,
 }
 
 // Execute client example code.
-
 int
-Supplier::run (void)
+Supplier::run ()
 {
-
   long timer_id = 0;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -199,11 +188,9 @@ Supplier::run (void)
   return this->reactor_used ()->run_reactor_event_loop ();
 }
 
-
 int
-Supplier::via_naming_service (void)
+Supplier::via_naming_service ()
 {
-
   try
     {
       // Initialization of the naming service.
@@ -241,7 +228,6 @@ Supplier::via_naming_service (void)
 }
 
 // Init function.
-
 int
 Supplier::init (int argc, ACE_TCHAR **argv)
 {
@@ -305,7 +291,6 @@ Supplier::reactor_used () const
 }
 
 // The stock market information is read from a file.
-
 int
 Supplier::read_file (ACE_TCHAR *filename)
 {
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h
index 3af4b7fefe1..69a37aed83a 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.h
+++ b/TAO/examples/Callback_Quoter/Supplier_i.h
@@ -37,13 +37,13 @@ class Supplier
 {
 public:
   /// Constructor.
-  Supplier (void);
+  Supplier ();
 
   /// Destructor.
-  ~Supplier (void);
+  ~Supplier ();
 
   /// Execute  the daemon.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with Notifier.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -52,11 +52,11 @@ public:
   int send_market_status (const char *stock_name,
                           long value);
 
+private:
   /// The timer handler used to send the market status to the notifier
   /// periodically.
-  Supplier_Timer_Handler *supplier_timer_handler_;
+  Supplier_Timer_Handler *supplier_timer_handler_ {};
 
-private:
   /// Remember our orb.
   CORBA::ORB_var orb_;
 
@@ -64,11 +64,11 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// This method initialises the naming service and registers the
   /// object with the POA.
-  int via_naming_service(void);
+  int via_naming_service();
 
   /// returns the TAO instance of the singleton Reactor.
    ACE_Reactor *reactor_used () const;
diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp
index d270936307c..b286500b79f 100644
--- a/TAO/examples/Callback_Quoter/consumer.cpp
+++ b/TAO/examples/Callback_Quoter/consumer.cpp
@@ -1,7 +1,6 @@
 #include "Consumer_Handler.h"
 
 // This function runs the Callback Quoter Consumer application.
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index dde220c305c..27f9be21919 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -1,14 +1,12 @@
 #include "Notifier_Input_Handler.h"
 
 // This is the main driver program for the Callback Quoter Notifier.
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Notifier_Input_Handler notifier;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tNotifier\n\n"));
+  ACE_DEBUG ((LM_DEBUG, "\n\tNotifier\n\n"));
 
   try
     {
diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp
index e4149bc9027..38391f529dd 100644
--- a/TAO/examples/Callback_Quoter/supplier.cpp
+++ b/TAO/examples/Callback_Quoter/supplier.cpp
@@ -1,7 +1,6 @@
 #include "Supplier_i.h"
 
 // This function runs the Callback Quoter Supplier daemon.
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index ef4f4883e4a..05cb15b5bc7 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -6,7 +6,6 @@
 #include "Content_Iterator_i.h"
 
 
-
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULongLong file_size)
   : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)),
@@ -17,7 +16,7 @@ Content_Iterator_i::Content_Iterator_i (const char *pathname,
   // Nothing else
 }
 
-Content_Iterator_i::~Content_Iterator_i (void)
+Content_Iterator_i::~Content_Iterator_i ()
 {
   (void) this->file_io_.close ();
 }
@@ -102,7 +101,7 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 }
 
 void
-Content_Iterator_i::destroy (void)
+Content_Iterator_i::destroy ()
 {
   (void) this->file_io_.close ();
 
@@ -122,7 +121,7 @@ Content_Iterator_i::destroy (void)
 }
 
 int
-Content_Iterator_i::init (void)
+Content_Iterator_i::init ()
 {
   // Open the requested file.
   ACE_FILE_Connector connector;
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index cae2d5192ea..8224a10bf50 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -38,12 +38,11 @@ class Content_Iterator_i :
 
   friend class Iterator_Factory_i;
 public:
-
   /// Constructor
   Content_Iterator_i (const char *filename, CORBA::ULongLong file_size);
 
   /// Destructor
-  ~Content_Iterator_i (void);
+  ~Content_Iterator_i ();
 
   /// This operation returns the next <chunk> of the file starting at
   /// <offset>.  If there are no more bindings, false is returned.
@@ -51,15 +50,13 @@ public:
                                      Web_Server::Chunk_Type_out chunk);
 
   /// Destroy the iterator.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
-
   /// Initialize the Content_Iterator.
-  int init (void);
+  int init ();
 
 private:
-
   /// The Addr representing the requested file.
   ACE_FILE_Addr file_;
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
index 3e5850ceba1..5d405cb6a89 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
@@ -38,7 +38,6 @@ class Content_Iterator_i;
 class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory
 {
 public:
-
   /**
    * This factory method returns a <Content_Iterator> that can be used
    * to read the <contents> associated with <pathname> one ``chunk''
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 33476782525..398e56f31ae 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-Iterator_Handler::Iterator_Handler (void)
+Iterator_Handler::Iterator_Handler ()
   : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)),
     file_io_ (),
     contents_ (),
@@ -20,7 +20,7 @@ Iterator_Handler::Iterator_Handler (void)
   // Nothing else
 }
 
-Iterator_Handler::~Iterator_Handler (void)
+Iterator_Handler::~Iterator_Handler ()
 {
   (void) this->file_io_.close ();
 }
@@ -49,7 +49,6 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
 
       this->contents_->sendc_next_chunk (this->ami_handler_.in (),
                                          this->offset_);
-
     }
   else
     {
@@ -69,7 +68,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
     }
 }
 void
-Iterator_Handler::destroy (void)
+Iterator_Handler::destroy ()
 {
   // Deactivate this reply handler.
   this->deactivate ();
@@ -126,7 +125,7 @@ Iterator_Handler::initialize_content_iterator
 }
 
 void
-Iterator_Handler::deactivate (void)
+Iterator_Handler::deactivate ()
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa =
@@ -208,7 +207,7 @@ Iterator_Handler::get_viewer (char *viewer,
 }
 
 int
-Iterator_Handler::spawn_viewer (void)
+Iterator_Handler::spawn_viewer ()
 {
   char viewer[BUFSIZ];
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index ee4c911dd0e..0818d41e4a7 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -41,10 +41,9 @@ class Iterator_Handler
   friend class Iterator_Handler_Friend;
 
 public:
-
   /// Constructor that creates a content iterator corresponding to the
   /// name of the file being retrieved from the web server.
-  Iterator_Handler (void);
+  Iterator_Handler ();
 
   virtual void next_chunk (CORBA::Boolean pending_data,
                    const Web_Server::Chunk_Type & chunk);
@@ -53,7 +52,7 @@ public:
       ::Messaging::ExceptionHolder *)
     {}
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void destroy_excep (
       ::Messaging::ExceptionHolder *)
@@ -72,24 +71,23 @@ public:
 private:
   /// Destructor (private to ensure that Iterator_Handler is allocated
   /// on the heap).
-  ~Iterator_Handler (void);
+  ~Iterator_Handler ();
 
   /// Initialize the Content Iterator used to retrieve the file.
   void initialize_content_iterator (const char *pathname,
                                     Web_Server::Iterator_Factory_ptr factory);
 
   /// Deactivate this reply handler.
-  void deactivate (void);
+  void deactivate ();
 
   /// Get the name of the viewer associated with the file being
   /// retrieved.
   int get_viewer (char *viewer, size_t length);
 
   /// Spawn an external view to display the retrieved file.
-  int spawn_viewer (void);
+  int spawn_viewer ();
 
 private:
-
   /// The Addr corresponding to the retrieved file.
   ACE_FILE_Addr file_;
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 2688d83ebf3..643fa24c04e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -18,13 +18,13 @@ Callback_Handler::Callback_Handler (const char *pathname,
   // Nothing else
 }
 
-Callback_Handler::~Callback_Handler (void)
+Callback_Handler::~Callback_Handler ()
 {
   // Nothing else
 }
 
 void
-Callback_Handler::next_chunk (void)
+Callback_Handler::next_chunk ()
 {
   if (this->last_chunk_ == 1)
     {
@@ -97,7 +97,7 @@ Callback_Handler::next_chunk_excep
 }
 
 void
-Callback_Handler::run (void)
+Callback_Handler::run ()
 {
   // Open the file to be downloaded
   this->open_file ();
@@ -112,7 +112,7 @@ Callback_Handler::run (void)
 }
 
 void
-Callback_Handler::open_file (void)
+Callback_Handler::open_file ()
 {
   // Create a temporary file to store the retrieved data.
   ACE_FILE_Connector connector;
@@ -128,7 +128,7 @@ Callback_Handler::open_file (void)
 }
 
 void
-Callback_Handler::deactivate (void)
+Callback_Handler::deactivate ()
 {
   // Close the file that was sent to the client.
   (void) this->file_io_.close ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index 82de8dd4bcf..7166c1fc5cb 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -72,7 +72,7 @@ public:
                     Web_Server::Callback_ptr callback);
 
   /// The callback for this reply handler.
-  virtual void next_chunk (void);
+  virtual void next_chunk ();
 
   virtual void next_chunk_excep (::Messaging::ExceptionHolder *);
 
@@ -82,21 +82,20 @@ public:
    * incremented when file retrieval begins, and decremented when file
    * retrieval completes.
    */
-  void run (void);
+  void run ();
 
 private:
   /// Destructor (private to ensure that Callback_Handler is allocated
   /// on the heap).
-  ~Callback_Handler (void);
+  ~Callback_Handler ();
 
   /// Open the file to be uploaded to the client callback.
-  void open_file (void);
+  void open_file ();
 
   /// Deactivate this reply handler.
-  void deactivate (void);
+  void deactivate ();
 
 private:
-
   /// The Addr corresponding to the retrieved file.
   ACE_FILE_Addr file_;
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 1741f68d52e..8cf23b7d6e7 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -36,7 +36,7 @@ Callback_i::Callback_i (int *request_count)
     (*this->request_count_)++;
 }
 
-Callback_i::~Callback_i (void)
+Callback_i::~Callback_i ()
 {
   (void) this->file_io_.close ();
 }
@@ -133,7 +133,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
 }
 
 int
-Callback_i::metadata_received (void)
+Callback_i::metadata_received ()
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
@@ -144,7 +144,7 @@ Callback_i::metadata_received (void)
 }
 
 int
-Callback_i::content_received (void)
+Callback_i::content_received ()
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
@@ -221,7 +221,7 @@ Callback_i::get_viewer (char *viewer,
 }
 
 int
-Callback_i::spawn_viewer (void)
+Callback_i::spawn_viewer ()
 {
   char viewer[BUFSIZ];
 
@@ -264,7 +264,7 @@ Callback_i::spawn_viewer (void)
 }
 
 void
-Callback_i::deactivate (void)
+Callback_i::deactivate ()
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
index b1022a1757d..4ea944f7467 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -63,32 +63,29 @@ public:
   void metadata (const Web_Server::Metadata_Type &metadata);
 
 private:
-
   /// Destructor must be private to ensure that this object is
   /// allocated on the heap.
-  ~Callback_i (void);
+  ~Callback_i ();
 
   /// Returns one if the metadata was received, and zero otherwise.
-  int metadata_received (void);
+  int metadata_received ();
 
   /// Returns one if the entire content was received, and zero
   /// otherwise.
-  int content_received (void);
+  int content_received ();
 
   /// Get the name of the viewer associated with the file being
   /// retrieved.
   int get_viewer (char *viewer, size_t length);
 
   /// Spawn an external view to display the retrieved file.
-  int spawn_viewer (void);
+  int spawn_viewer ();
 
 private:
-
   /// Deactivate this Callback servant.
-  void deactivate (void);
+  void deactivate ();
 
 private:
-
   /// The Addr corresponding to the retrieved file.
   ACE_FILE_Addr file_;
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index ad1b852321c..54be9932254 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -6,7 +6,7 @@
 #include "Push_Iterator_Handler.h"
 #include "Callback_i.h"
 
-Push_Iterator_Handler::Push_Iterator_Handler (void)
+Push_Iterator_Handler::Push_Iterator_Handler ()
   : callback_servant_ (0),
     callback_ (),
     ami_handler_ ()
@@ -14,7 +14,7 @@ Push_Iterator_Handler::Push_Iterator_Handler (void)
   // Nothing else
 }
 
-Push_Iterator_Handler::~Push_Iterator_Handler (void)
+Push_Iterator_Handler::~Push_Iterator_Handler ()
 {
   // Nothing else
 }
@@ -56,7 +56,7 @@ Push_Iterator_Handler::run (int *request_count,
 }
 
 void
-Push_Iterator_Handler::deactivate (void)
+Push_Iterator_Handler::deactivate ()
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index ec5f4048be8..5f5ba8cf76e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -52,7 +52,7 @@ class Push_Iterator_Handler
 public:
   /// Constructor that creates a content iterator corresponding to the
   /// name of the file being retrieved from the web server.
-  Push_Iterator_Handler (void);
+  Push_Iterator_Handler ();
 
   /**
    * Activate and run this Reply Handler.  The contents (not the
@@ -65,10 +65,9 @@ public:
             Web_Server::Iterator_Factory_ptr factory);
 
 private:
-
   /// Destructor  (private to ensure that Iterator_Handler is allocated
   /// on the heap).
-  ~Push_Iterator_Handler (void);
+  ~Push_Iterator_Handler ();
 
   /// AMI callback that is invoked when a response from the
   /// corresponding server method is received.
@@ -80,7 +79,7 @@ private:
     {}
 
   /// Deactivate this handler.
-  void deactivate (void);
+  void deactivate ();
 
 private:
   /// The servant that accepts data pushed from the content server.
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 83f06289214..1b43df34587 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -15,7 +15,7 @@ Content_Iterator_i::Content_Iterator_i (const char *pathname,
   // Nothing else
 }
 
-Content_Iterator_i::~Content_Iterator_i (void)
+Content_Iterator_i::~Content_Iterator_i ()
 {
   (void) this->file_io_.close ();
 }
@@ -110,9 +110,8 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 }
 
 void
-Content_Iterator_i::destroy (void)
+Content_Iterator_i::destroy ()
 {
-
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
@@ -129,7 +128,7 @@ Content_Iterator_i::destroy (void)
 }
 
 int
-Content_Iterator_i::init (void)
+Content_Iterator_i::init ()
 {
   // Open the requested file.
   ACE_FILE_Connector connector;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index cae2d5192ea..8224a10bf50 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -38,12 +38,11 @@ class Content_Iterator_i :
 
   friend class Iterator_Factory_i;
 public:
-
   /// Constructor
   Content_Iterator_i (const char *filename, CORBA::ULongLong file_size);
 
   /// Destructor
-  ~Content_Iterator_i (void);
+  ~Content_Iterator_i ();
 
   /// This operation returns the next <chunk> of the file starting at
   /// <offset>.  If there are no more bindings, false is returned.
@@ -51,15 +50,13 @@ public:
                                      Web_Server::Chunk_Type_out chunk);
 
   /// Destroy the iterator.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
-
   /// Initialize the Content_Iterator.
-  int init (void);
+  int init ();
 
 private:
-
   /// The Addr representing the requested file.
   ACE_FILE_Addr file_;
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
index 612f5b7d018..ef8c33db108 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
@@ -38,9 +38,7 @@ class Content_Iterator_i;
  */
 class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory
 {
-
 public:
-
   /**
    * This factory method returns a <Content_Iterator> that can be used
    * to read the <contents> associated with <pathname> one ``chunk''
@@ -58,7 +56,6 @@ public:
   /// Set the type of file content in the metadata structure.
   int content_type (const char *filename,
                     Web_Server::Metadata_Type_out metadata);
-
 };
 
 
diff --git a/TAO/examples/DeveloperGuideExamples.txt b/TAO/examples/DeveloperGuideExamples.txt
index a58d3ebdc69..e565730d980 100644
--- a/TAO/examples/DeveloperGuideExamples.txt
+++ b/TAO/examples/DeveloperGuideExamples.txt
@@ -1,5 +1,3 @@
-
-
 The OCI TAO Developer's Guide contains source code for many examples.
 These examples were developed independently by OCI and are tightly
 integrated with the discussion of various topics in the TAO
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index f32b1c1ba03..df271e744ca 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -1,7 +1,7 @@
 #include "Consumer_Handler.h"
 #include "tao/ORB_Core.h"
 
-Consumer_Handler::Consumer_Handler (void)
+Consumer_Handler::Consumer_Handler ()
   : receiver_ (0),
     notifier_ (0),
     shutdowncallback (0)
@@ -9,11 +9,6 @@ Consumer_Handler::Consumer_Handler (void)
   // No-Op.
 }
 
-Consumer_Handler::~Consumer_Handler (void)
-{
-  // No-Op.
-}
-
 int
 Consumer_Handler::init (int argc,
                         ACE_TCHAR *argv[],
@@ -76,7 +71,7 @@ Consumer_Handler::init (int argc,
 }
 
 int
-Consumer_Handler::get_notifier (void)
+Consumer_Handler::get_notifier ()
 {
   try
     {
@@ -109,13 +104,13 @@ Consumer_Handler::get_notifier (void)
 }
 
 void
-Consumer_Handler::close (void)
+Consumer_Handler::close ()
 {
   this->orb_->shutdown ();
 }
 
 void
-Consumer_Handler::shutdown (void)
+Consumer_Handler::shutdown ()
 {
   ACE_ASSERT (this->shutdowncallback != 0);
 
@@ -123,7 +118,7 @@ Consumer_Handler::shutdown (void)
 }
 
 int
-Consumer_Handler::run (void)
+Consumer_Handler::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the Consumer...\n"));
@@ -140,7 +135,7 @@ Consumer_Handler::run (void)
 }
 
 ACE_Reactor*
-Consumer_Handler::reactor(void)
+Consumer_Handler::reactor()
 {
   // @@ Please see if there's a way to get to the Reactor without
   // using the TAO_ORB_Core_instance().
@@ -148,13 +143,13 @@ Consumer_Handler::reactor(void)
 }
 
 Event_Comm::Consumer_ptr
-Consumer_Handler::receiver (void)
+Consumer_Handler::receiver ()
 {
   return this->receiver_.in ();
 }
 
 Event_Comm::Notifier_ptr
-Consumer_Handler::notifier (void)
+Consumer_Handler::notifier ()
 {
   return this->notifier_.in ();
 }
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index eaed47f1ffc..71e5acd405d 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Handler.h
@@ -32,35 +32,35 @@ class Consumer_Handler
 {
 public:
   /// Constructor.
-  Consumer_Handler (void);
+  Consumer_Handler ();
 
   /// Destructor.
- virtual ~Consumer_Handler (void);
+ virtual ~Consumer_Handler () = default;
 
   /// Initializes the ORB, gets the Notifier reference from the Naming
   /// Service, and starts the servant for the Consumer object.
   int init (int argc, ACE_TCHAR *argv[], ShutdownCallback *_shutdowncallback);
 
   /// runs the ORB.
-  int run (void);
+  int run ();
 
   /// shutdown the orb.
-  void close (void);
+  void close ();
 
   /// called to shutdown the consumer application.
-  void shutdown (void);
+  void shutdown ();
 
   // = Accessors
-  Event_Comm::Consumer *receiver (void);
-  Event_Comm::Notifier *notifier (void);
+  Event_Comm::Consumer *receiver ();
+  Event_Comm::Notifier *notifier ();
 
   /// returns the ORB's reactor.
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
 private:
   /// gets the notifier reference from the naming service.
   /// returns 0 on success, -1 on error.
-  int get_notifier (void);
+  int get_notifier ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 4a6a49ee4a2..d20b3ce6fa1 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -3,20 +3,15 @@
 
 #include "tao/ORB_Core.h"
 
-Consumer_Input_Handler::Consumer_Input_Handler (void)
+Consumer_Input_Handler::Consumer_Input_Handler ()
   : receiver_handler_ (0),
     consumer_initiated_shutdown_ (0)
 {
   // No-Op.
 }
 
-Consumer_Input_Handler::~Consumer_Input_Handler (void)
-{
-  // No-Op.
-}
-
 int
-Consumer_Input_Handler::consumer_initiated_shutdown (void)
+Consumer_Input_Handler::consumer_initiated_shutdown ()
 {
   return this->consumer_initiated_shutdown_;
 }
@@ -28,7 +23,7 @@ Consumer_Input_Handler::consumer_initiated_shutdown (int c)
 }
 
 int
-Consumer_Input_Handler::close (void)
+Consumer_Input_Handler::close ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "closing down Consumer::Input_Handler\n"));
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.h b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
index 2a5f599d21f..b8a91aea145 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
@@ -37,10 +37,10 @@ class Consumer_Input_Handler : public ACE_Event_Handler
 public:
   // Initialization and termination methods.
   /// Constructor.
-  Consumer_Input_Handler(void);
+  Consumer_Input_Handler();
 
   /// Destructor.
-  ~Consumer_Input_Handler (void);
+  ~Consumer_Input_Handler () = default;
 
   /// registers the input event handler.
   /// returns 0 on success, -1 on error.
@@ -50,10 +50,10 @@ public:
   virtual int handle_input (ACE_HANDLE);
 
   /// Close down the handler.
-  int close (void);
+  int close ();
 
   /// Report whether the Consumer initiated the shutdown.
-  int consumer_initiated_shutdown (void);
+  int consumer_initiated_shutdown ();
 
   /// Indicate that the Consumer initiated the shutdown.
   void consumer_initiated_shutdown (int);
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 1f251648a07..befc7c1d7bc 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -12,19 +12,19 @@ public:
                   const char *filtering_criteria);
   // Constructor.
 
-  ~Consumer_Entry (void);
+  ~Consumer_Entry ();
   // Descriptor.
 
   // = Set/get filtering criteria.
   void criteria (const char *criteria);
-  const char *criteria (void);
+  const char *criteria ();
 
   // = Set/get Event_Comm::Consumer object reference.
-  Event_Comm::Consumer *consumer (void);
+  Event_Comm::Consumer *consumer ();
   void consumer (Event_Comm::Consumer *);
 
   // = Set/get the compiled regular expression buffer.
-  const char *regexp (void);
+  const char *regexp ();
   void regexp (char *);
 
 private:
@@ -50,7 +50,7 @@ Consumer_Entry::criteria (const char *criteria)
 }
 
 const char *
-Consumer_Entry::criteria (void)
+Consumer_Entry::criteria ()
 {
   return this->filtering_criteria_;
 }
@@ -58,7 +58,7 @@ Consumer_Entry::criteria (void)
 // = Set/get Event_Comm::Consumer object reference.
 
 Event_Comm::Consumer *
-Consumer_Entry::consumer (void)
+Consumer_Entry::consumer ()
 {
   return this->consumer_;
 }
@@ -70,7 +70,7 @@ Consumer_Entry::consumer (Event_Comm::Consumer *consumer)
 }
 
 const char *
-Consumer_Entry::regexp (void)
+Consumer_Entry::regexp ()
 {
   return this->compiled_regexp_;
 }
@@ -121,7 +121,7 @@ Consumer_Entry::Consumer_Entry (Event_Comm::Consumer *consumer,
   this->consumer_ = Event_Comm::Consumer::_duplicate (this->consumer_);
 }
 
-Consumer_Entry::~Consumer_Entry (void)
+Consumer_Entry::~Consumer_Entry ()
 {
   ACE_OS::free ((void *) this->filtering_criteria_);
   ACE_OS::free ((void *) this->compiled_regexp_);
@@ -373,20 +373,20 @@ Notifier_i::push (const Event_Comm::Event &event)
 
 // -------------
 
-ShutdownCallback::~ShutdownCallback (void)
+ShutdownCallback::~ShutdownCallback ()
 {
 }
 
 // -------------
 
 //FUZZ: disable check_for_lack_ACE_OS
-Consumer_i::Consumer_i (void)
+Consumer_i::Consumer_i ()
   : shutdown (0)
 {
 }
 //FUZZ: enable check_for_lack_ACE_OS
 
-Consumer_i::~Consumer_i (void)
+Consumer_i::~Consumer_i ()
 {
 }
 
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index 14ae32a1fa5..19037ec172c 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
  *  @file    Event_Comm_i.h
@@ -11,7 +9,6 @@
  */
 //=============================================================================
 
-
 #ifndef _EVENT_COMM_I_H
 #define _EVENT_COMM_I_H
 
@@ -36,10 +33,10 @@ class ShutdownCallback
 {
 public:
   /// Destructor.
-  virtual ~ShutdownCallback (void);
+  virtual ~ShutdownCallback ();
 
   /// This method is to be called to shutdown the application.
-  virtual void close (void) = 0;
+  virtual void close () = 0;
 };
 
 /**
@@ -51,21 +48,20 @@ class Consumer_i : public POA_Event_Comm::Consumer
 {
 public:
   /// Constructor.
-  Consumer_i (void);
+  Consumer_i ();
 
   /// Destructor.
-  ~Consumer_i (void);
+  ~Consumer_i ();
 
-  /// set the <ACE_Reactor> to use when quitting.
+  /// set the ACE_Reactor to use when quitting.
   void set_reactor (ACE_Reactor *reactor);
 
-  /// Pass the <event> to the <Consumer>.
+  /// Pass the q event to the <Consumer>.
   virtual void push (const Event_Comm::Event & event);
 
-  virtual void disconnect (const char * reason);
-
   // Disconnect the <Consumer> from the <Notifier>, giving it the
-  // <reason>.
+  // @a reason.
+  virtual void disconnect (const char * reason);
 
   /// Set the Shutdown callback.
   void set (ShutdownCallback *_shutdown);
@@ -95,21 +91,21 @@ public:
   /// Initialize a Notifier_i object with the specified size hint.
   Notifier_i (size_t size_hint = Notifier_i::DEFAULT_SIZE);
 
-  /// Disconnect all the receivers, giving them the <reason>.
+  /// Disconnect all the receivers, giving them the @a reason.
   virtual void disconnect (const char *reason);
 
-  /// Send the <event> to all the consumers who have subscribed and who
+  /// Send the @a event to all the consumers who have subscribed and who
   /// match the filtering criteria.
   virtual void push (const Event_Comm::Event &event);
 
-  /// Subscribe the <Consumer> to receive events that match
-  /// <filtering_criteria> applied by the <Notifier>.
-   virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
-                           const char * filtering_criteria);
+  /// Subscribe the @a consumer to receive events that match
+  /// @a filtering_criteria applied by the <Notifier>.
+  virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
+                          const char * filtering_criteria);
 
-  /// Unsubscribe the <Consumer>.
+  /// Unsubscribe the @a Consumer.
  void unsubscribe (Event_Comm::Consumer *consumer,
-                    const char *filtering_criteria);
+                   const char *filtering_criteria);
 
 private:
   typedef ACE_Map_Manager <Event_Comm::Consumer_ptr, Consumer_Entry *, ACE_Null_Mutex>
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 8fcf3d4b7e8..eb4ed104bcf 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -1,20 +1,8 @@
 #include "Notifier_Handler.h"
 #include "tao/ORB_Core.h"
 
-Notifier_Handler::Notifier_Handler (void)
-{
-  // No-Op.
-}
-
-// Destroy a Notifier target object.
-
-Notifier_Handler::~Notifier_Handler (void)
-{
-  // No-Op.
-}
-
 int
-Notifier_Handler::close (void)
+Notifier_Handler::close ()
 {
   if (this->notifier_ != 0)
     {
@@ -30,7 +18,7 @@ Notifier_Handler::close (void)
 }
 
 void
-Notifier_Handler::shutdown (void)
+Notifier_Handler::shutdown ()
 {
   ACE_ASSERT (this->shutdowncallback != 0);
 
@@ -38,7 +26,7 @@ Notifier_Handler::shutdown (void)
 }
 
 int
-Notifier_Handler::run (void)
+Notifier_Handler::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the Supplier...\n"));
@@ -48,7 +36,7 @@ Notifier_Handler::run (void)
 }
 
 ACE_Reactor*
-Notifier_Handler::reactor(void)
+Notifier_Handler::reactor()
 {
   // @@ Please see if there's a way to get to the Reactor without
   // using the TAO_ORB_Core_instance().
@@ -56,7 +44,7 @@ Notifier_Handler::reactor(void)
 }
 
 Event_Comm::Notifier *
-Notifier_Handler::notifier (void)
+Notifier_Handler::notifier ()
 {
   return this->notifier_;
 }
@@ -72,7 +60,6 @@ Notifier_Handler::notifier (Event_Comm::Notifier *notifier)
 }
 
 // Init function.
-
 int
 Notifier_Handler::init (int argc,
                         ACE_TCHAR *argv[],
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h
index d231084f1b3..84d310297e7 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.h
+++ b/TAO/examples/Event_Comm/Notifier_Handler.h
@@ -32,29 +32,29 @@ class Notifier_Handler
 public:
   /// This constructor gets the notifier object from the Naming
   /// Service.
-  Notifier_Handler (void);
+  Notifier_Handler () = default;
 
   /// Destructor.
-  virtual ~Notifier_Handler (void);
+  virtual ~Notifier_Handler () = default;
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR *argv[], ShutdownCallback* _shutdowncallback);
 
   // = Accessors.
-  Event_Comm::Notifier *notifier (void);
+  Event_Comm::Notifier *notifier ();
   void notifier (Event_Comm::Notifier *);
 
   /// runs the ORB.
-  int run (void);
+  int run ();
 
   /// Close down the handler.
-  int close (void);
+  int close ();
 
   /// called to request application shutdown.
-  void shutdown (void);
+  void shutdown ();
 
   /// returns the ORB's reactor.
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
 private:
   /// Remember our orb.
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index ece19d92bfa..74eb3eacffe 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -4,18 +4,18 @@
 #include "tao/ORB_Core.h"
 
 // Constructor.
-Notifier_Server::Notifier_Server (void)
+Notifier_Server::Notifier_Server ()
 {
 }
 
 // Destructor.
 
-Notifier_Server::~Notifier_Server (void)
+Notifier_Server::~Notifier_Server ()
 {
 }
 
 int
-Notifier_Server::close (void)
+Notifier_Server::close ()
 {
   try
     {
@@ -45,7 +45,7 @@ Notifier_Server::close (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Server::init_naming_service (void)
+Notifier_Server::init_naming_service ()
 {
   try
     {
@@ -110,7 +110,7 @@ Notifier_Server::init (int argc,
 }
 
 int
-Notifier_Server::run (void)
+Notifier_Server::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the notifier server...\n"));
@@ -122,7 +122,7 @@ Notifier_Server::run (void)
 }
 
 ACE_Reactor *
-Notifier_Server::reactor (void)
+Notifier_Server::reactor ()
 {
   return TAO_ORB_Core_instance ()->reactor ();
 }
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index 46822e33240..6a1e382a98f 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -27,27 +27,27 @@ class Notifier_Server
 {
 public:
   /// Constructor.
-  Notifier_Server (void);
+  Notifier_Server ();
 
   /// Destructor.
-  ~Notifier_Server (void);
+  ~Notifier_Server ();
 
   /// Initialize the Server state.
  int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Close the naming service.
-  int close (void);
+  int close ();
 
   /// Reactor accessor.
-  ACE_Reactor *reactor(void);
+  ACE_Reactor *reactor();
 
 private:
   /// Initialises the name server and registers the Notifier server
   /// object name with the name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index cef8fb40b2c..18265894ed8 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -9,14 +9,14 @@ Supplier_Input_Handler::Supplier_Input_Handler ()
   // No-Op.
 }
 
-Supplier_Input_Handler::~Supplier_Input_Handler (void)
+Supplier_Input_Handler::~Supplier_Input_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "closing down Supplier_Input_Handler::~Supplier_Input_Handler\n"));
 }
 
 int
-Supplier_Input_Handler::close (void)
+Supplier_Input_Handler::close ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "closing down Supplier::Supplier_Input_Handler\n"));
@@ -84,7 +84,6 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
     }
 
 
-
   if (ACE_OS::strncmp (buf, "quit", 4) == 0)
     // Tell the main event loop to shutdown.
     this->notifier_->shutdown ();
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.h b/TAO/examples/Event_Comm/Supplier_Input_Handler.h
index b18d79a4e75..344c03f81ff 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.h
@@ -36,10 +36,10 @@ class Supplier_Input_Handler : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Supplier_Input_Handler (void);
+  Supplier_Input_Handler ();
 
   /// Destructor.
-  ~Supplier_Input_Handler (void);
+  ~Supplier_Input_Handler ();
 
   /// Initialization.
   int initialize (Notifier_Handler *);
@@ -48,7 +48,7 @@ public:
   virtual int handle_input (ACE_HANDLE);
 
   /// Close down the handler.
-  int close (void);
+  int close ();
 
 protected:
   /// Pointer to a <Notifier_Handler> that's used to inform Consumers
diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp
index 8eb2384e703..d368c5262db 100644
--- a/TAO/examples/Event_Comm/consumer.cpp
+++ b/TAO/examples/Event_Comm/consumer.cpp
@@ -10,20 +10,20 @@
 class Consumer : public ACE_Event_Handler, public ShutdownCallback
 {
 public:
-  Consumer (void);
+  Consumer () = default;
   // Constructor.
 
-  ~Consumer (void);
+  ~Consumer () = default;
   // Destructor.
 
   int initialize (int argc, ACE_TCHAR *argv[]);
   // Initialization method.
 
-  int run (void);
+  int run ();
   // Execute the consumer;
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual void close (void);
+  virtual void close ();
   // Shutdown the consumer.
   //FUZZ: enable check_for_lack_ACE_OS
 
@@ -38,16 +38,6 @@ private:
   // Handler for CORBA Consumer.
 };
 
-Consumer::Consumer (void)
-{
-  // No-Op.
-}
-
-Consumer::~Consumer (void)
-{
-  // No-Op.
-}
-
 int
 Consumer::handle_signal (int signum,
                          siginfo_t *,
@@ -66,7 +56,7 @@ Consumer::handle_signal (int signum,
 }
 
 void
-Consumer::close (void)
+Consumer::close ()
 {
   // clean up the input handler.
   ih_.close ();
@@ -75,7 +65,7 @@ Consumer::close (void)
 }
 
 int
-Consumer::run (void)
+Consumer::run ()
 {
   // Run the <Consumer_Handler>'s ORB.
   return ch_.run ();
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index 7596f378a0f..6dff921e6f5 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -14,7 +14,7 @@ Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 void
-Notifier::run (void)
+Notifier::run ()
 {
   try
     {
@@ -45,7 +45,7 @@ Notifier::Notifier (int argc, ACE_TCHAR *argv[])
                 "register_handler"));
 }
 
-Notifier::~Notifier (void)
+Notifier::~Notifier ()
 {
   // Cleanup.
   this->ns_.close ();
diff --git a/TAO/examples/Event_Comm/notifier.h b/TAO/examples/Event_Comm/notifier.h
index 009cc015967..46d15aca84b 100644
--- a/TAO/examples/Event_Comm/notifier.h
+++ b/TAO/examples/Event_Comm/notifier.h
@@ -20,10 +20,10 @@ class Notifier : public ACE_Event_Handler
   Notifier (int argc, ACE_TCHAR *argv[]);
 
   /// Destructor.
-  ~Notifier (void);
+  ~Notifier ();
 
   /// Execute the notifier.
-  void run (void);
+  void run ();
 
  private:
   /// Handle signals that shut us down.
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index a6dd1cb8cac..3e99cd2a8f1 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -2,16 +2,6 @@
 #include "Supplier_Input_Handler.h"
 #include "supplier.h"
 
-Supplier::Supplier (void)
-{
-  // No-Op.
-}
-
-Supplier::~Supplier (void)
-{
-  // No-Op.
-}
-
 int
 Supplier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 {
@@ -24,7 +14,7 @@ Supplier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 void
-Supplier::run (void)
+Supplier::run ()
 {
   if (nh_.run () == -1)
     ACE_ERROR ((LM_ERROR,
@@ -33,7 +23,7 @@ Supplier::run (void)
 }
 
 void
-Supplier::close (void)
+Supplier::close ()
 {
   ih_.close ();
   nh_.close ();
@@ -70,7 +60,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   try
     {
-
       if (supplier.init (argc, argv) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                           "%p\n",
diff --git a/TAO/examples/Event_Comm/supplier.h b/TAO/examples/Event_Comm/supplier.h
index 7260496811a..feaa231c36c 100644
--- a/TAO/examples/Event_Comm/supplier.h
+++ b/TAO/examples/Event_Comm/supplier.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    supplier.h
@@ -8,8 +6,6 @@
  */
 //=============================================================================
 
-
-
 /**
  * @class Supplier
  *
@@ -23,19 +19,19 @@ class Supplier : public ACE_Event_Handler, public ShutdownCallback
 public:
   // Initialization and Termination methods.
   /// Constructor.
-  Supplier (void);
+  Supplier () = default;
 
   /// Destructor.
-  ~Supplier (void);
+  ~Supplier () = default;
 
   /// Initialization method. returns 0 on success, -1 on error.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Execute the supplier.
-  void run (void);
+  void run ();
 
   /// Shutdown the application.
-  virtual void close (void);
+  virtual void close ();
 
 private:
   /// Handle shutdown signals.
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 688e14eff77..3250eeba1fb 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -13,7 +13,7 @@
 using namespace std;
 
 EDF_Scheduling::SchedulingParameter
-EDF_Sched_Param_Policy::value (void)
+EDF_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -33,7 +33,6 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb,
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-
   Kokyu::DSRT_ConfigInfo config;
 
   config.impl_type_ = this->disp_impl_type_;
@@ -74,12 +73,12 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb,
   codec_ = codec_factory->create_codec (encoding);
 }
 
-EDF_Scheduler::~EDF_Scheduler (void)
+EDF_Scheduler::~EDF_Scheduler ()
 {
 }
 
 void
-EDF_Scheduler::shutdown (void)
+EDF_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   DSUI_EVENT_LOG (EDF_SCHED_FAM, DISPATCHER_SHUTDOWN, 0, 0, 0);
@@ -198,7 +197,6 @@ void
 EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                        const char *)
 {
-
   int int_guid;
   ACE_OS::memcpy (&int_guid,
                   guid.get_buffer (),
@@ -332,7 +330,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param_out*/)
 {
-
   Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
   RTScheduling::Current::IdType guid;
   int int_guid;
@@ -340,7 +337,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
   DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_SERVER_SCHED_TIME, 0, 0, 0);
 
 
-
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered EDF_Scheduler::receive_request\n"));
 #endif
@@ -665,7 +661,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
 void
 EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, 0);
 
 //Otherwise Segmentation fault when oneway call happens.
@@ -680,7 +675,7 @@ EDF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-EDF_Scheduler::scheduling_policies (void)
+EDF_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -692,13 +687,13 @@ EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-EDF_Scheduler::poa_policies (void)
+EDF_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-EDF_Scheduler::scheduling_discipline_name (void)
+EDF_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
index f29d4b42b52..dfd9e9d0a01 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
@@ -48,8 +48,7 @@ public EDF_Scheduling::SchedulingParameterPolicy,
        public ::CORBA::LocalObject
 {
  public:
-
-    EDF_Scheduling::SchedulingParameter value (void);
+    EDF_Scheduling::SchedulingParameter value ();
 
     void value (const EDF_Scheduling::SchedulingParameter & value);
 
@@ -62,19 +61,18 @@ public EDF_Scheduling::Scheduler,
 public ::CORBA::LocalObject
 {
  public:
-
   EDF_Scheduler (CORBA::ORB_ptr orb,
                  Kokyu::DSRT_Dispatcher_Impl_t,
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~EDF_Scheduler (void);
+  ~EDF_Scheduler ();
 
 
   virtual EDF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
@@ -122,13 +120,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index a78ae87523a..e2b8374f601 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -20,7 +20,7 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
 }
 
 FP_Scheduling::SegmentSchedulingParameter
-FP_Segment_Sched_Param_Policy::value (void)
+FP_Segment_Sched_Param_Policy::value ()
 {
   return value_;
 }
@@ -33,7 +33,7 @@ FP_Segment_Sched_Param_Policy::value (
 }
 
 CORBA::Policy_ptr
-FP_Segment_Sched_Param_Policy::copy (void)
+FP_Segment_Sched_Param_Policy::copy ()
 {
   FP_Segment_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
@@ -44,13 +44,13 @@ FP_Segment_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-FP_Segment_Sched_Param_Policy::policy_type (void)
+FP_Segment_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-FP_Segment_Sched_Param_Policy::destroy (void)
+FP_Segment_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -64,7 +64,6 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-
   Kokyu::DSRT_ConfigInfo config;
 
   config.impl_type_ = this->disp_impl_type_;
@@ -103,13 +102,13 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
   codec_ = codec_factory->create_codec (encoding);
 }
 
-Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
+Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler ()
 {
   //  delete kokyu_dispatcher_;
 }
 
 void
-Fixed_Priority_Scheduler::shutdown (void)
+Fixed_Priority_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n"));
@@ -233,7 +232,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
                                                          const char *,
                                                          CORBA::Policy_ptr)
 {
-
 }
 
 
@@ -571,7 +569,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (void)
+Fixed_Priority_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -583,13 +581,13 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (void)
+Fixed_Priority_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (void)
+Fixed_Priority_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
index 173ad5460a1..71d2309ef35 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
@@ -52,7 +52,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
 
      virtual CORBA::Policy_ptr copy ();
 
-     virtual CORBA::PolicyType policy_type (void);
+     virtual CORBA::PolicyType policy_type ();
 
      virtual void destroy ();
 
@@ -65,15 +65,14 @@ public FP_Scheduling::FP_Scheduler,
 public ::CORBA::LocalObject
 {
  public:
-
   Fixed_Priority_Scheduler (CORBA::ORB_ptr orb,
                  Kokyu::DSRT_Dispatcher_Impl_t,
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~Fixed_Priority_Scheduler (void);
+  ~Fixed_Priority_Scheduler ();
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (
@@ -126,13 +125,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index e46604a305c..2e1a8e98a6d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -21,7 +21,7 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
 }
 
 MIF_Scheduling::SchedulingParameter
-MIF_Sched_Param_Policy::value (void)
+MIF_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -33,7 +33,7 @@ MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value)
 }
 
 CORBA::Policy_ptr
-MIF_Sched_Param_Policy::copy (void)
+MIF_Sched_Param_Policy::copy ()
 {
   MIF_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -45,13 +45,13 @@ MIF_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-MIF_Sched_Param_Policy::policy_type (void)
+MIF_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-MIF_Sched_Param_Policy::destroy (void)
+MIF_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -64,7 +64,6 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-
   Kokyu::DSRT_ConfigInfo config;
 
   config.impl_type_ = this->disp_impl_type_;
@@ -102,13 +101,13 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
   codec_ = codec_factory->create_codec (encoding);
 }
 
-MIF_Scheduler::~MIF_Scheduler (void)
+MIF_Scheduler::~MIF_Scheduler ()
 {
   //  delete kokyu_dispatcher_;
 }
 
 void
-MIF_Scheduler::shutdown (void)
+MIF_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n"));
@@ -229,7 +228,6 @@ MIF_Scheduler::end_nested_scheduling_segment (
                    const char *,
                    CORBA::Policy_ptr)
 {
-
 }
 
 
@@ -568,7 +566,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (void)
+MIF_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -580,13 +578,13 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::poa_policies (void)
+MIF_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-MIF_Scheduler::scheduling_discipline_name (void)
+MIF_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
index bbd078cc7ec..987ae99dca6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
@@ -43,13 +43,13 @@ public MIF_Scheduling::SchedulingParameterPolicy,
      MIF_Sched_Param_Policy ();
      MIF_Sched_Param_Policy (const MIF_Sched_Param_Policy &rhs);
 
-    MIF_Scheduling::SchedulingParameter value (void);
+    MIF_Scheduling::SchedulingParameter value ();
 
     void value (const MIF_Scheduling::SchedulingParameter & value);
 
      virtual CORBA::Policy_ptr copy ();
 
-     virtual CORBA::PolicyType policy_type (void);
+     virtual CORBA::PolicyType policy_type ();
 
      virtual void destroy ();
 
@@ -62,19 +62,18 @@ public MIF_Scheduling::Scheduler,
 public ::CORBA::LocalObject
 {
  public:
-
   MIF_Scheduler (CORBA::ORB_ptr orb,
                  Kokyu::DSRT_Dispatcher_Impl_t,
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~MIF_Scheduler (void);
+  ~MIF_Scheduler ();
 
 
   virtual MIF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
@@ -122,13 +121,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 2972bb05325..fe0b50123cc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -21,7 +21,7 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
 }
 
 MUF_Scheduling::SchedulingParameter
-MUF_Sched_Param_Policy::value (void)
+MUF_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -33,7 +33,7 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value)
 }
 
 CORBA::Policy_ptr
-MUF_Sched_Param_Policy::copy (void)
+MUF_Sched_Param_Policy::copy ()
 {
   MUF_Sched_Param_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -45,13 +45,13 @@ MUF_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-MUF_Sched_Param_Policy::policy_type (void)
+MUF_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-MUF_Sched_Param_Policy::destroy (void)
+MUF_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -64,7 +64,6 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-
   Kokyu::DSRT_ConfigInfo config;
 
   config.impl_type_ = this->disp_impl_type_;
@@ -103,12 +102,12 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
   codec_ = codec_factory->create_codec (encoding);
 }
 
-MUF_Scheduler::~MUF_Scheduler (void)
+MUF_Scheduler::~MUF_Scheduler ()
 {
 }
 
 void
-MUF_Scheduler::shutdown (void)
+MUF_Scheduler::shutdown ()
 {
   kokyu_dispatcher_->shutdown ();
   ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n"));
@@ -439,7 +438,6 @@ MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
 void
 MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
   CORBA::String_var operation = ri->operation ();
@@ -618,7 +616,7 @@ MUF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-MUF_Scheduler::scheduling_policies (void)
+MUF_Scheduler::scheduling_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -630,13 +628,13 @@ MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-MUF_Scheduler::poa_policies (void)
+MUF_Scheduler::poa_policies ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 char *
-MUF_Scheduler::scheduling_discipline_name (void)
+MUF_Scheduler::scheduling_discipline_name ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
index 1ef90070061..d493d5d2914 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
@@ -59,13 +59,13 @@ public MUF_Scheduling::SchedulingParameterPolicy,
     MUF_Sched_Param_Policy ();
     MUF_Sched_Param_Policy (const MUF_Sched_Param_Policy &rhs);
 
-    MUF_Scheduling::SchedulingParameter value (void);
+    MUF_Scheduling::SchedulingParameter value ();
 
     void value (const MUF_Scheduling::SchedulingParameter & value);
 
      virtual CORBA::Policy_ptr copy ();
 
-     virtual CORBA::PolicyType policy_type (void);
+     virtual CORBA::PolicyType policy_type ();
 
      virtual void destroy ();
 
@@ -78,19 +78,18 @@ public MUF_Scheduling::Scheduler,
 public ::CORBA::LocalObject
 {
  public:
-
   MUF_Scheduler (CORBA::ORB_ptr orb,
                  Kokyu::DSRT_Dispatcher_Impl_t,
                  int ace_sched_policy,
                  int ace_sched_scope);
 
-  ~MUF_Scheduler (void);
+  ~MUF_Scheduler ();
 
 
   virtual MUF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
@@ -138,13 +137,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index e266b41624e..19fc90711e1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -5,12 +5,12 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
 
-Task_Stats::Task_Stats (void)
+Task_Stats::Task_Stats ()
   : base_time_(0),
     end_time_ (0),
     max_samples_ (0),
@@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->thr_run_time_;
   delete[] this->thr_count_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
index 841c120565f..cf8651bb6de 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
@@ -25,7 +25,7 @@
 class Kokyu_DSRT_Schedulers_Export Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -40,10 +40,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats
 {
  public:
   /// Constructor
-  Task_Stats (void);
+  Task_Stats ();
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
   int init (size_t max_samples);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 4ac44575a48..fec3e6ec1a5 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 (),
@@ -284,7 +283,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   const char * name = 0;
   /*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 857c842cd0d..60dce97a3fe 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(120);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index b018b6d3ff6..3fa1ac61ad8 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
index 7615f7ca6f1..04048f621ae 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
@@ -34,7 +34,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index c71fa10bf11..c58eead7349 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);
@@ -278,7 +277,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   const char * name = 0;
   /*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 810c7326f99..b09e5a3c5d9 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(120);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index a40ae883ebf..f5b08106a04 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
index 7615f7ca6f1..04048f621ae 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
@@ -34,7 +34,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 625164d0927..c550dcc65f4 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;
@@ -348,7 +347,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   const char * name = 0;
   /*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 4e2feec4fd5..e94e379de45 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(120);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index a40ae883ebf..f5b08106a04 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
index 7615f7ca6f1..04048f621ae 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
@@ -34,7 +34,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 208572497ab..0b75abf3404 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -16,7 +16,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-Identity_Client::Identity_Client (void)
+Identity_Client::Identity_Client ()
   : group_factory_ior_ (0),
     number_of_invocations_ (5),
     use_random_ (0)
@@ -90,7 +90,7 @@ Identity_Client::init (int argc,
 }
 
 int
-Identity_Client::run (void)
+Identity_Client::run ()
 {
   ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized\n"));
 
@@ -176,7 +176,7 @@ Identity_Client::run (void)
   return 0;
 }
 
-Identity_Client::~Identity_Client (void)
+Identity_Client::~Identity_Client ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h
index d5b36de150d..5610af49043 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.h
+++ b/TAO/examples/Load_Balancing/Identity_Client.h
@@ -40,18 +40,17 @@
 class Identity_Client
 {
 public:
-
   /// Default constructor.
-  Identity_Client (void);
+  Identity_Client ();
 
   /// Destructor.
-  ~Identity_Client (void);
+  ~Identity_Client ();
 
   /// Initializes <orb_manager_>, and parses commandline arguments.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// See TITLE.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index e6def9c5295..0e0056a4bc5 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -13,7 +13,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Identity_Server::Identity_Server (void)
+Identity_Server::Identity_Server ()
   : group_factory_ior_ (0),
     random_objects_ (5),
     rr_objects_ (5)
@@ -164,7 +164,7 @@ Identity_Server::create_objects (size_t number_of_objects,
 }
 
 int
-Identity_Server::run (void)
+Identity_Server::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Identity_Server: Initialized\n"));
@@ -176,7 +176,7 @@ Identity_Server::run (void)
   return result;
 }
 
-Identity_Server::~Identity_Server (void)
+Identity_Server::~Identity_Server ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index 563c49a45b6..a065ca77cc2 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -34,19 +34,18 @@
 class Identity_Server
 {
 public:
-
   /// Default constructor.
-  Identity_Server (void);
+  Identity_Server ();
 
   /// Destructor.
-  ~Identity_Server (void);
+  ~Identity_Server ();
 
   /// Performs all the initializations necessary before going into the
   /// ORB event loop.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp
index 9c9806b40ca..5f2f897ed70 100644
--- a/TAO/examples/Load_Balancing/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing/Identity_i.cpp
@@ -16,7 +16,7 @@ Identity_i::Identity_i (const char *name)
 {
 }
 
-Identity_i::~Identity_i (void)
+Identity_i::~Identity_i ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h
index 2eba466c8f5..53d7bbf57c3 100644
--- a/TAO/examples/Load_Balancing/Identity_i.h
+++ b/TAO/examples/Load_Balancing/Identity_i.h
@@ -20,18 +20,16 @@ class Identity_i :
   // = TITLE
   //    This class implements Identity.idl interface.
 public:
-
   /// Constructor - initializes the name of this object.
   Identity_i (const char *name);
 
   /// Destructor.
-  ~Identity_i (void);
+  ~Identity_i ();
 
   /// Returns the name of this object.
   virtual void get_name (CORBA::String_out name);
 
 private:
-
   /// Stores the name of this object.
   CORBA::String_var name_;
 };
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index 841f74e9149..66c1861d936 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -11,11 +11,11 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_time.h"
 
-Object_Group_Factory_i::Object_Group_Factory_i (void)
+Object_Group_Factory_i::Object_Group_Factory_i ()
 {
 }
 
-Object_Group_Factory_i::~Object_Group_Factory_i (void)
+Object_Group_Factory_i::~Object_Group_Factory_i ()
 {
 }
 
@@ -157,13 +157,13 @@ Object_Group_Factory_i::list_groups (int random)
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (void)
+Object_Group_Factory_i::round_robin_groups ()
 {
   return list_groups (0);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (void)
+Object_Group_Factory_i::random_groups ()
 {
   return list_groups (1);
 }
@@ -175,7 +175,7 @@ Object_Group_i::Object_Group_i (const char * id,
 {
 }
 
-Object_Group_i::~Object_Group_i (void)
+Object_Group_i::~Object_Group_i ()
 {
   // Need to delete all the items from the member_id_list, to avoid
   // memory leaks.
@@ -188,7 +188,7 @@ Object_Group_i::~Object_Group_i (void)
 }
 
 char *
-Object_Group_i::id (void)
+Object_Group_i::id ()
 {
   return CORBA::string_dup (id_.c_str ());
 }
@@ -264,7 +264,7 @@ Object_Group_i::resolve_with_id (const char * id)
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (void)
+Object_Group_i::members ()
 {
   Load_Balancer::Member_ID_List * list;
 
@@ -291,7 +291,7 @@ Object_Group_i::members (void)
 }
 
 void
-Object_Group_i::destroy (void)
+Object_Group_i::destroy ()
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
@@ -315,12 +315,12 @@ Random_Object_Group::Random_Object_Group (const char *id,
   ACE_OS::srand (static_cast<u_int> (ACE_OS::time ()));
 }
 
-Random_Object_Group::~Random_Object_Group (void)
+Random_Object_Group::~Random_Object_Group ()
 {
 }
 
 void
-Random_Object_Group::destroy (void)
+Random_Object_Group::destroy ()
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
@@ -330,7 +330,7 @@ Random_Object_Group::destroy (void)
 }
 
 CORBA::Object_ptr
-Random_Object_Group::resolve (void)
+Random_Object_Group::resolve ()
 {
   CORBA::Object_var obj;
 
@@ -361,12 +361,12 @@ RR_Object_Group::RR_Object_Group (const char *id,
 {
 }
 
-RR_Object_Group::~RR_Object_Group (void)
+RR_Object_Group::~RR_Object_Group ()
 {
 }
 
 void
-RR_Object_Group::destroy (void)
+RR_Object_Group::destroy ()
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
@@ -376,7 +376,7 @@ RR_Object_Group::destroy (void)
 }
 
 CORBA::Object_ptr
-RR_Object_Group::resolve (void)
+RR_Object_Group::resolve ()
 {
   CORBA::Object_var obj;
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index fd1f91d685c..dafa78778de 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -40,10 +40,10 @@ class  Object_Group_Factory_i :
   //
 public:
   /// Constructor.
-  Object_Group_Factory_i (void);
+  Object_Group_Factory_i ();
 
   /// Destructor.
-  ~Object_Group_Factory_i (void);
+  ~Object_Group_Factory_i ();
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
@@ -78,7 +78,7 @@ public:
    * a sequence of <Group_ID>s of all existing round robin
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * round_robin_groups (void);
+  Load_Balancer::Group_List * round_robin_groups ();
 
   /**
    * Lists all the random <Object_Group>s which were created
@@ -86,7 +86,7 @@ public:
    * a sequence of <Group_ID>s of all existing random
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * random_groups (void);
+  Load_Balancer::Group_List * random_groups ();
 
   // = Implementation detail methods.
 
@@ -152,12 +152,12 @@ public:
                   Object_Group_Factory_i * my_factory);
 
   /// Destructor.
-  ~Object_Group_i (void);
+  ~Object_Group_i ();
 
   // = Load_Balancer::Object_Group idl methods.
 
   /// Get group's id.
-  char * id (void);
+  char * id ();
 
   /**
    * Adds a new <member> to the <Object_Group>.  Note that each
@@ -180,7 +180,7 @@ public:
    * ``round robin.''  If the group contains no members, <no_such_member>
    * exception is thrown.
    */
-  CORBA::Object_ptr resolve (void) = 0;
+  CORBA::Object_ptr resolve () = 0;
 
   /**
    * Returns an object with the specified <Member_ID>.  If this
@@ -190,7 +190,7 @@ public:
   CORBA::Object_ptr resolve_with_id (const char * id);
 
   /// Return a sequence of <Member_ID>s of all of its members.
-  Load_Balancer::Member_ID_List * members (void);
+  Load_Balancer::Member_ID_List * members ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -198,10 +198,9 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 
 protected:
-
   /// Typedefs for ease of use.
   typedef ACE_DLList<ACE_CString> LIST;
   typedef ACE_DLList_Iterator<ACE_CString> ITERATOR;
@@ -249,11 +248,11 @@ public:
                        Object_Group_Factory_i *my_factory);
 
   /// Destructor.
-  ~Random_Object_Group (void);
+  ~Random_Object_Group ();
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "random" load balancing policy.
-  CORBA::Object_ptr resolve (void);
+  CORBA::Object_ptr resolve ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -261,7 +260,7 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 };
 
 /**
@@ -273,13 +272,12 @@ public:
 class RR_Object_Group: public Object_Group_i
 {
 public:
-
   /// Constructor.
   RR_Object_Group (const char *id,
                    Object_Group_Factory_i *my_factory);
 
   /// Destructor.
-  ~RR_Object_Group (void);
+  ~RR_Object_Group ();
 
   /**
    * We need to override the implementation of <unbind> from
@@ -290,7 +288,7 @@ public:
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "round robin" load balancing policy.
-  CORBA::Object_ptr resolve (void);
+  CORBA::Object_ptr resolve ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -298,10 +296,9 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 
 private:
-
   /// Index into the Object_Group_i::member_id_list_: keeps track of
   /// the member_id to return on the next invocation of <resolve>.
   size_t next_;
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index 0cb1fc165ba..f6968916ddf 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -13,7 +13,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Load_Balancing_Service::Load_Balancing_Service (void)
+Load_Balancing_Service::Load_Balancing_Service ()
   : ior_output_file_ (0)
 {
 }
@@ -105,9 +105,8 @@ Load_Balancing_Service::init (int argc,
 }
 
 
-
 int
-Load_Balancing_Service::run (void)
+Load_Balancing_Service::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Load_Balancer: Initialized\n"));
@@ -119,7 +118,7 @@ Load_Balancing_Service::run (void)
   return result;
 }
 
-Load_Balancing_Service::~Load_Balancing_Service (void)
+Load_Balancing_Service::~Load_Balancing_Service ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
index db53e83d4bc..10064e4eb3f 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
@@ -30,19 +30,18 @@
 class Load_Balancing_Service
 {
 public:
-
   /// Default constructor.
-  Load_Balancing_Service (void);
+  Load_Balancing_Service ();
 
   /// Destructor.
-  ~Load_Balancing_Service (void);
+  ~Load_Balancing_Service ();
 
   /// Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   /// arguments, creates a servant ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 282a235b963..76b84686191 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -15,7 +15,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
 
-Identity_Client::Identity_Client (void)
+Identity_Client::Identity_Client ()
   : group_factory_ior_ (0),
     number_of_invocations_ (5),
     use_random_ (0),
@@ -92,7 +92,7 @@ Identity_Client::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-Identity_Client::run (void)
+Identity_Client::run ()
 {
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
@@ -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,13 +207,12 @@ Identity_Client::run (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Invocation  %s\n",
                   identity.in ()));
-
     }
 
   return 0;
 }
 
-Identity_Client::~Identity_Client (void)
+Identity_Client::~Identity_Client ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index 88992c2dae6..98dffd43a45 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
@@ -40,18 +40,17 @@
 class Identity_Client
 {
 public:
-
   /// Default constructor.
-  Identity_Client (void);
+  Identity_Client ();
 
   /// Destructor.
-  ~Identity_Client (void);
+  ~Identity_Client ();
 
   /// Initializes <orb_manager_>, and parses commandline arguments.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// See TITLE.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index e6a4069813d..ace0fe75317 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -4,7 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Identity_Server::Identity_Server (void)
+Identity_Server::Identity_Server ()
   : group_factory_ior_ (0),
     random_objects_ (5),
     rr_objects_ (5)
@@ -99,11 +99,8 @@ Identity_Server::init (int argc,
 }
 
 int
-Identity_Server::register_groups (void)
+Identity_Server::register_groups ()
 {
-
-
-
   // Contact the <Object_Group_Factory> to create 2
   // <Object_Group>s, one random and one rr.
   CORBA::ORB_var orb = orb_manager_.orb ();
@@ -217,12 +214,11 @@ Identity_Server::create_objects (size_t number_of_objects,
 
       // Bind the servant in the random <Object_Group>.
       group->bind (member);
-
     }
 }
 
 int
- Identity_Server::run (void)
+ Identity_Server::run ()
 {
   int result;
 
@@ -231,7 +227,7 @@ int
   return result;
 }
 
-Identity_Server::~Identity_Server (void)
+Identity_Server::~Identity_Server ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index 7711e40f516..1ee2731d507 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -34,12 +34,11 @@
 class Identity_Server
 {
 public:
-
   /// Default constructor.
-  Identity_Server (void);
+  Identity_Server ();
 
   /// Destructor.
-  ~Identity_Server (void);
+  ~Identity_Server ();
 
   /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -48,15 +47,13 @@ public:
   /// ORB event loop.
   int init (int argc, ACE_TCHAR *argv[]);
 
-  int register_groups (void);
+  int register_groups ();
 
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
-
-
   /**
    * Creates the specified number of identity objects, and registers
    * each one with the provided <Object_Group>.  Identity servants are
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index 10be44939a2..c1e8c37dd2e 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -18,7 +18,7 @@ Identity_i::Identity_i (const char *name,
 {
 }
 
-Identity_i::~Identity_i (void)
+Identity_i::~Identity_i ()
 {
 }
 
@@ -29,7 +29,7 @@ Identity_i::get_name (CORBA::String_out name)
 }
 
 PortableServer::POA_ptr
-Identity_i::_default_POA (void)
+Identity_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index cf6a0008667..d9b538bd63a 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
@@ -20,23 +20,21 @@ class Identity_i :
   // = TITLE
   //    This class implements Identity.idl interface.
 public:
-
   /// Constructor - initializes the name of this object.
   Identity_i (const char *name,
               PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~Identity_i (void);
+  ~Identity_i ();
 
   /// Returns the name of this object.
   virtual void get_name (CORBA::String_out name);
 
   /// Method for the POA that will return the persistent POA_ptr stored
   /// in here..
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
-
   /// Stores the name of this object.
   CORBA::String_var name_;
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 24294b84f8a..787623fdf51 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -32,13 +32,13 @@ Object_Group_Factory_i::Object_Group_Factory_i (CORBA::ORB_ptr orb,
                       &options));
 }
 
-Object_Group_Factory_i::~Object_Group_Factory_i (void)
+Object_Group_Factory_i::~Object_Group_Factory_i ()
 {
   delete this->mem_pool_;
 }
 
 PortableServer::POA_ptr
-Object_Group_Factory_i::_default_POA (void)
+Object_Group_Factory_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -47,7 +47,6 @@ Object_Group_Factory_i::_default_POA (void)
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_round_robin (const char * id)
 {
-
   void *tmp_rr (0);
 
   if (this->mem_pool_->find (rr_name_bind,
@@ -121,7 +120,6 @@ Object_Group_Factory_i::unbind_round_robin (const char * id)
 
   // Bump down the flags value
   --this->flags_;
-
 }
 
 Load_Balancer::Object_Group_ptr
@@ -229,7 +227,6 @@ Object_Group_Factory_i::make_group (int random,
     }
 
 
-
   // As we are sure that it is not in the list go ahead and insert it
   if (random)
     ACE_NEW_THROW_EX (group_servant,
@@ -285,7 +282,6 @@ Object_Group_Factory_i::make_group (int random,
     }
 
 
-
   // Update the value of flags_
   this->update_flags (random);
 
@@ -295,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.
@@ -308,9 +303,6 @@ Object_Group_Factory_i::make_group (int random,
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::resolve (const char * id)
 {
-
-
-
 #if defined (DOORS_MEASURE_STATS)
   // Time the calls
   // Record the entry  time.
@@ -357,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);
-
         }
     }
 
@@ -389,7 +380,6 @@ Object_Group_Factory_i::resolve (const char * id)
     object_group = Load_Balancer::Object_Group::_narrow (objref.in ());
 
 
-
 #if defined (DOORS_MEASURE_STATS)
   // Grab timestamp again.
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -448,13 +438,13 @@ Object_Group_Factory_i::list_groups (int random)
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (void)
+Object_Group_Factory_i::round_robin_groups ()
 {
   return list_groups (0);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (void)
+Object_Group_Factory_i::random_groups ()
 {
   return list_groups (1);
 }
@@ -506,12 +496,11 @@ Object_Group_Factory_i::update_flags (int random)
       if (!random)
         *(this->flags_) = 3;
       break;
-
     }
 }
 
 void
-Object_Group_Factory_i::update_objects (void)
+Object_Group_Factory_i::update_objects ()
 {
   // Create an appropriate servant.
   Object_Group_i * group_servant = 0;
@@ -563,7 +552,6 @@ Object_Group_i::Object_Group_i (const char * id,
    id_ (id),
    allocator_ (0)
 {
-
   if (!this->allocator_)
     {
       ACE_MMAP_Memory_Pool::OPTIONS options (ACE_DEFAULT_BASE_ADDR);
@@ -575,7 +563,7 @@ Object_Group_i::Object_Group_i (const char * id,
 }
 
 
-Object_Group_i::~Object_Group_i (void)
+Object_Group_i::~Object_Group_i ()
 {
   // Need to delete all the items from the member_id_list, to avoid
   // memory leaks.
@@ -591,14 +579,14 @@ Object_Group_i::~Object_Group_i (void)
 
 
 PortableServer::POA_ptr
-Object_Group_i::_default_POA (void)
+Object_Group_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 
 char *
-Object_Group_i::id (void)
+Object_Group_i::id ()
 {
   return CORBA::string_dup (id_.c_str ());
 }
@@ -606,7 +594,6 @@ Object_Group_i::id (void)
 void
 Object_Group_i::bind (const Load_Balancer::Member & member)
 {
-
   if (this->members_ == 0)
     {
       ACE_CString id = this->id ();
@@ -634,7 +621,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member)
             {
               ACE_ERROR ((LM_ERROR,
                           "Unable to bind\n"));
-
             }
         }
     }
@@ -756,7 +742,6 @@ Object_Group_i::unbind (const char * id)
     }
 
 
-
   Object_Group_i::ITERATOR iter (*(this->member_id_list_));
 
   while (ACE_OS::strcmp (id,*(iter.next ())))
@@ -780,11 +765,10 @@ Object_Group_i::resolve_with_id (const char * id)
   char *retn_ptr = CORBA::string_dup (ior.in ());
 
   return retn_ptr;
-
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (void)
+Object_Group_i::members ()
 {
   Load_Balancer::Member_ID_List * list = 0;
 
@@ -815,7 +799,7 @@ Object_Group_i::members (void)
 }
 
 void
-Object_Group_i::destroy (void)
+Object_Group_i::destroy ()
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
@@ -828,7 +812,7 @@ Object_Group_i::destroy (void)
 }
 
 void
-Object_Group_i::read_from_memory (void)
+Object_Group_i::read_from_memory ()
 {
     // Sanity check needs to be done in all the places
   ACE_CString id = this->id ();
@@ -883,9 +867,8 @@ Random_Object_Group::Random_Object_Group (const char *id,
 }
 
 char *
-Random_Object_Group::resolve (void)
+Random_Object_Group::resolve ()
 {
-
   this->read_from_memory ();
 
   size_t group_size = this->members_->current_size ();
@@ -919,7 +902,7 @@ RR_Object_Group::RR_Object_Group (const char *id,
 }
 
 char *
-RR_Object_Group::resolve (void)
+RR_Object_Group::resolve ()
 {
   char *objref = 0;
 
@@ -953,7 +936,6 @@ RR_Object_Group::resolve (void)
 void
 RR_Object_Group::unbind (const char *id)
 {
-
   if (this->members_ == 0)
     {
       ACE_CString id = this->id ();
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index cd60a1a87f7..76defd00883 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -53,12 +53,12 @@ public:
                           PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~Object_Group_Factory_i (void);
+  ~Object_Group_Factory_i ();
 
 
   /// Method for the POA that will return the persistent POA_ptr stored
   /// in here..
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
@@ -98,7 +98,7 @@ public:
    * a sequence of <Group_ID>s of all existing round robin
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * round_robin_groups (void);
+  Load_Balancer::Group_List * round_robin_groups ();
 
   /**
    * Lists all the random <Object_Group>s which were created
@@ -106,10 +106,9 @@ public:
    * a sequence of <Group_ID>s of all existing random
    * <Object_Group>s created by this factory.
    */
-  Load_Balancer::Group_List * random_groups (void);
+  Load_Balancer::Group_List * random_groups ();
 
 private:
-
   /// Our ORB
   CORBA::ORB_var orb_;
 
@@ -139,7 +138,7 @@ private:
 
   /// This rolls back the status of the objects in the POA if the
   /// service had failed..
-  void update_objects (void);
+  void update_objects ();
 
   /// Map containing all random <Object_Group>s created by this factory.
   HASH_MAP *random_groups_;
@@ -163,7 +162,6 @@ private:
   CORBA::Short *flags_;
 
   ACE_Throughput_Stats throughput_;
-
 };
 
 class Object_Group_i
@@ -187,16 +185,16 @@ public:
                   PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~Object_Group_i (void);
+  ~Object_Group_i ();
 
   // Persistent POA
   // Method for the POA
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   // = Load_Balancer::Object_Group idl methods.
 
   /// Get group's id.
-  char * id (void);
+  char * id ();
 
   /**
    * Adds a new <member> to the <Object_Group>.  Note that each
@@ -219,7 +217,7 @@ public:
    * ``round robin.''  If the group contains no members, <no_such_member>
    * exception is thrown.
    */
-  char * resolve (void) = 0;
+  char * resolve () = 0;
 
   /**
    * Returns an object with the specified <Member_ID>.  If this
@@ -229,7 +227,7 @@ public:
   char * resolve_with_id (const char * id);
 
   /// Return a sequence of <Member_ID>s of all of its members.
-  Load_Balancer::Member_ID_List * members (void);
+  Load_Balancer::Member_ID_List * members ();
 
   /**
    * Cleanup the resources associated with this <Object_Group>.
@@ -237,13 +235,12 @@ public:
    * <id> should become available.  <Object_Group_Factory>
    * should no longer list this <Object_Group>.
    */
-  void destroy (void);
+  void destroy ();
 
 protected:
-
   /// This will replenish all the pointers that could have been lost
   /// because of failure
-  void read_from_memory (void);
+  void read_from_memory ();
 
   /// Our POA
   PortableServer::POA_var poa_;
@@ -288,8 +285,7 @@ public:
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "random" load balancing policy.
-  char * resolve (void);
-
+  char * resolve ();
 };
 
 /**
@@ -301,7 +297,6 @@ public:
 class RR_Object_Group: public Object_Group_i
 {
 public:
-
   /// Constructor.
   RR_Object_Group (const char *id,
                    PortableServer::POA_ptr poa);
@@ -315,10 +310,9 @@ public:
 
   /// Returns a member object from this <Object_Group> in accordance with
   /// the "round robin" load balancing policy.
-  char * resolve (void);
+  char * resolve ();
 
 private:
-
   /// Index into the Object_Group_i::member_id_list_: keeps track of
   /// the member_id to return on the next invocation of <resolve>.
   size_t next_;
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index f22a46aea6a..f758ba10873 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -13,7 +13,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Load_Balancing_Service::Load_Balancing_Service (void)
+Load_Balancing_Service::Load_Balancing_Service ()
   : ior_output_file_ (0)
 {
 }
@@ -135,9 +135,8 @@ Load_Balancing_Service::init (int argc, ACE_TCHAR* argv[])
 }
 
 
-
 int
-Load_Balancing_Service::run (void)
+Load_Balancing_Service::run ()
 {
   int result;
 
@@ -146,7 +145,7 @@ Load_Balancing_Service::run (void)
   return result;
 }
 
-Load_Balancing_Service::~Load_Balancing_Service (void)
+Load_Balancing_Service::~Load_Balancing_Service ()
 {
 }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index e4a86a12397..b5c84935631 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -30,19 +30,18 @@
 class Load_Balancing_Service
 {
 public:
-
   /// Default constructor.
-  Load_Balancing_Service (void);
+  Load_Balancing_Service ();
 
   /// Destructor.
-  ~Load_Balancing_Service (void);
+  ~Load_Balancing_Service ();
 
   /// Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   /// arguments, creates a servant ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 765a792642e..c5157ae2c99 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -6,11 +6,11 @@
 #include "ace/Log_Record.h"
 #include "ace/os_include/os_netdb.h"
 
-Logger_Factory_i::Logger_Factory_i (void)
+Logger_Factory_i::Logger_Factory_i ()
 {
 }
 
-Logger_Factory_i::~Logger_Factory_i (void)
+Logger_Factory_i::~Logger_Factory_i ()
 {
 }
 
@@ -68,7 +68,7 @@ Logger_i::Logger_i (const char *name)
   // Do nothing
 }
 
-Logger_i::~Logger_i (void)
+Logger_i::~Logger_i ()
 {
   ACE_OS::free (this->name_);
 }
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index 2b94f5ab540..3bb8414a11e 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -31,7 +31,7 @@ public:
   Logger_i (const char* name);
 
   /// destructor
-  virtual ~Logger_i (void);
+  virtual ~Logger_i ();
 
   /// Writes the <log_rec> to the standard output.
   virtual void log (const Logger::Log_Record &log_rec);
@@ -82,10 +82,10 @@ class Logger_Factory_i : public virtual POA_Logger_Factory
 {
 public:
   /// Constructor.
-  Logger_Factory_i (void);
+  Logger_Factory_i ();
 
   /// Destructor.
-  ~Logger_Factory_i (void);
+  ~Logger_Factory_i ();
 
   /**
    * This function returns a logger with name <name>. If <name> is
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 01068f6bfab..537c81cde11 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -1,14 +1,14 @@
 #include "Logging_Service_i.h"
 #include "tao/debug.h"
 
-Logger_Server::Logger_Server (void)
+Logger_Server::Logger_Server ()
   :service_name_ (ACE_TEXT("LoggingService"))
 {
   // Do nothing
 }
 
 int
-Logger_Server::parse_args (void)
+Logger_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:"));
   int c;
@@ -112,7 +112,7 @@ Logger_Server::init_naming_service ()
 }
 
 int
-Logger_Server::run (void)
+Logger_Server::run ()
 {
   int ret = this->orb_manager_.run ();
   if (ret == -1)
@@ -122,7 +122,7 @@ Logger_Server::run (void)
   return 0;
 }
 
-Logger_Server::~Logger_Server (void)
+Logger_Server::~Logger_Server ()
 {
   // Do nothing
 }
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index 72aec50c78e..f5b07aab74f 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -43,17 +43,17 @@ class Logger_Server
 {
 public:
   /// Constructor.
-  Logger_Server (void);
+  Logger_Server ();
 
   /// Destructor.
-  ~Logger_Server (void);
+  ~Logger_Server ();
 
   /// Initialize the Logger_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// This function creates and returns a logger with the given <name>.
   /// Currently, <name> is unused.
@@ -61,11 +61,11 @@ public:
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Initialises the name server and registers logger_factory with the
   /// name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp
index 83fe0565eb7..d85983cd541 100644
--- a/TAO/examples/Logging/Logging_Test.cpp
+++ b/TAO/examples/Logging/Logging_Test.cpp
@@ -13,5 +13,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return 1;
 
   return logger_client.run ();
-
 }
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index 865adcf7d55..60597175a72 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -10,13 +10,13 @@
 #include "ace/OS_NS_sys_time.h"
 
   // Constructor
-  Logger_Client::Logger_Client (void)
+  Logger_Client::Logger_Client ()
 {
   // Do nothing
 }
 
 // Destructor
-Logger_Client::~Logger_Client (void)
+Logger_Client::~Logger_Client ()
 {
   // Do nothing
 }
@@ -67,11 +67,10 @@ Logger_Client::init (int argc, ACE_TCHAR *argv[])
     }
 
   return 0;
-
 }
 
 int
-Logger_Client::init_naming_service (void)
+Logger_Client::init_naming_service ()
 {
   // Initialize the naming services
   if (my_name_client_.init (orb_.in ()) != 0)
@@ -125,7 +124,7 @@ Logger_Client::init_naming_service (void)
 }
 
 int
-Logger_Client::init_loggers (void)
+Logger_Client::init_loggers ()
 {
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
@@ -175,7 +174,7 @@ Logger_Client::init_loggers (void)
 // Execute client example code.
 
 int
-Logger_Client::run (void)
+Logger_Client::run ()
 {
   try
     {
@@ -262,7 +261,7 @@ Logger_Client::run (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Logger_Client::parse_args (void)
+Logger_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d"));
   int c;
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 4ea1d598921..e151e38c9b4 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -41,20 +41,20 @@ class Logger_Client
 {
 public:
   /// Constructor.
-  Logger_Client (void);
+  Logger_Client ();
 
   /// Destructor.
-  ~Logger_Client (void);
+  ~Logger_Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Prepares the <Log_Record> for logging.
   void init_record (Logger::Log_Record &newrec,
@@ -62,10 +62,10 @@ private:
                     const char *msg);
 
   /// Initialises the name server and resolves the logger_factory
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Instantiates the 2 logger member variables
-  int init_loggers (void);
+  int init_loggers ();
 
   /// Shows contents of the record (for debugging purposes).
   void show_record (Logger::Log_Record &newrec);
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 8c2475d30d2..f760acfdf4c 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -13,21 +13,21 @@
 // Constructor.
 
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
     : ior_output_file_ (0)
 {
 }
 
 // Destructor.
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
@@ -124,7 +124,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
     // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -136,7 +136,7 @@ Server<Servant>::run (void)
 }
 
 template <class Servant> int
-Server<Servant>::register_name (void)
+Server<Servant>::register_name ()
 {
   return -1;
 }
@@ -144,7 +144,7 @@ Server<Servant>::register_name (void)
 // Constructor.
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
+Client<InterfaceObj, Var>::Client ()
   : ior_ (0)
 {
   //no-op
@@ -183,7 +183,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
+Client<InterfaceObj, Var>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x"));
   int c = 0;
@@ -216,7 +216,7 @@ Client<InterfaceObj, Var>::parse_args (void)
 }
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
+Client<InterfaceObj, Var>::~Client ()
 {
   ACE_OS::free (this->ior_);
 }
@@ -230,7 +230,6 @@ Client<InterfaceObj, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-
   try
     {
       // Retrieve the ORB.
@@ -259,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)
     {
@@ -274,9 +271,8 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (void)
+Client<InterfaceObj, Var>::obtain_initial_references ()
 {
-
   return 0;
 }
 
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 856ed38c13b..30b9d2fe8ee 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -35,10 +35,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -48,10 +48,10 @@ public:
 
   /// After calling <init>, this method will register the server with
   /// the TAO Naming Service using the servant_name passed to <init>.
-  int register_name (void);
+  int register_name ();
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 protected:
   /// Servant class
@@ -61,7 +61,7 @@ protected:
   const char *name;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
@@ -94,10 +94,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
@@ -112,14 +112,14 @@ public:
   void shutdown (int);
 
   /// Initialize naming service
-  int obtain_initial_references (void);
+  int obtain_initial_references ();
 
 protected:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
 //  TAO_Naming_Client namingClient;
   // helper class for getting access to Naming Service.
@@ -147,7 +147,6 @@ protected:
 
   /// Flag for shutting down the server
   int shutdown_;
-
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index 008cfcda06e..54ee02013ee 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)
     {
@@ -89,13 +88,13 @@ Checkpoint_Client_i::run (const char *name,
 }
 
 // Constructor.
-Checkpoint_Client_i::Checkpoint_Client_i (void)
+Checkpoint_Client_i::Checkpoint_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Checkpoint_Client_i::~Checkpoint_Client_i (void)
+Checkpoint_Client_i::~Checkpoint_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h
index 31663db5ee6..0be2eeffcfa 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.h
+++ b/TAO/examples/OBV/Typed_Events/Client_i.h
@@ -33,10 +33,10 @@ class Checkpoint_Client_i
 {
 public:
   /// Constructor
-  Checkpoint_Client_i (void);
+  Checkpoint_Client_i ();
 
   /// Destructor
-  virtual  ~Checkpoint_Client_i (void);
+  virtual  ~Checkpoint_Client_i ();
 
   /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 7ce46031ad8..a52f9f7530a 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -17,7 +17,7 @@ Event_impl::~Event_impl ()
 }
 
 ::CORBA::ValueBase *
-Event_impl::_copy_value (void)
+Event_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -25,7 +25,7 @@ Event_impl::_copy_value (void)
 }
 
 void
-Event_impl::do_print (void)
+Event_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
              (CORBA::ULong) this->time_(),
@@ -38,7 +38,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (void)
+Event_factory::create_for_unmarshal ()
 {
   return new Event_impl;
 }
@@ -60,7 +60,7 @@ Temperature_impl::~Temperature_impl ()
 }
 
 ::CORBA::ValueBase *
-Temperature_impl::_copy_value (void)
+Temperature_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -68,7 +68,7 @@ Temperature_impl::_copy_value (void)
 }
 
 void
-Temperature_impl::do_print (void)
+Temperature_impl::do_print ()
 {
   // The timestamp
   Event_impl::do_print ();
@@ -81,7 +81,7 @@ Temperature_factory::~Temperature_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Temperature)
-Temperature_factory::create_for_unmarshal (void)
+Temperature_factory::create_for_unmarshal ()
 {
   return new Temperature_impl;
 }
@@ -103,7 +103,7 @@ Position_impl::~Position_impl ()
 }
 
 ::CORBA::ValueBase *
-Position_impl::_copy_value (void)
+Position_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -111,7 +111,7 @@ Position_impl::_copy_value (void)
 }
 
 void
-Position_impl::do_print (void)
+Position_impl::do_print ()
 {
   // The timestamp
   Event_impl::do_print ();
@@ -126,7 +126,7 @@ Position_impl::do_print (void)
              x, y, z));
 }
 
-CORBA::Float Position_impl::x (void)
+CORBA::Float Position_impl::x ()
 {
   return this->xyz()[0];
 }
@@ -136,7 +136,7 @@ void Position_impl::x (CORBA::Float x)
   this->xyz()[0] = x;
 }
 
-CORBA::Float Position_impl::y (void)
+CORBA::Float Position_impl::y ()
 {
   return this->xyz()[1];
 }
@@ -146,7 +146,7 @@ void Position_impl::y (CORBA::Float y)
   this->xyz()[1] = y;
 }
 
-CORBA::Float Position_impl::z (void)
+CORBA::Float Position_impl::z ()
 {
   return this->xyz()[2];
 }
@@ -161,7 +161,7 @@ Position_factory::~Position_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Position)
-Position_factory::create_for_unmarshal (void)
+Position_factory::create_for_unmarshal ()
 {
   return new Position_impl;
 }
@@ -183,7 +183,7 @@ Log_Msg_impl::~Log_Msg_impl ()
 }
 
 ::CORBA::ValueBase *
-Log_Msg_impl::_copy_value (void)
+Log_Msg_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -191,7 +191,7 @@ Log_Msg_impl::_copy_value (void)
 }
 
 void
-Log_Msg_impl::do_print (void)
+Log_Msg_impl::do_print ()
 {
   // The timestamp
   Event_impl::do_print ();
@@ -211,7 +211,7 @@ Log_Msg_factory::~Log_Msg_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)
-Log_Msg_factory::create_for_unmarshal (void)
+Log_Msg_factory::create_for_unmarshal ()
 {
   return new Log_Msg_impl;
 }
@@ -240,7 +240,7 @@ Event_List_Link_impl::~Event_List_Link_impl ()
 }
 
 ::CORBA::ValueBase *
-Event_List_Link_impl::_copy_value (void)
+Event_List_Link_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -248,13 +248,13 @@ Event_List_Link_impl::_copy_value (void)
 }
 
 Event*
-Event_List_Link_impl::get_event (void)
+Event_List_Link_impl::get_event ()
 {
   return this->my_event ();
 }
 
 Event_List_Link*
-Event_List_Link_impl::get_next_link (void)
+Event_List_Link_impl::get_next_link ()
 {
   return this->next ();
 }
@@ -270,26 +270,26 @@ Event_List_Link_factory::~Event_List_Link_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)
-Event_List_Link_factory::create_for_unmarshal (void)
+Event_List_Link_factory::create_for_unmarshal ()
 {
   return new Event_List_Link_impl;
 }
 
 // Event_List implementation  ===================================
 
-Event_List_impl::Event_List_impl (void)
+Event_List_impl::Event_List_impl ()
 {
   this->first_link (0);
   this->last_link_cache_ = 0;
 }
 
-Event_List_impl::~Event_List_impl (void)
+Event_List_impl::~Event_List_impl ()
 {
   // Destructor does nothing explicit, because the _var types do care.
 }
 
 ::CORBA::ValueBase *
-Event_List_impl::_copy_value (void)
+Event_List_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -337,12 +337,12 @@ Event_List_impl::store_event (Event* e)
     }
 }
 
-Event_List_factory::~Event_List_factory (void)
+Event_List_factory::~Event_List_factory ()
 {
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event_List)
-Event_List_factory::create_for_unmarshal (void)
+Event_List_factory::create_for_unmarshal ()
 {
   return new Event_List_impl;
 }
@@ -352,12 +352,12 @@ Event_List_Iterator::Event_List_Iterator (Event_List *list)
   this->init (list);
 }
 
-Event_List_Iterator::Event_List_Iterator (void)
+Event_List_Iterator::Event_List_Iterator ()
 {
   // current_ is a _var and set itself to null.
 }
 
-Event_List_Iterator::~Event_List_Iterator (void)
+Event_List_Iterator::~Event_List_Iterator ()
 {
   // nothing
 }
@@ -428,7 +428,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
 }
 
 ::CORBA::ValueBase *
-Temperature_Criterion_impl::_copy_value (void)
+Temperature_Criterion_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -452,7 +452,7 @@ Temperature_Criterion_impl::is_critical (Event* e)
 }
 
 void
-Temperature_Criterion_impl::do_print (void)
+Temperature_Criterion_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
              this->origin_id_ () ));
@@ -464,7 +464,7 @@ Temperature_Criterion_factory::~Temperature_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion)
-Temperature_Criterion_factory::create_for_unmarshal (void)
+Temperature_Criterion_factory::create_for_unmarshal ()
 {
   return new Temperature_Criterion_impl;
 }
@@ -487,7 +487,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
 }
 
 ::CORBA::ValueBase *
-Position_Criterion_impl::_copy_value (void)
+Position_Criterion_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -529,7 +529,7 @@ Position_Criterion_factory::~Position_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)
-Position_Criterion_factory::create_for_unmarshal (void)
+Position_Criterion_factory::create_for_unmarshal ()
 {
   return new Position_Criterion_impl;
 }
@@ -543,7 +543,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
 }
 
 ::CORBA::ValueBase *
-Log_Msg_Criterion_impl::_copy_value (void)
+Log_Msg_Criterion_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
@@ -564,7 +564,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e)
 }
 
 void
-Log_Msg_Criterion_impl::do_print (void)
+Log_Msg_Criterion_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG,
              "All log messages with urgency greater zero are registered.\n" ));
@@ -575,7 +575,7 @@ Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)
-Log_Msg_Criterion_factory::create_for_unmarshal (void)
+Log_Msg_Criterion_factory::create_for_unmarshal ()
 {
   return new Log_Msg_Criterion_impl;
 }
@@ -596,7 +596,7 @@ Criterion_List_impl::~Criterion_List_impl ()
 }
 
 ::CORBA::ValueBase *
-Criterion_List_impl::_copy_value (void)
+Criterion_List_impl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 93657769e99..3f9b7213a56 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -48,9 +48,9 @@ class Event_impl : public virtual OBV_Event,
  public:
   Event_impl ();
   virtual ~Event_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual void do_print (void);
+  virtual void do_print ();
   // Implementation of the do_print () operation the valuetype should have.
   // All operations in valuetypes are virtual.
 
@@ -85,7 +85,7 @@ protected:
   virtual ~Event_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal ();
 };
 #endif /* is not defined */
 
@@ -119,9 +119,9 @@ public:
   // But it is more simple to do so here.
 
   virtual ~Temperature_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual void do_print (void);
+  virtual void do_print ();
   // Overrides Event_impl::do_print (). Note that a new declaration
   // in IDL in a derived class is not allowed.
 };
@@ -137,7 +137,7 @@ protected:
   virtual ~Temperature_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal ();
 };
 
 // Position implementation classes =====================================
@@ -149,17 +149,17 @@ public:
   Position_impl ();
   Position_impl (Point &p);
   virtual ~Position_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual CORBA::Float x (void);
+  virtual CORBA::Float x ();
   virtual void x (CORBA::Float);
-  virtual CORBA::Float y (void);
+  virtual CORBA::Float y ();
   virtual void y (CORBA::Float);
-  virtual CORBA::Float z (void);
+  virtual CORBA::Float z ();
   virtual void z (CORBA::Float);
   //These are the attributes
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Position_factory : public CORBA::ValueFactoryBase
@@ -173,7 +173,7 @@ protected:
   virtual ~Position_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal ();
 };
 
 // Log_Msg implementation classes =====================================
@@ -185,9 +185,9 @@ public:
   Log_Msg_impl ();
   Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
   virtual ~Log_Msg_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Log_Msg_factory : public CORBA::ValueFactoryBase
@@ -201,7 +201,7 @@ protected:
   virtual ~Log_Msg_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal ();
 };
 
 // Event_List_Link implementation classes =====================================
@@ -220,12 +220,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
   Event_List_Link_impl ();
   Event_List_Link_impl (Event *e);
   virtual ~Event_List_Link_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
-  Event *get_event (void);
+  Event *get_event ();
 
  private:
-  Event_List_Link *get_next_link (void);
+  Event_List_Link *get_next_link ();
 
   void attach_next_link (Event_List_Link * chain);
   // Attach a chain at the end.
@@ -239,7 +239,7 @@ protected:
   virtual ~Event_List_Link_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal ();
 };
 
 // The event list itself.   ----------------------------------
@@ -252,11 +252,11 @@ class Event_List_impl : public virtual OBV_Event_List,
  public:
   Event_List_impl ();
   virtual ~Event_List_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   void store_event (Event* e);
 
-  Event_List_Link *get_first_link(void);
+  Event_List_Link *get_first_link();
   // The iterator needs it.
 
  private:
@@ -280,13 +280,13 @@ protected:
   virtual ~Event_List_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal ();
 };
 
 class Event_List_Iterator
 {
  public:
-  Event_List_Iterator (void);
+  Event_List_Iterator ();
   Event_List_Iterator (Event_List *list);
   // Construct it to point to the first list link.
 
@@ -328,11 +328,11 @@ public:
   Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp);
 
   virtual ~Temperature_Criterion_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
@@ -341,7 +341,7 @@ class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
 
 private:
   virtual ~Temperature_Criterion_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal ();
 };
 
 class Position_Criterion_impl :
@@ -355,11 +355,11 @@ public:
                            Position *lb,
                            Position *tr);
   virtual ~Position_Criterion_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Position_Criterion_factory : public CORBA::ValueFactoryBase
@@ -370,7 +370,7 @@ protected:
   virtual ~Position_Criterion_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal ();
 };
 
 class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion,
@@ -380,11 +380,11 @@ class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion,
 public:
   Log_Msg_Criterion_impl ();
   virtual ~Log_Msg_Criterion_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (void);
+  virtual void do_print ();
 };
 
 class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase
@@ -395,7 +395,7 @@ protected:
   virtual ~Log_Msg_Criterion_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal ();
 };
 
 class Criterion_List_impl : public virtual OBV_Criterion_List,
@@ -404,7 +404,7 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
  public:
   Criterion_List_impl ();
   virtual ~Criterion_List_impl ();
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   void store_criterion (Criterion *c);
   CORBA::Boolean is_critical (Event *e);
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 2cdd221fc7b..b9bf7e3de68 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -9,7 +9,6 @@ Criterion_List_var criterions;
 // Arriving events are tested against the list members.
 
 
-
 // Set the ORB pointer, register OBV factories and init the
 // lists declared above.
 
@@ -120,7 +119,6 @@ Checkpoint_i::put_event (Event *event)
     }
 
 
-
   // If we want to return the event (e.g. return type is Event *)
   // return (DUP_REF (event));
   // should be right.
@@ -130,7 +128,7 @@ Checkpoint_i::put_event (Event *event)
 
 
 Event_List *
-Checkpoint_i::get_critical_events (void)
+Checkpoint_i::get_critical_events ()
 {
   // The skeleton should not steal our list by decrementing
   // the reference counter.
@@ -146,7 +144,7 @@ Checkpoint_i::get_critical_events (void)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (void)
+Checkpoint_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nThe Checkpoint server is shutting down\n"));
@@ -158,12 +156,12 @@ Checkpoint_i::shutdown (void)
 
 // Constructor.
 
-Checkpoint_i::Checkpoint_i (void)
+Checkpoint_i::Checkpoint_i ()
 {
 }
 
 // Destructor.
 
-Checkpoint_i::~Checkpoint_i (void)
+Checkpoint_i::~Checkpoint_i ()
 {
 }
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index 01ee4d8fdb3..f433bc1e191 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -21,10 +21,10 @@ class Checkpoint_i : public POA_Checkpoint
 {
 public:
   /// Constructor.
-  Checkpoint_i (void);
+  Checkpoint_i ();
 
   /// Destructor.
-  ~Checkpoint_i (void);
+  ~Checkpoint_i ();
 
   virtual void put_event (
         Event * e
@@ -34,7 +34,7 @@ public:
   );
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
index 584df60e71e..1989bef9b76 100644
--- a/TAO/examples/OBV/Typed_Events/client.cpp
+++ b/TAO/examples/OBV/Typed_Events/client.cpp
@@ -17,5 +17,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return -1;
   else
     return 0;
-
 }
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index ddc3bae71cf..f1f82f59e9b 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -5,7 +5,7 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Grid_Client_i::Grid_Client_i (void)
+Grid_Client_i::Grid_Client_i ()
   : height_ (0),
     width_ (0),
     setx_ (0),
@@ -17,7 +17,7 @@ Grid_Client_i::Grid_Client_i (void)
 }
 
 //Destructor.
-Grid_Client_i::~Grid_Client_i (void)
+Grid_Client_i::~Grid_Client_i ()
 {
   //no-op
 }
@@ -86,7 +86,6 @@ Grid_Client_i::run (const char *name,
               grid->set (index_,
                          ctr,
                          (value_ + ctr));
-
             }
         }
 
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.h b/TAO/examples/Persistent_Grid/Grid_Client_i.h
index 615a4a50fc6..3a44409b072 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.h
@@ -29,10 +29,10 @@ class Grid_Client_i
 {
 public:
   /// Constructor
-  Grid_Client_i (void);
+  Grid_Client_i ();
 
   /// Destructor
-  virtual ~Grid_Client_i (void);
+  virtual ~Grid_Client_i ();
 
   /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 91ed608427f..8be57e51736 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -3,7 +3,7 @@
 
 // Default constructor.
 
-Grid_i::Grid_i (void)
+Grid_i::Grid_i ()
   : width_ (0),
     height_ (0),
     array_ (0)
@@ -58,7 +58,7 @@ Grid_i::Grid_i (CORBA::Short x,
 
 // Default destructor.
 
-Grid_i::~Grid_i (void)
+Grid_i::~Grid_i ()
 {
 }
 
@@ -96,13 +96,13 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (void)
+Grid_i::width ()
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (void)
+Grid_i::height ()
 {
   return this->height_;
 }
@@ -142,7 +142,7 @@ Grid_i::set_pool (pool_t *pool)
 }
 // Constructor
 
-Grid_Factory_i::Grid_Factory_i (void)
+Grid_Factory_i::Grid_Factory_i ()
   : orb_ (0),
     pool_name_ (0),
     pool_t_ (0)
@@ -151,7 +151,7 @@ Grid_Factory_i::Grid_Factory_i (void)
 
 // Destructor
 
-Grid_Factory_i::~Grid_Factory_i (void)
+Grid_Factory_i::~Grid_Factory_i ()
 {
   delete this->pool_t_;
 }
@@ -207,7 +207,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (void)
+Grid_Factory_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               " (%P|%t) %s\n",
@@ -218,7 +218,7 @@ Grid_Factory_i::shutdown (void)
 }
 
 void
-Grid_Factory_i::cleanup (void)
+Grid_Factory_i::cleanup ()
 {
   const char *name = "Array";
 
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index 31a1dc8dec3..dcaa6d3aac5 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -30,17 +30,17 @@ class Grid_Factory_i : public POA_Grid_Factory
 {
 public:
   /// Constructor.
-  Grid_Factory_i (void);
+  Grid_Factory_i ();
 
   /// Destructor.
-  ~Grid_Factory_i (void);
+  ~Grid_Factory_i ();
 
   /// This function creates and returns a <Grid>.
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Do a clean up of the memory map
   virtual void cleanup ( );
@@ -76,19 +76,19 @@ class Grid_i: public POA_Grid
 {
 public:
   /// Constructor
-  Grid_i (void);
+  Grid_i ();
 
   /// Constructor.
   Grid_i (CORBA::Short, CORBA::Short, pool_t *);
 
   /// Destructor
-  ~Grid_i (void);
+  ~Grid_i ();
 
   /// Returns the width of the grid
-  virtual CORBA::Short width (void);
+  virtual CORBA::Short width ();
 
   /// Returns the height of the grid
-  virtual CORBA::Short height (void);
+  virtual CORBA::Short height ();
 
   /// Sets the width of the grid.
   virtual void width (CORBA::Short);
@@ -106,7 +106,7 @@ public:
                            CORBA::Short);
 
   /// Destroy the grid.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Set a pointer to the pool
   void set_pool (pool_t *);
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client.h b/TAO/examples/Persistent_Grid/Persistent_Client.h
index 32d3c55f5c9..e8c62731969 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client.h
+++ b/TAO/examples/Persistent_Grid/Persistent_Client.h
@@ -29,10 +29,10 @@ class Persistent_Client_i
 {
 public:
   /// Constructor
-  Persistent_Client_i (void);
+  Persistent_Client_i ();
 
   /// Destructor
-  virtual ~Persistent_Client_i (void);
+  virtual ~Persistent_Client_i ();
 
   /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index 6073083f88f..dd4a4e14d90 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -5,7 +5,7 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Persistent_Client_i::Persistent_Client_i (void)
+Persistent_Client_i::Persistent_Client_i ()
   : height_ (0),
     width_ (0)
 {
@@ -13,7 +13,7 @@ Persistent_Client_i::Persistent_Client_i (void)
 }
 
 //Destructor.
-Persistent_Client_i::~Persistent_Client_i (void)
+Persistent_Client_i::~Persistent_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index d692a78648d..90bae9293f5 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -10,7 +10,7 @@
 // Constructor.
 
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : ior_output_file_ (0),
     mem_pool_name_ (0)
 {
@@ -19,14 +19,14 @@ Server<Servant>::Server (void)
 // Destructor.
 
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:m:"));
   int c = 0;
@@ -130,7 +130,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant> int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
     // Run the main event loop for the ORB.
   int ret = this->orb_manager_.run ();
@@ -144,14 +144,13 @@ Server<Servant>::run (void)
 }
 
 
-
 /////////////////////////////////////////////////////////////////
 //      Client code Starts here
 ////////////////////////////////////////////////////////////////
 
 // Constructor.
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
+Client<InterfaceObj, Var>::Client ()
   : ior_ (0)
 {
   //no-op
@@ -190,7 +189,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
+Client<InterfaceObj, Var>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:k:x"));
   int c = 0;
@@ -223,7 +222,7 @@ Client<InterfaceObj, Var>::parse_args (void)
 }
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
+Client<InterfaceObj, Var>::~Client ()
 {
   ACE_OS::free (this->ior_);
 }
@@ -261,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)
     {
@@ -276,7 +273,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void)
+Client<InterfaceObj, Var>::shutdown ()
 {
   // Returns the shutdwon flag
   return shutdown_;
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index 2a3c7473825..d9272e1fe0c 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -33,10 +33,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -44,12 +44,12 @@ public:
             int argc,
             ACE_TCHAR *argv[]);
 
-  // int register_name (void);
+  // int register_name ();
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
  protected:
   /// Servant class
@@ -59,7 +59,7 @@ public:
   const char *name;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
@@ -76,7 +76,6 @@ public:
 
   /// The command line arguments.
   ACE_TCHAR **argv_;
-
 };
 
 
@@ -96,10 +95,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
@@ -114,14 +113,14 @@ public:
   void shutdown (int);
 
   /// Initialize naming service
-  int obtain_initial_references (void);
+  int obtain_initial_references ();
 
 protected:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp
index a8d3ab80ead..870292aa893 100644
--- a/TAO/examples/Persistent_Grid/client.cpp
+++ b/TAO/examples/Persistent_Grid/client.cpp
@@ -14,7 +14,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return -1;
   else
     return 0;
-
 }
 
 
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index b0f4c261305..ce2b60542e8 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -20,7 +20,7 @@ UDP_PerformanceClient::UDP_PerformanceClient (CORBA::ORB_ptr orb,
 }
 
 //Destructor.
-UDP_PerformanceClient::~UDP_PerformanceClient (void)
+UDP_PerformanceClient::~UDP_PerformanceClient ()
 {
   //no-op
 }
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
index 5a13402ce67..ea87bd4f6d0 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
@@ -37,7 +37,7 @@ public:
                          ACE_UINT32 burst_messages);
 
   /// Destructor
-  virtual ~UDP_PerformanceClient (void);
+  virtual ~UDP_PerformanceClient ();
 
 private:
   // Runs in a separate thread.
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index 18a7e506b5d..5f932e4d5e9 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -1,16 +1,15 @@
 #include "UDP_i.h"
 
 
-
 // Constructor
-UDP_i::UDP_i (void)
+UDP_i::UDP_i ()
   : messages_count_ (0)
   , wrong_messages_count_ (0)
 {
 }
 
 // Destructor
-UDP_i::~UDP_i (void)
+UDP_i::~UDP_i ()
 {
 }
 
@@ -105,7 +104,7 @@ UDP_i::reset (const char * client_name)
 // Shutdown.
 
 void
-UDP_i::shutdown (void)
+UDP_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
index cfb27be63d7..12eab1d599d 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -27,10 +27,10 @@ class UDP_i: public POA_UDP
 {
 public:
   /// Constructor
-  UDP_i (void);
+  UDP_i ();
 
   /// Destructor
-  ~UDP_i (void);
+  ~UDP_i ();
 
   virtual void setResponseHandler (UDP_ptr udpHandler);
 
@@ -40,7 +40,7 @@ public:
   virtual void reset (const char * client_name);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index b16acb89b2d..6bd848410e2 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -10,7 +10,6 @@
 //=============================================================================
 
 
-
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
@@ -24,7 +23,6 @@
 #include "tao/Strategies/advanced_resource.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 ACE_UINT32 burst_messages = 1000;
 
@@ -135,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/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index 379e624c0af..d0c1655024a 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -21,7 +21,6 @@
 
 
 
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int orb_threads = 1; // Number of threads running inside the ORB.
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index d4caa0614df..ba15981cc5b 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -68,7 +68,7 @@ public:
   /// ctor
   Client (Simple_Server_ptr server, ACE_UINT32 niterations);
 
-  virtual ~Client (void) {};
+  virtual ~Client () {};
 
   /// The thread entry point.
   virtual int svc ();
@@ -145,7 +145,7 @@ Client::Client (Simple_Server_ptr server,
 
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
@@ -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/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index 06757f4f51a..3ce36a8aaba 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -10,7 +10,6 @@
 //=============================================================================
 
 
-
 #include "ace/Get_Opt.h"
 
 #include "test_i.h"
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index a9c9d47744e..3bea2eb8282 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -30,7 +30,7 @@ Simple_Server_i::get_number (CORBA::Long)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Simple_Server_i::shutdown\n"));
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index 37796d06ecc..ea18f61e54f 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -33,7 +33,7 @@ public:
 
   CORBA::Long get_number (CORBA::Long num);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index d173ac60640..dd925c6cedc 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -13,13 +13,13 @@
 
 #include "Factory_Finder.h"
 
-Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
+Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server ()
 :   debug_level_ (1)
 {
   // Nothing
 }
 
-Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
+Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server ()
 {
   try
     {
@@ -146,7 +146,7 @@ Quoter_Factory_Finder_Server::init (int argc,
 }
 
 int
-Quoter_Factory_Finder_Server::run (void)
+Quoter_Factory_Finder_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -161,7 +161,7 @@ Quoter_Factory_Finder_Server::run (void)
 // Function get_options.
 
 u_int
-Quoter_Factory_Finder_Server::parse_args (void)
+Quoter_Factory_Finder_Server::parse_args ()
 {
   ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("?d:"));
   int opt;
@@ -178,7 +178,7 @@ Quoter_Factory_Finder_Server::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index d8cedd7aae5..5dcb8c46ad0 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -29,22 +29,21 @@
  */
 class Quoter_Factory_Finder_Server
 {
-
 public:
   /// Default constructor
-  Quoter_Factory_Finder_Server (void);
+  Quoter_Factory_Finder_Server ();
 
   /// Destructor
-  ~Quoter_Factory_Finder_Server (void);
+  ~Quoter_Factory_Finder_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
   /// parse the passed parameters
-  u_int parse_args (void);
+  u_int parse_args ();
 
 private:
   /// instance of the ORB Manager
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 461ccaccd91..c67a55c1bff 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -26,7 +26,7 @@ Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (int debug_level)
 }
 
 // Destructor.
-Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
+Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i ()
 {
   // Nothing
 }
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index 85c2fd52e49..32bfe203aeb 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -23,10 +23,9 @@
  */
 class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder
 {
-
 public:
   Quoter_Factory_Finder_i (int debug_level = 1);
-  ~Quoter_Factory_Finder_i (void);
+  ~Quoter_Factory_Finder_i ();
 
   /**
    * Returns a sequence of Factories if factories matching the
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index a56465d759a..a008cc8d16a 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -14,13 +14,13 @@
 
 #include "orbsvcs/LifeCycleServiceC.h"
 
-Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
+Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server ()
 : use_LifeCycle_Service_ (0),
   debug_level_ (1)
 {
 }
 
-Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
+Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server ()
 {
   try
     {
@@ -195,7 +195,7 @@ Quoter_Generic_Factory_Server::init (int argc,
 }
 
 int
-Quoter_Generic_Factory_Server::run (void)
+Quoter_Generic_Factory_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -209,7 +209,7 @@ Quoter_Generic_Factory_Server::run (void)
 // Function get_options.
 
 u_int
-Quoter_Generic_Factory_Server::parse_args (void)
+Quoter_Generic_Factory_Server::parse_args ()
 {
   ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("l?d:"));
   int opt;
@@ -229,7 +229,7 @@ Quoter_Generic_Factory_Server::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 9d25e76053e..71c994a0c1a 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -29,23 +29,22 @@
  */
 class Quoter_Generic_Factory_Server
 {
-
 public:
   /// Default constructor
-  Quoter_Generic_Factory_Server (void);
+  Quoter_Generic_Factory_Server ();
 
   /// Destructor
-  ~Quoter_Generic_Factory_Server (void);
+  ~Quoter_Generic_Factory_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Parse the passed parameters.
-  u_int parse_args (void);
+  u_int parse_args ();
 
 private:
   /// instance of the ORB Manager
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index 5ba2333b03c..57165cbde26 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -25,7 +25,7 @@ Quoter_Generic_Factory_i::Quoter_Generic_Factory_i (int debug_level)
 }
 
 // Destructor.
-Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
+Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i ()
 {
 }
 
@@ -36,7 +36,6 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &)
 }
 
 
-
 CosNaming::NamingContext_ptr
 Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key)
 {
@@ -78,7 +77,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 }
 
 
-
 CORBA::Object_ptr
 Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
                                          const CosLifeCycle::Criteria &)
@@ -136,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/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index c94997f1c88..7515831d311 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -24,10 +24,9 @@
  */
 class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory
 {
-
 public:
   Quoter_Generic_Factory_i (int debug_level = 1);
-  ~Quoter_Generic_Factory_i (void);
+  ~Quoter_Generic_Factory_i ();
 
   /// Returns true if the Generic Factory is able to forward a request
   /// for creating an object described by the <factory_key>.
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 7c25746e4a4..c789ac4b870 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -27,7 +27,7 @@ Quoter_Factory_i::Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr)
 
 // Destructor
 
-Quoter_Factory_i::~Quoter_Factory_i (void)
+Quoter_Factory_i::~Quoter_Factory_i ()
 {
   for (size_t i = 0; i < this->quoter_num_; i++)
     delete this->my_quoters_[i];
@@ -37,7 +37,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (void)
+int Quoter_Factory_i::init ()
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -104,7 +104,7 @@ Quoter_i::Quoter_i (const char *name,
 
 // Destructor
 
-Quoter_i::~Quoter_i (void)
+Quoter_i::~Quoter_i ()
 {
   // Nothing
 }
@@ -248,7 +248,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (void)
+Quoter_i::remove ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n"));
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 476ce8b769e..2539a4261f3 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -38,7 +38,7 @@ public:
             PortableServer::POA_ptr poa_ptr = 0);
 
   /// Destructor
-  ~Quoter_i (void);
+  ~Quoter_i ();
 
   /// Returns the current quote for the stock <stock_name>
   virtual CORBA::Long get_quote (const char *stock_name);
@@ -54,7 +54,7 @@ public:
                      const CosLifeCycle::Criteria &the_criteria);
 
   /// Removes the object.
-  virtual void remove (void);
+  virtual void remove ();
 
 private:
   /// This flag defines if a Generic Factory is used (0 by default) or
@@ -84,10 +84,10 @@ public:
   Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr);
 
   /// Destructor.
-  ~Quoter_Factory_i (void);
+  ~Quoter_Factory_i ();
 
   /// Initialize everything in the factory
-  int init (void);
+  int init ();
 
   /// Return the quoter by the id <name>.
   virtual Stock::Quoter_ptr create_quoter (const char *name);
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index fe45683efc4..e5eb55e1407 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -11,7 +11,7 @@ Quoter_Task::Quoter_Task (int argc, ACE_TCHAR **argv)
 }
 
 int
-Quoter_Task::svc (void)
+Quoter_Task::svc ()
 {
   if (this->quoter_client.init (this->argc_, this->argv_) == -1)
     return 1;
@@ -20,7 +20,7 @@ Quoter_Task::svc (void)
 }
 
 // Constructor.
-Quoter_Client::Quoter_Client (void)
+Quoter_Client::Quoter_Client ()
   : quoter_factory_key_ (0),
     quoter_key_ (ACE_OS::strdup ("key0")),
     shutdown_ (0),
@@ -34,7 +34,7 @@ Quoter_Client::Quoter_Client (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Quoter_Client::parse_args (void)
+Quoter_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("n:d:lx"));
   int opt;
@@ -60,7 +60,7 @@ Quoter_Client::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
@@ -78,7 +78,7 @@ Quoter_Client::parse_args (void)
 }
 
 int
-Quoter_Client::run (void)
+Quoter_Client::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -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)
     {
@@ -136,7 +135,7 @@ Quoter_Client::run (void)
   return 0;
 }
 
-Quoter_Client::~Quoter_Client (void)
+Quoter_Client::~Quoter_Client ()
 {
   // Free resources
   // Close the ior files
@@ -147,7 +146,7 @@ Quoter_Client::~Quoter_Client (void)
 }
 
 int
-Quoter_Client::init_naming_service (void)
+Quoter_Client::init_naming_service ()
 {
   const char *exception_message = "Null Message";
 
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 9a58d890955..298fb1075f0 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -37,11 +37,11 @@ class Quoter_Client
 {
 public:
   // = Constructor and destructor.
-  Quoter_Client (void);
-  ~Quoter_Client (void);
+  Quoter_Client ();
+  ~Quoter_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -51,10 +51,10 @@ private:
   CORBA::ORB_var orb_;
 
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -109,7 +109,6 @@ private:
   Quoter_Client quoter_client;
   int argc_;
   ACE_TCHAR **argv_;
-
 };
 
 #endif /* QUOTER_CLIENT_H */
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 6907e551726..476d2911c17 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -12,7 +12,7 @@
 #include "server.h"
 #include "tao/ORB_Core.h"
 
-Quoter_Server::Quoter_Server (void)
+Quoter_Server::Quoter_Server ()
   : num_of_objs_ (1),
     quoter_Factory_i_ptr_ (0),
     debug_level_ (1)
@@ -20,7 +20,7 @@ Quoter_Server::Quoter_Server (void)
 }
 
 int
-Quoter_Server::parse_args (void)
+Quoter_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:n:"));
   int c;
@@ -141,7 +141,7 @@ Quoter_Server::init (int argc,
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (void)
+Quoter_Server::init_naming_service ()
 {
   const char *exception_message = "Null Message";
   try
@@ -192,7 +192,7 @@ Quoter_Server::init_naming_service (void)
 }
 
 int
-Quoter_Server::run (void)
+Quoter_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -203,7 +203,7 @@ Quoter_Server::run (void)
   return 0;
 }
 
-Quoter_Server::~Quoter_Server (void)
+Quoter_Server::~Quoter_Server ()
 {
   try
     {
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index a6d650cd0f9..2658f5c0e29 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -41,26 +41,25 @@
 class Quoter_Server
 {
 public:
-
   /// Default constructor
-  Quoter_Server (void);
+  Quoter_Server ();
 
   /// Destructor
-  ~Quoter_Server (void);
+  ~Quoter_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Initializes the name server and registers cubit factory with the
   /// name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Number of quoter objects we export.
   int num_of_objs_;
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 70f2dbdd2f5..f20c5e9d531 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -26,7 +26,7 @@ extern "C" void handler (int)
 
 //***************************************************************//
 
-Activity::Activity (void)
+Activity::Activity ()
   :builder_ (0),
    barrier_ (0),
    active_task_count_ (0),
@@ -35,7 +35,7 @@ Activity::Activity (void)
   state_lock_ = new ACE_Lock_Adapter <TAO_SYNCH_MUTEX>;
 }
 
-Activity::~Activity (void)
+Activity::~Activity ()
 {
   delete state_lock_;
   delete barrier_;
@@ -48,13 +48,13 @@ Activity::builder (Builder* builder)
 }
 
 CORBA::ORB_ptr
-Activity::orb (void)
+Activity::orb ()
 {
   return orb_.in ();
 }
 
 RTCORBA::Current_ptr
-Activity::current (void)
+Activity::current ()
 {
   return current_.in ();
 }
@@ -101,7 +101,7 @@ Activity::init (int& argc, ACE_TCHAR *argv [])
 }
 
 int
-Activity::resolve_naming_service (void)
+Activity::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -119,7 +119,7 @@ Activity::resolve_naming_service (void)
 }
 
 void
-Activity::activate_poa_list (void)
+Activity::activate_poa_list ()
 {
   POA_LIST list;
   int count = builder_->poa_list (list);
@@ -131,7 +131,7 @@ Activity::activate_poa_list (void)
 }
 
 void
-Activity::activate_job_list (void)
+Activity::activate_job_list ()
 {
   JOB_LIST list;
   int count = builder_->job_list (list);
@@ -174,12 +174,11 @@ Activity::activate_job_list (void)
                   job_name.c_str ()));
 
       active_job_count_++;
-
     } /* while */
 }
 
 void
-Activity::activate_schedule (void)
+Activity::activate_schedule ()
 {
   TASK_LIST list;
   int count = builder_->task_list (list);
@@ -270,7 +269,7 @@ Activity::job_ended (Job_i* /*ended_job*/)
 }
 
 void
-Activity::check_ifexit (void)
+Activity::check_ifexit ()
 {
   // All tasks have finished and all jobs have been shutdown.
   if (active_task_count_ == 0 && active_job_count_ == 0)
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 8f8ffa04ee2..34582c21a32 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -52,11 +52,11 @@ public:
   void run (int argc, ACE_TCHAR *argv[]);
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// = Accessors
-  CORBA::ORB_ptr orb (void);
-  RTCORBA::Current_ptr current (void);
+  CORBA::ORB_ptr orb ();
+  RTCORBA::Current_ptr current ();
   void builder (Builder* builder);
 
   /// Returns priority if server declared model else -1
@@ -71,16 +71,16 @@ public:
 protected:
   /// = Activation methods.
   /// Activate the POA's
-  void activate_poa_list (void);
+  void activate_poa_list ();
 
   /// Activate the task list.
-  void activate_schedule (void);
+  void activate_schedule ();
 
   /// Activate the Job's
-  void activate_job_list (void);
+  void activate_job_list ();
 
   /// Check if we should process exit
-  void check_ifexit (void);
+  void check_ifexit ();
 
   /// Create a file whose name is specified in the -Started_Flag <file_name> argument at startup.
   /// This file flags that the Activity has finished its bootstrapping step.
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 820c9b284f1..d86fabcb697 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -6,7 +6,7 @@
 #include "Thread_Task.h"
 #include "Activity.h"
 
-Builder::Builder(void)
+Builder::Builder()
   :poa_count_ (0),
    poa_list_ (0),
    task_count_ (0),
@@ -17,7 +17,7 @@ Builder::Builder(void)
   ACTIVITY::instance()->builder (this);
 }
 
-Builder::~Builder(void)
+Builder::~Builder()
 {
 }
 
@@ -128,7 +128,7 @@ Builder::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Builder::fini (void)
+Builder::fini ()
 {
   // It's only a hack for proper cleanup of this badly designed test.
   static bool already_cleaned = false;
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 8b0db2a892f..bd184c32be1 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -48,7 +48,6 @@ class Builder : public ACE_Service_Object
   int job_list (JOB_LIST &job_list);
 
  protected:
-
   /// Number of POA's declared
   int poa_count_;
 
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 7f0ac5e8ec4..cbee3186a06 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -9,13 +9,13 @@ Job_i::Job_i ()
 }
 
 const ACE_CString&
-Job_i::name (void)
+Job_i::name ()
 {
   return job_name_;
 }
 
 const ACE_CString&
-Job_i::poa (void)
+Job_i::poa ()
 {
   return POA_name_;
 }
@@ -51,7 +51,7 @@ Job_i::work (CORBA::ULong work)
 }
 
 void
-Job_i::shutdown (void)
+Job_i::shutdown ()
 {
   ACTIVITY::instance()->job_ended (this);
 }
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 7eda03d5f40..f1e532d5711 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -24,19 +24,19 @@ class Job_i : public POA_Job
 {
  public:
   /// Constructor
-  Job_i (void);
+  Job_i ();
 
   /// Init the state of this object.
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// = Accessors
-  const ACE_CString& name (void);
-  const ACE_CString& poa (void);
+  const ACE_CString& name ();
+  const ACE_CString& poa ();
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
  protected:
   /// The name of this Job
   ACE_CString job_name_;
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index b880c30d6f7..581993d6c77 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -2,7 +2,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-POA_Holder::POA_Holder (void)
+POA_Holder::POA_Holder ()
   : priority_model_ (RTCORBA::CLIENT_PROPAGATED),
     server_priority_ (0)
 {
@@ -109,7 +109,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
 void
 POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa)
 {
-
   /*
     lanes bands priomodel
 
@@ -159,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/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 2e8440ba572..6e46602824b 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -25,7 +25,7 @@ class POA_Holder
 {
  public:
   /// Constructor
-  POA_Holder (void);
+  POA_Holder ();
 
   /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
   int init (ACE_Arg_Shifter& arg_shifter);
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 4bef00b9e64..e03a478974b 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -5,7 +5,7 @@
 
 #include "Task_Stats.h"
 
-Periodic_Task::Periodic_Task (void)
+Periodic_Task::Periodic_Task ()
   :barrier_ (0),
    task_priority_ (0),
    period_ (0),
@@ -86,7 +86,7 @@ Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
 }
 
 const char*
-Periodic_Task::job (void)
+Periodic_Task::job ()
 {
   return name_.c_str ();
 }
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index 1c2e9785e81..05939aaa5b2 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -32,7 +32,7 @@ class Task_Stats;
 class Periodic_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
-  Periodic_Task (void);
+  Periodic_Task ();
   ~Periodic_Task ();
 
   /// Init the state of this object.
@@ -46,7 +46,7 @@ class Periodic_Task : public ACE_Task <ACE_SYNCH>
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
-  const char* job (void);
+  const char* job ();
 
   /// Sets the Job to exec.
   void job (Job_ptr job);
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index 9998b2bf3b7..f91efd34b7a 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -5,7 +5,7 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
@@ -26,14 +26,14 @@ Task_Stats::Task_Stats (size_t max_samples)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->time_inv_;
   delete[] this->time_exec_;
 }
 
 int
-Task_Stats::init (void)
+Task_Stats::init ()
 {
   ACE_NEW_RETURN (this->time_inv_, ACE_UINT64[this->max_samples_], -1);
   ACE_NEW_RETURN (this->time_exec_, ACE_UINT64[this->max_samples_], -1);
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h
index 235a40dc7c9..0fa872dd9e8 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -25,7 +25,7 @@
 class Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -43,10 +43,10 @@ class Task_Stats
   Task_Stats (size_t max_samples);
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
-  int init (void);
+  int init ();
 
   /// Set the base time value.
   void base_time (ACE_hrtime_t time);
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index 10003b60260..d94ab040f49 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -9,7 +9,7 @@
 #include "Task_Stats.h"
 #include "ace/Barrier.h"
 
-Thread_Task::Thread_Task (void)
+Thread_Task::Thread_Task ()
 {
 }
 
@@ -53,12 +53,11 @@ Thread_Task::activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *prio
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   // if debugging, dump the priority that we're actually at.
   if (TAO_debug_level > 0)
     {
-
       // Get the priority of the current thread.
       RTCORBA::Priority prio =
         ACTIVITY::instance()->current ()->the_priority ();
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h
index 1538a8acd0e..27b5b9727b9 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h
@@ -28,13 +28,12 @@ class Thread_Task : public Periodic_Task
 {
  public:
   /// Constructor
-  Thread_Task (void);
+  Thread_Task ();
 
   /// Activate thread(s).
   virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping);
 
  protected:
-
   /// task svc
   virtual int svc ();
 };
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index d1ee3959cec..0d01b0bbf5b 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -168,7 +168,7 @@ DT_Creator::init (int argc, ACE_TCHAR *argv [])
 }
 
 void
-DT_Creator::register_synch_obj (void)
+DT_Creator::register_synch_obj ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -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");
@@ -229,12 +228,11 @@ DT_Creator::register_synch_obj (void)
   // Register the synch object with the Synch context.
   synch_context->rebind (name,
        synch.in ());
-
 }
 
 
 int
-DT_Creator::activate_root_poa (void)
+DT_Creator::activate_root_poa ()
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RootPOA");
@@ -251,7 +249,7 @@ DT_Creator::activate_root_poa (void)
 }
 
 void
-DT_Creator::activate_poa_list (void)
+DT_Creator::activate_poa_list ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -277,9 +275,8 @@ DT_Creator::activate_poa_list (void)
 }
 
 void
-DT_Creator::activate_job_list (void)
+DT_Creator::activate_job_list ()
 {
-
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
     "DT_Creator::activate_job_list\n"));
@@ -325,8 +322,6 @@ DT_Creator::activate_job_list (void)
 
       this->naming_->rebind (name.in (),
                              server.in ());
-
-
     } /* while */
 
   ACE_DEBUG ((LM_DEBUG,
@@ -334,7 +329,7 @@ DT_Creator::activate_job_list (void)
 }
 
 void
-DT_Creator::activate_schedule (void)
+DT_Creator::activate_schedule ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -395,11 +390,10 @@ DT_Creator::activate_schedule (void)
     ACE_DEBUG ((LM_DEBUG,
     "Activated schedule, task count = %d\n",
     dt_count_));
-
 }
 
 int
-DT_Creator::resolve_naming_service (void)
+DT_Creator::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -494,7 +488,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current)
 }
 
 void
-DT_Creator::dt_ended (void)
+DT_Creator::dt_ended ()
 {
   {
     ACE_GUARD (ACE_Lock, ace_mon, *state_lock_);
@@ -509,7 +503,7 @@ DT_Creator::dt_ended (void)
 }
 
 void
-DT_Creator::job_ended (void)
+DT_Creator::job_ended ()
 {
   {
     ACE_GUARD (ACE_Lock, ace_mon, *state_lock_);
@@ -525,7 +519,7 @@ DT_Creator::job_ended (void)
 }
 
 void
-DT_Creator::check_ifexit (void)
+DT_Creator::check_ifexit ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -577,19 +571,18 @@ DT_Creator::check_ifexit (void)
         }
       ACE_DEBUG ((LM_DEBUG,
       "Log File Ready\n"));
-
     }
       }
   }
 }
 
 int
-DT_Creator::dt_count (void)
+DT_Creator::dt_count ()
 {
   return dt_count_;
 }
 
-DT_Creator::DT_Creator (void)
+DT_Creator::DT_Creator ()
  : dt_list_ (0),
    poa_list_ (0),
    job_list_ (0),
@@ -609,7 +602,7 @@ DT_Creator::DT_Creator (void)
 {
 }
 
-DT_Creator::~DT_Creator (void)
+DT_Creator::~DT_Creator ()
 {
   for (int i = 0; i < log_index; ++i)
     ACE_OS::free (log[i]);
@@ -637,7 +630,7 @@ DT_Creator::log_msg (char* msg)
 }
 
 CORBA::ORB_ptr
-DT_Creator::orb (void)
+DT_Creator::orb ()
 {
   return this->orb_.in ();
 }
@@ -649,7 +642,7 @@ DT_Creator::orb (CORBA::ORB_ptr orb)
 }
 
 ACE_Time_Value*
-DT_Creator::base_time (void)
+DT_Creator::base_time ()
 {
   return this->base_time_;
 }
@@ -662,7 +655,7 @@ DT_Creator::base_time (ACE_Time_Value* base_time)
 
 
 Synch_i*
-DT_Creator::synch (void)
+DT_Creator::synch ()
 {
   return this->synch_.in ();
 }
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index 0e6ca315bff..90b818f2bab 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -24,9 +24,9 @@ typedef Job_i **JOB_LIST;
 class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
 {
  public:
-  DT_Creator (void);
+  DT_Creator ();
 
-  virtual ~DT_Creator (void);
+  virtual ~DT_Creator ();
 
   int init (int argc, ACE_TCHAR *argv []);
 
@@ -34,14 +34,14 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
 
   virtual void create_distributable_threads (RTScheduling::Current_ptr  current);
 
-  void activate_poa_list (void);
-  void activate_job_list (void);
-  void activate_schedule (void);
+  void activate_poa_list ();
+  void activate_job_list ();
+  void activate_schedule ();
 
   virtual void yield (time_t suspend_time,
                       Thread_Task* task) = 0;
 
-  virtual void wait (void) = 0;
+  virtual void wait () = 0;
 
   virtual CORBA::Policy_ptr sched_param (int importance) = 0;
 
@@ -51,39 +51,37 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
           int iter,
           int dist,
           char *job_name) = 0;
-  //  virtual Task* task (void) = 0;
+  //  virtual Task* task () = 0;
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
-  int dt_count (void);
+  int dt_count ();
 
-  void dt_ended (void);
-  void job_ended (void);
+  void dt_ended ();
+  void job_ended ();
 
-  void check_ifexit (void);
+  void check_ifexit ();
 
   void log_msg (char* msg);
 
   void orb (CORBA::ORB_ptr);
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
-  ACE_Time_Value* base_time (void);
+  ACE_Time_Value* base_time ();
   void base_time (ACE_Time_Value*);
 
-  ACE_hrtime_t base_hr_time (void);
+  ACE_hrtime_t base_hr_time ();
 
-  virtual int total_load (void) = 0;
+  virtual int total_load () = 0;
 
-  Synch_i* synch (void);
+  Synch_i* synch ();
 
-  void register_synch_obj (void);
+  void register_synch_obj ();
 
-  int activate_root_poa (void);
+  int activate_root_poa ();
 
  protected:
-
-
   DT_LIST dt_list_;
   POA_LIST poa_list_;
   JOB_LIST job_list_;
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
index 12fbc8127a2..a5f47892108 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
@@ -2,10 +2,9 @@
 #include "test.h"
 #include "FP_Task.h"
 
-FP_DT_Creator::FP_DT_Creator (void)
+FP_DT_Creator::FP_DT_Creator ()
 {
   DT_TEST::instance ()->dt_creator (this);
-
 }
 
 Thread_Task*
@@ -46,13 +45,13 @@ FP_DT_Creator::yield (time_t suspend_time,
 }
 
 int
-FP_DT_Creator::total_load (void)
+FP_DT_Creator::total_load ()
 {
   return BUFSIZ;
 }
 
 void
-FP_DT_Creator::wait (void)
+FP_DT_Creator::wait ()
 {
 }
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
index a39bfc021d1..4d9f0dfccce 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
@@ -7,11 +7,11 @@
 class FP_DT_Creator: public DT_Creator
 {
 public:
-  FP_DT_Creator (void);
+  FP_DT_Creator ();
 
   virtual CORBA::Policy_ptr sched_param (int importance);
 
-  //virtual Task* task (void);
+  //virtual Task* task ();
   virtual Thread_Task* create_thr_task (int importance,
                                         time_t start_time,
                                         int load,
@@ -22,9 +22,8 @@ public:
   virtual void yield (time_t suspend_time,
                       Thread_Task* task);
 
-  virtual void wait (void);
-  virtual int total_load (void);
-
+  virtual void wait ();
+  virtual int total_load ();
 };
 
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 28563f1378f..3cd0d02ed68 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -6,7 +6,7 @@
 std::atomic<long> server_guid_counter;
 
 RTCORBA::Priority
-Segment_Sched_Param_Policy::value (void)
+Segment_Sched_Param_Policy::value ()
 {
   return this->value_;
 }
@@ -18,7 +18,7 @@ Segment_Sched_Param_Policy::value (RTCORBA::Priority value)
 }
 
 CORBA::Policy_ptr
-Segment_Sched_Param_Policy::copy (void)
+Segment_Sched_Param_Policy::copy ()
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -31,13 +31,13 @@ Segment_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-Segment_Sched_Param_Policy::policy_type (void)
+Segment_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-Segment_Sched_Param_Policy::destroy (void)
+Segment_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -57,7 +57,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb)
     }
 }
 
-Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
+Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler ()
 {
 }
 
@@ -76,7 +76,6 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority
   segment_policy->value (segment_priority);
 
   return segment_policy;
-
 }
 
 
@@ -110,7 +109,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
                                       name,
                                       sched_param,
                                       implicit_sched_param);
-
 }
 
 void
@@ -130,7 +128,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
 void
 Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
 {
-
   int priority;
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -152,7 +149,6 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
                   sizeof (size_t));
   request_info->add_request_service_context (*srv_con,
                                              0);
-
 }
 
 void
@@ -243,7 +239,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (void)
+Fixed_Priority_Scheduler::scheduling_policies ()
 {
   return 0;
 }
@@ -254,13 +250,13 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (void)
+Fixed_Priority_Scheduler::poa_policies ()
 {
   return 0;
 }
 
 char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (void)
+Fixed_Priority_Scheduler::scheduling_discipline_name ()
 {
   return 0;
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index 09bb04dc53d..0c648b8758b 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -10,15 +10,15 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
        public ::CORBA::LocalObject
 {
  public:
-  virtual RTCORBA::Priority value (void);
+  virtual RTCORBA::Priority value ();
 
   virtual void value (RTCORBA::Priority value);
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  void destroy (void);
+  void destroy ();
 
  private:
   RTCORBA::Priority value_;
@@ -29,10 +29,9 @@ public FP_Scheduling::FP_Scheduler,
 public ::CORBA::LocalObject
 {
  public:
-
   Fixed_Priority_Scheduler (CORBA::ORB_ptr orb);
 
-  ~Fixed_Priority_Scheduler (void);
+  ~Fixed_Priority_Scheduler ();
 
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (RTCORBA::Priority segment_priority);
@@ -83,13 +82,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr
     create_resource_manager (const char * name,
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
index 51b1787ddd9..812c8e5be23 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
@@ -61,7 +61,7 @@ FP_Task::activate_task (RTScheduling::Current_ptr current,
 }
 
 void
-FP_Task::pre_activate (void)
+FP_Task::pre_activate ()
 {
   CORBA::Object_var object =
     DT_TEST::instance ()->orb ()->resolve_initial_references ("PriorityMappingManager");
@@ -89,7 +89,7 @@ FP_Task::pre_activate (void)
 }
 
 int
-FP_Task::perform_task (void)
+FP_Task::perform_task ()
 {
   static CORBA::ULong prime_number = 9619;
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
index 65912189c78..0a84c498a9c 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
@@ -19,10 +19,9 @@ public:
                              long flags,
                              ACE_Time_Value* base_time);
 
-  virtual int perform_task (void);
-
-  virtual void pre_activate (void);
+  virtual int perform_task ();
 
+  virtual void pre_activate ();
 };
 
 #endif /*FP_TASK_H*/
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index 92b8bcd4242..942ade718a1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -23,7 +23,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -46,13 +46,13 @@ private:
   ACE_Sig_Handler shutdown_;
 };
 
-DT_Test::DT_Test (void)
+DT_Test::DT_Test ()
 {
   base_t = ACE_OS::gethrtime ();
 }
 
 void
-DT_Test::check_supported_priorities (void)
+DT_Test::check_supported_priorities ()
 {
   // Check that we have sufficient priority range to run this
   // test, i.e., more than 1 priority level.
@@ -200,21 +200,20 @@ DT_Test::dt_creator (FP_DT_Creator* dt_creator)
 }
 
 FP_DT_Creator*
-DT_Test::dt_creator (void)
+DT_Test::dt_creator ()
 {
   return this->dt_creator_;
 }
 
 Fixed_Priority_Scheduler*
-DT_Test::scheduler (void)
+DT_Test::scheduler ()
 {
   return this->scheduler_.in ();
 }
 
 int
-DT_Test::activate_task (void)
+DT_Test::activate_task ()
 {
-
   ACE_DEBUG ((LM_DEBUG,
               "Test Activate Task\n"));
 
@@ -239,7 +238,7 @@ DT_Test::activate_task (void)
 }
 
 int
-DT_Test::svc (void)
+DT_Test::svc ()
 {
   try
     {
@@ -262,7 +261,7 @@ DT_Test::svc (void)
 }
 
 CORBA::ORB_ptr
-DT_Test::orb (void)
+DT_Test::orb ()
 {
   return this->orb_.in ();
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
index 34a0323310d..9391080ff6b 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
@@ -15,23 +15,22 @@ class Task_Stats;
 class DT_Test :public ACE_Task <ACE_SYNCH>
 {
  public:
+  DT_Test ();
 
-  DT_Test (void);
-
-  void check_supported_priorities (void);
+  void check_supported_priorities ();
 
   int init (int argc, ACE_TCHAR *argv []);
 
   void run (int argc, ACE_TCHAR *argv []);
 
   void dt_creator (FP_DT_Creator* dt_creator);
-  FP_DT_Creator* dt_creator (void);
+  FP_DT_Creator* dt_creator ();
 
-  Fixed_Priority_Scheduler* scheduler (void);
+  Fixed_Priority_Scheduler* scheduler ();
 
-  int activate_task (void);
+  int activate_task ();
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   ACE_hrtime_t base_t;
 
@@ -40,7 +39,6 @@ class DT_Test :public ACE_Task <ACE_SYNCH>
   virtual int svc ();
 
 
-
  private:
   /// = Policies
   long thr_sched_policy_;
@@ -55,7 +53,6 @@ class DT_Test :public ACE_Task <ACE_SYNCH>
   RTCORBA::RTORB_var rt_orb_;
   /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-
 };
 
 typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST;
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index b2a518cb81e..f4723e88252 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -16,22 +16,21 @@ Job_i::Job_i (DT_Creator* dt_creator)
   // create the stat object.
   ACE_NEW (task_stats_, Task_Stats);
   task_stats_->init (100);
-
 }
 
-Job_i::~Job_i (void)
+Job_i::~Job_i ()
 {
   delete task_stats_;
 }
 
 const ACE_CString&
-Job_i::name (void)
+Job_i::name ()
 {
   return job_name_;
 }
 
 const ACE_CString&
-Job_i::poa (void)
+Job_i::poa ()
 {
   return POA_name_;
 }
@@ -129,19 +128,19 @@ Job_i::post_work (int /*guid*/,
 }
 
 int
-Job_i::guid (void)
+Job_i::guid ()
 {
   return this->guid_;
 }
 
 void
-Job_i::shutdown (void)
+Job_i::shutdown ()
 {
   dt_creator_->job_ended ();
 }
 
 void
-Job_i::dump_stats (void)
+Job_i::dump_stats ()
 {
   ACE_TCHAR fname [BUFSIZ];
   ACE_OS::sprintf (fname,
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 68976b7d96b..3981b40a076 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -31,14 +31,14 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
   /// Constructor
   Job_i (DT_Creator* dt_creator);
 
-  ~Job_i (void);
+  ~Job_i ();
 
   /// Init the state of this object.
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// = Accessors
-  const ACE_CString& name (void);
-  const ACE_CString& poa (void);
+  const ACE_CString& name ();
+  const ACE_CString& poa ();
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work,
@@ -47,11 +47,11 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
   virtual void post_work (int guid,
         int importance);
 
-  void dump_stats (void);
+  void dump_stats ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  int guid (void);
+  int guid ();
 
  protected:
   /// The name of this Job
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index 884f1fb2f42..52754b1de27 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -2,7 +2,7 @@
 #include "test.h"
 #include "MIF_Task.h"
 
-MIF_DT_Creator::MIF_DT_Creator (void)
+MIF_DT_Creator::MIF_DT_Creator ()
 {
   DT_TEST::instance ()->dt_creator (this);
 }
@@ -49,7 +49,6 @@ MIF_DT_Creator::yield (time_t suspend_time,
       ACE_Time_Value now (ACE_OS::gettimeofday ());
       while (((now - *base_time_) < sus_time_value) || (suspend_time == 1))
         {
-
           ACE_OS::sleep (1);
           CORBA::Policy_var sched_param;
           sched_param = this->sched_param (100);
@@ -69,13 +68,13 @@ MIF_DT_Creator::yield (time_t suspend_time,
 }
 
 int
-MIF_DT_Creator::total_load (void)
+MIF_DT_Creator::total_load ()
 {
   return 1000;
 }
 
 void
-MIF_DT_Creator::wait (void)
+MIF_DT_Creator::wait ()
 {
   while (active_dt_count_ > 0 || active_job_count_ > 0)
     {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
index f677b094f9e..5e2039eec7a 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
@@ -7,11 +7,11 @@
 class MIF_DT_Creator: public DT_Creator
 {
 public:
-  MIF_DT_Creator (void);
+  MIF_DT_Creator ();
 
   virtual CORBA::Policy_ptr sched_param (int importance);
 
-  //virtual Task* task (void);
+  //virtual Task* task ();
   virtual Thread_Task* create_thr_task (int importance,
                                         time_t start_time,
                                         int load,
@@ -22,8 +22,8 @@ public:
   virtual void yield (time_t suspend_time,
                       Thread_Task* task);
 
-  virtual void wait (void);
-  virtual int total_load (void);
+  virtual void wait ();
+  virtual int total_load ();
 };
 
 ACE_STATIC_SVC_DECLARE (MIF_DT_Creator)
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index a26d17387d1..406ec0cccad 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -14,7 +14,7 @@ DT::DT (TAO_SYNCH_MUTEX &lock,
 }
 
 void
-DT::suspend (void)
+DT::suspend ()
 {
   eligible_ = 0;
   while (!eligible_)
@@ -22,14 +22,14 @@ DT::suspend (void)
 }
 
 void
-DT::resume (void)
+DT::resume ()
 {
   eligible_ = 1;
   this->dt_cond_.signal ();
 }
 
 CORBA::Short
-Segment_Sched_Param_Policy::importance (void)
+Segment_Sched_Param_Policy::importance ()
 {
   return this->importance_;
 }
@@ -41,7 +41,7 @@ Segment_Sched_Param_Policy::importance (CORBA::Short importance)
 }
 
 CORBA::Policy_ptr
-Segment_Sched_Param_Policy::copy (void)
+Segment_Sched_Param_Policy::copy ()
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
@@ -54,13 +54,13 @@ Segment_Sched_Param_Policy::copy (void)
 }
 
 CORBA::PolicyType
-Segment_Sched_Param_Policy::policy_type (void)
+Segment_Sched_Param_Policy::policy_type ()
 {
   return 0;
 }
 
 void
-Segment_Sched_Param_Policy::destroy (void)
+Segment_Sched_Param_Policy::destroy ()
 {
 }
 
@@ -88,7 +88,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
     }
 }
 
-MIF_Scheduler::~MIF_Scheduler (void)
+MIF_Scheduler::~MIF_Scheduler ()
 {
   while (free_que_.message_count () > 0)
     {
@@ -101,7 +101,7 @@ MIF_Scheduler::~MIF_Scheduler (void)
 }
 
 void
-MIF_Scheduler::incr_thr_count (void)
+MIF_Scheduler::incr_thr_count ()
 {
   lock_.acquire ();
   wait_++;
@@ -109,7 +109,7 @@ MIF_Scheduler::incr_thr_count (void)
 }
 
 void
-MIF_Scheduler::wait (void)
+MIF_Scheduler::wait ()
 {
   lock_.acquire ();
   while (wait_ > 0)
@@ -123,7 +123,7 @@ MIF_Scheduler::wait (void)
 }
 
 void
-MIF_Scheduler::resume_main (void)
+MIF_Scheduler::resume_main ()
 {
   wait_--;
   wait_cond_.signal ();
@@ -371,7 +371,6 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
       free_que_.enqueue_prio (run_dt);
     }
   lock_.release ();
-
 }
 
 void
@@ -381,7 +380,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
                                 CORBA::Policy_out sched_param_out,
                                 CORBA::Policy_out /*implicit_sched_param*/)
 {
-
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "MIF_Scheduler::receive_request\n"));
@@ -451,7 +449,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
 void
 MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
 {
-
   RTScheduling::Current::IdType_var guid = current_->id ();
 
   size_t count;
@@ -672,7 +669,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (void)
+MIF_Scheduler::scheduling_policies ()
 {
   return 0;
 }
@@ -683,13 +680,13 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::poa_policies (void)
+MIF_Scheduler::poa_policies ()
 {
         return 0;
 }
 
 char *
-MIF_Scheduler::scheduling_discipline_name (void)
+MIF_Scheduler::scheduling_discipline_name ()
 {
         return 0;
 }
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index ea546dc40e9..faff34ee9e2 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -19,8 +19,8 @@ class DT : public ACE_Message_Block
   DT (TAO_SYNCH_MUTEX &lock,
       int guid);
 
-  void suspend (void);
-  void resume (void);
+  void suspend ();
+  void resume ();
 
  private:
   TAO_SYNCH_CONDITION dt_cond_;
@@ -33,15 +33,15 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy,
        public ::CORBA::LocalObject
 {
  public:
-  virtual CORBA::Short importance (void);
+  virtual CORBA::Short importance ();
 
   virtual void importance (CORBA::Short importance);
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  void destroy (void);
+  void destroy ();
 
  private:
   CORBA::Short importance_;
@@ -54,20 +54,19 @@ public MIF_Scheduling::MIF_Scheduler,
 public ::CORBA::LocalObject
 {
  public:
-
   MIF_Scheduler (CORBA::ORB_ptr orb);
 
-  ~MIF_Scheduler (void);
+  ~MIF_Scheduler ();
 
 
   virtual MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (CORBA::Short segment_priority);
 
-  void wait (void);
+  void wait ();
 
-  void resume_main (void);
+  void resume_main ();
 
-  void incr_thr_count (void);
+  void incr_thr_count ();
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                const char * name,
@@ -115,13 +114,13 @@ public ::CORBA::LocalObject
 
   virtual void cancel (const RTScheduling::Current::IdType & guid);
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index d60b0961c97..7e2fbd38dbf 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -23,22 +23,21 @@ MIF_Task::MIF_Task (int importance,
   // create the stat object.
   ACE_NEW (task_stats_, Task_Stats);
   task_stats_->init (iter_);
-
 }
 
-MIF_Task::~MIF_Task (void)
+MIF_Task::~MIF_Task ()
 {
   delete task_stats_;
 }
 
 void
-MIF_Task::pre_activate (void)
+MIF_Task::pre_activate ()
 {
   DT_TEST::instance ()->scheduler ()->incr_thr_count ();
 }
 
 void
-MIF_Task::post_activate (void)
+MIF_Task::post_activate ()
 {
   DT_TEST::instance ()->scheduler ()->wait ();
 }
@@ -49,7 +48,6 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
        long flags,
        ACE_Time_Value* base_time)
 {
-
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
     "MIF_Task::activate %d\n",
@@ -81,11 +79,10 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
 }
 
 int
-MIF_Task::perform_task (void)
+MIF_Task::perform_task ()
 {
   try
     {
-
       ACE_TCHAR msg [BUFSIZ];
       ACE_OS::sprintf (msg,
                        ACE_TEXT("MIF_Task::perform_task ")
@@ -136,7 +133,6 @@ MIF_Task::perform_task (void)
 
               while (count_down_time > ACE_Time_Value::zero)
                 {
-
                   ACE::is_prime (prime_number,
                                  2,
                                  prime_number / 2);
@@ -146,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/MIF_Task.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
index 5acb8995953..f1183757f37 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
@@ -14,18 +14,18 @@ class MIF_Task : public Thread_Task
             char *job_name,
             DT_Creator *dt_creator);
 
-  ~MIF_Task (void);
+  ~MIF_Task ();
 
   virtual int activate_task (RTScheduling::Current_ptr current,
                              CORBA::Policy_ptr sched_param,
                              long flags,
                              ACE_Time_Value* base_time);
 
-  virtual int perform_task (void);
+  virtual int perform_task ();
 
  private:
-  void pre_activate (void);
-  void post_activate (void);
+  void pre_activate ();
+  void post_activate ();
 };
 
 #endif /*MIF_TASK_H*/
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index 612fc46bb0f..1fd1c748dc3 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -24,7 +24,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -47,7 +47,7 @@ private:
   ACE_Sig_Handler shutdown_;
 };
 
-DT_Test::DT_Test (void)
+DT_Test::DT_Test ()
 {
 }
 
@@ -118,15 +118,14 @@ DT_Test::dt_creator (MIF_DT_Creator* dt_creator)
 
 
 MIF_Scheduler*
-DT_Test::scheduler (void)
+DT_Test::scheduler ()
 {
   return this->scheduler_.in ();
 }
 /*
 int
-DT_Test::activate_task (void)
+DT_Test::activate_task ()
 {
-
 long flags;
   flags = THR_NEW_LWP | THR_JOINABLE;
   flags |=
@@ -145,12 +144,11 @@ long flags;
 }
 
 int
-DT_Test::svc (void)
+DT_Test::svc ()
 {
   try
     {
       dt_creator_->create_distributable_threads (current_.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
index f308c4df398..e009c734a6b 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
@@ -14,8 +14,7 @@ class Task_Stats;
 class DT_Test //:public ACE_Task <ACE_SYNCH>
 {
  public:
-
-  DT_Test (void);
+  DT_Test ();
 
   int init (int argc, ACE_TCHAR *argv []);
 
@@ -23,9 +22,9 @@ class DT_Test //:public ACE_Task <ACE_SYNCH>
 
   void dt_creator (MIF_DT_Creator* dt_creator);
 
-  MIF_Scheduler* scheduler (void);
+  MIF_Scheduler* scheduler ();
 
-  int activate_task (void);
+  int activate_task ();
 
 
 /*   protected: */
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 5049898618e..7ece096155e 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -5,7 +5,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Log_Msg.h"
 
-POA_Holder::POA_Holder (void)
+POA_Holder::POA_Holder ()
   :priority_model_ (RTCORBA::CLIENT_PROPAGATED),
    server_priority_ (0),
    thread_pool_ (0)
@@ -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/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index 94f45bf0872..22fb36645b8 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -28,7 +28,7 @@ class RTSCHEDTESTLIB_Export POA_Holder
 {
 public:
   /// Constructor
-  POA_Holder (void);
+  POA_Holder ();
 
   /// The arg_shifter options are read in the following manner:
   ///-POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 57eb4474de0..a072dbc2b4e 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -12,7 +12,7 @@ Starter::Starter (CORBA::ORB_ptr orb)
 }
 
 void
-Starter::init (void)
+Starter::init ()
 {
   this->resolve_synch_objs ();
 
@@ -20,7 +20,7 @@ Starter::init (void)
 }
 
 void
-Starter::fire (void)
+Starter::fire ()
 {
   ACE_Time_Value base_time = ACE_OS::gettimeofday ();
   for (Synchs::iterator iterator = this->synchs_.begin ();
@@ -32,7 +32,7 @@ Starter::fire (void)
 }
 
 void
-Starter::resolve_synch_objs (void)
+Starter::resolve_synch_objs ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -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/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 49b50d41afa..664dadde5f9 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -12,19 +12,18 @@
 class Starter
 {
  public:
-
   Starter (CORBA::ORB_ptr orb);
 
-  void init (void);
+  void init ();
 
-  void fire (void);
+  void fire ();
 
   typedef ACE_Hash_Map_Manager <ACE_CString,
                                 Synch_var,
                                 ACE_Null_Mutex> Synchs;
 
  private:
-  void resolve_synch_objs (void);
+  void resolve_synch_objs ();
 
   void add_to_synchs (CosNaming::BindingList &binding_list);
 
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index 8e89b0fc637..466cf7cf3f2 100644
--- a/TAO/examples/RTScheduling/Synch_i.cpp
+++ b/TAO/examples/RTScheduling/Synch_i.cpp
@@ -1,6 +1,6 @@
 #include "Synch_i.h"
 
-Synch_i::Synch_i (void)
+Synch_i::Synch_i ()
 {
   this->synched_ = 0;
 }
@@ -15,13 +15,13 @@ Synch_i::go (CORBA::Long base_time)
 }
 
 int
-Synch_i::synched (void)
+Synch_i::synched ()
 {
   return this->synched_;
 }
 
 ACE_Time_Value*
-Synch_i::base_time (void)
+Synch_i::base_time ()
 {
   return &this->base_time_;
 }
diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h
index f5c6a981cde..5ccfa567b98 100644
--- a/TAO/examples/RTScheduling/Synch_i.h
+++ b/TAO/examples/RTScheduling/Synch_i.h
@@ -6,13 +6,12 @@
 class SYNCH_Export Synch_i : public POA_Synch
 {
  public:
-
-  Synch_i (void);
+  Synch_i ();
   virtual void go (CORBA::Long base_time);
 
-  int synched (void);
+  int synched ();
 
-  ACE_Time_Value* base_time (void);
+  ACE_Time_Value* base_time ();
 
  private:
   int synched_;
diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp
index 053ffaf63a2..9813c860e90 100644
--- a/TAO/examples/RTScheduling/Task_Stats.cpp
+++ b/TAO/examples/RTScheduling/Task_Stats.cpp
@@ -5,12 +5,12 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
 
-Task_Stats::Task_Stats (void)
+Task_Stats::Task_Stats ()
   : base_time_(0),
     end_time_ (0),
     max_samples_ (0),
@@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->thr_run_time_;
   delete[] this->thr_count_;
diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h
index 5a556e030c4..a99faeeeaa8 100644
--- a/TAO/examples/RTScheduling/Task_Stats.h
+++ b/TAO/examples/RTScheduling/Task_Stats.h
@@ -27,7 +27,7 @@
 class RTSCHEDTESTLIB_Export Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -42,10 +42,10 @@ class RTSCHEDTESTLIB_Export Task_Stats
 {
  public:
   /// Constructor
-  Task_Stats (void);
+  Task_Stats ();
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
   int init (size_t max_samples);
diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp
index 1047365b4e0..d14bfe3b2e8 100644
--- a/TAO/examples/RTScheduling/Thread_Task.cpp
+++ b/TAO/examples/RTScheduling/Thread_Task.cpp
@@ -7,7 +7,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Atomic_Op.h"
 
-Thread_Task::Thread_Task (void)
+Thread_Task::Thread_Task ()
  : start_time_ (0),
    load_ (0),
    iter_ (0),
@@ -22,7 +22,7 @@ Thread_Task::Thread_Task (void)
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   try
     {
@@ -34,7 +34,7 @@ Thread_Task::svc (void)
         }
 
       const char * name = 0;
-      CORBA::Policy_var implicit_sched_param = CORBA::Policy::_duplicate (sched_param_.in ());;
+      CORBA::Policy_var implicit_sched_param = CORBA::Policy::_duplicate (sched_param_.in ());
       this->current_->begin_scheduling_segment (name,
                                                 sched_param_.in (),
                                                 implicit_sched_param.in ());
@@ -72,26 +72,26 @@ Thread_Task::svc (void)
 }
 
 int
-Thread_Task::importance (void)
+Thread_Task::importance ()
 {
   return this->importance_;
 }
 
 time_t
-Thread_Task::start_time (void)
+Thread_Task::start_time ()
 {
   return this->start_time_;
 }
 
 int
-Thread_Task::perform_task (void)
+Thread_Task::perform_task ()
 {
   return 0;
 }
 
 
 const char*
-Thread_Task::job (void)
+Thread_Task::job ()
 {
   return job_name_.in ();
 }
@@ -103,13 +103,13 @@ Thread_Task::job (Job_ptr job)
 }
 
 int
-Thread_Task::dist (void)
+Thread_Task::dist ()
 {
   return this->dist_;
 }
 
 void
-Thread_Task::dump_stats (void)
+Thread_Task::dump_stats ()
 {
   ACE_TCHAR fname [BUFSIZ];
   ACE_OS::sprintf (fname,
diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h
index 0079d0e256e..cab325d8eff 100644
--- a/TAO/examples/RTScheduling/Thread_Task.h
+++ b/TAO/examples/RTScheduling/Thread_Task.h
@@ -13,30 +13,29 @@ class DT_Creator;
 class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
-
-  Thread_Task (void);
+  Thread_Task ();
 
   virtual int activate_task (RTScheduling::Current_ptr current,
                              CORBA::Policy_ptr sched_param,
                              long flags,
                              ACE_Time_Value* base_time) = 0;
 
-  virtual int perform_task (void);
+  virtual int perform_task ();
 
-  int importance (void);
+  int importance ();
 
-  time_t start_time (void);
+  time_t start_time ();
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
-  const char* job (void);
+  const char* job ();
 
   /// Sets the Job to exec.
   void job (Job_ptr job);
 
-  int dist (void);
+  int dist ();
 
-  void dump_stats (void);
+  void dump_stats ();
 
  protected:
   /// task svc
diff --git a/TAO/examples/Simple/README b/TAO/examples/Simple/README
index cfbe463828f..5263520a1a0 100644
--- a/TAO/examples/Simple/README
+++ b/TAO/examples/Simple/README
@@ -1,28 +1,26 @@
-
-
 This directory contains a number of very simple tests, which also
 illustrate how to write canonical Orbix/VisiBroker/OmniORB examples in
 TAO using standard CORBA features rather than proprietary ORB
 features.  The individual directories contain READMEs on how to run
 the following tests:
 
-        . bank
+. bank
 
-          This directory implements the canonical VisiBroker
-          test.
+  This directory implements the canonical VisiBroker
+  test.
 
-        . chat
+. chat
 
-          This directory implements an ORBacus test.
+  This directory implements an ORBacus test.
 
-        . echo
+. echo
 
-          This directory implements the canonical omniORB test.
+  This directory implements the canonical omniORB test.
 
-        . grid
+. grid
 
-          This directory implements the canonical Orbix test.
+  This directory implements the canonical Orbix test.
 
-        . time
+. time
 
-          This directory implements a simple time/date test.
+  This directory implements a simple time/date test.
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 131ecc962d1..3958418597a 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -11,7 +11,7 @@
 
 // Constructor.
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : servant_ (0)
   , ior_output_file_ (0)
   , naming_ (0)
@@ -24,15 +24,9 @@ Server<Servant>::Server (void)
   this->servant_ = tmp;
 }
 
-// Destructor.
-template <class Servant>
-Server<Servant>::~Server (void)
-{
-}
-
 // Parse the command-line arguments and set options.
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_,
                         ACE_TEXT ("do:ni:"), 1, 0,
@@ -192,7 +186,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
   // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -250,11 +244,10 @@ Server<Servant>::register_name (const char *name)
 
 // Constructor.
 template <class ServerInterface>
-Client<ServerInterface>::Client (void)
+Client<ServerInterface>::Client ()
   : ior_ ("")
   , do_shutdown_ (0)
 {
-  //no-op
 }
 
 // Reads the Server ior from a file
@@ -290,7 +283,7 @@ Client<ServerInterface>::read_ior (ACE_TCHAR *filename)
 
 // Parses the command line arguments and returns an error status.
 template <class ServerInterface> int
-Client<ServerInterface>::parse_args (void)
+Client<ServerInterface>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_,
                         ACE_TEXT ("df:nk:x"), 1, 0,
@@ -341,7 +334,7 @@ Client<ServerInterface>::parse_args (void)
 }
 
 template <class ServerInterface>
-Client<ServerInterface>::~Client (void)
+Client<ServerInterface>::~Client ()
 {
   this->orb_->destroy ();
 }
@@ -394,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)
     {
@@ -443,7 +434,7 @@ Client<ServerInterface>::obtain_initial_references (const char *name)
 }
 
 template <class ServerInterface> int
-Client<ServerInterface>::do_shutdown (void)
+Client<ServerInterface>::do_shutdown ()
 {
   // Returns the shutdwon flag
   return this->do_shutdown_;
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index b2df4e6925a..51319b172f1 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -35,10 +35,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server () = default;
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -51,7 +51,7 @@ public:
   int register_name (const char *name);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Ignore this method if you are not testing the InterOperable
   /// Naming Service.
@@ -59,7 +59,7 @@ public:
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// A holder of the servant that does ref counting for him.
   typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var;
@@ -102,10 +102,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name, int argc, ACE_TCHAR *argv[]);
@@ -114,7 +114,7 @@ public:
   ServerInterface *operator-> () { return server_.in (); }
 
   /// Returns the shutdown flag.
-  int do_shutdown (void);
+  int do_shutdown ();
 
   /// Fills in the shutdwon flag.
   void do_shutdown (int);
@@ -122,7 +122,7 @@ public:
   /// Initialize naming service
   int obtain_initial_references (const char *name);
 
-  CORBA::ORB_ptr orb (void)
+  CORBA::ORB_ptr orb ()
     {
       return CORBA::ORB::_duplicate (this->orb_.in ());
     }
@@ -132,7 +132,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
@@ -141,10 +141,10 @@ private:
   TAO_Naming_Client naming_client_;
 
   /// # of arguments on the command line.
-  int argc_;
+  int argc_ {};
 
   /// arguments from command line.
-  ACE_TCHAR **argv_;
+  ACE_TCHAR **argv_ {};
 
   /// IOR of the obj ref of the server.
   ACE_CString ior_;
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 35010cece90..7cd2405208e 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -4,13 +4,13 @@
 #include "tao/Utils/ORB_Manager.h"
 
 // Constructor
-AccountManager_i::AccountManager_i (void) :
+AccountManager_i::AccountManager_i () :
   orb_manager_ (0)
 {
 }
 
 // Destructor
-AccountManager_i::~AccountManager_i (void)
+AccountManager_i::~AccountManager_i ()
 {
 }
 
@@ -114,7 +114,7 @@ AccountManager_i::close (Bank::Account_ptr account)
 }
 
 void
-AccountManager_i::shutdown (void)
+AccountManager_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n[SERVER] Process/Thread Id : (%P/%t) AccountManager_i is shutting down\n")));
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index b18f8c00829..a948759e161 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -45,10 +45,10 @@ class AccountManager_i : public POA_Bank::AccountManager
 {
 public:
   /// Constructor.
-  AccountManager_i (void);
+  AccountManager_i ();
 
   /// Destructor.
-  virtual ~AccountManager_i (void);
+  virtual ~AccountManager_i ();
 
   /// Return the Account interface with the given name from the server.
   /// Put the initial balance specified in the new account.
@@ -59,7 +59,7 @@ public:
   virtual void close (Bank::Account_ptr);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index e301f7fab97..5b2fb3a7954 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -1,7 +1,7 @@
 #include "Account_i.h"
 
 // Constructor
-Account_i::Account_i (void)
+Account_i::Account_i ()
 {
 }
 
@@ -13,7 +13,7 @@ Account_i::Account_i (const char *name,
 }
 
 // Destructor
-Account_i::~Account_i (void)
+Account_i::~Account_i ()
 {
 }
 
@@ -26,7 +26,7 @@ Account_i::orb (CORBA::ORB_ptr o)
 
 // Return the current balance on the server.
 CORBA::Float
-Account_i::balance (void)
+Account_i::balance ()
 {
   return balance_;
 }
@@ -47,7 +47,7 @@ Account_i::withdraw (CORBA::Float withdrawl)
 }
 
 char *
-Account_i::name (void)
+Account_i::name ()
 {
   return CORBA::string_dup (this->name_.in ());
 }
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index bbdfa6775ac..9e20a47f7b2 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -29,19 +29,19 @@ class Account_i : public POA_Bank::Account
 {
 public:
   /// Constructor.
-  Account_i (void);
+  Account_i ();
 
   /// Constructor.
   Account_i (const char *, CORBA::Float);
 
   /// Destructor.
-  virtual ~Account_i (void);
+  virtual ~Account_i ();
 
   /// Get the current balance in the account.
-  virtual CORBA::Float balance (void);
+  virtual CORBA::Float balance ();
 
   /// Get the name of the <Account> holder.
-  virtual char *name (void);
+  virtual char *name ();
 
   /// Set the name of the <Account> holder.
   virtual void name (const char *name);
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index 11d6d825e94..6192e1b171b 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -6,13 +6,13 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Bank_Client_i::Bank_Client_i (void)
+Bank_Client_i::Bank_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Bank_Client_i::~Bank_Client_i (void)
+Bank_Client_i::~Bank_Client_i ()
 {
   //no-op
 }
@@ -42,7 +42,7 @@ Bank_Client_i::run (const char *name,
 }
 
 int
-Bank_Client_i::check_accounts (void)
+Bank_Client_i::check_accounts ()
 {
   try
     {
@@ -69,9 +69,8 @@ Bank_Client_i::check_accounts (void)
 // This method tests whether an account with a
 // a same name can be opened
 void
-Bank_Client_i::test_for_same_name (void)
+Bank_Client_i::test_for_same_name ()
 {
-
   const char *name = "Name";
   CORBA::Float initial_bal = 0.00;
 
@@ -88,7 +87,7 @@ Bank_Client_i::test_for_same_name (void)
 
 // This method tests whether an account with different names can be opened
 void
-Bank_Client_i::test_for_different_name (void)
+Bank_Client_i::test_for_different_name ()
 {
   const char *name1 = "Name1";
   const char *name2 = "Name2";
@@ -109,7 +108,7 @@ Bank_Client_i::test_for_different_name (void)
 
 // This method tests the Overdraft exception.
 void
-Bank_Client_i::test_for_overdraft (void)
+Bank_Client_i::test_for_overdraft ()
 {
   CORBA::Float initial_bal = 100.0;
   const char *name = "Name";
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h
index 944707d5e36..7d040afd661 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.h
+++ b/TAO/examples/Simple/bank/Bank_Client_i.h
@@ -29,29 +29,29 @@ class Bank_Client_i
 {
 public:
   /// Constructor
-  Bank_Client_i (void);
+  Bank_Client_i ();
 
   /// Destructor
-  ~Bank_Client_i (void);
+  ~Bank_Client_i ();
 
   /// Execute the methods.
   int run (const char *, int, ACE_TCHAR *[]);
 
 private:
   /// Method that calls all the test functions
-  int check_accounts (void);
+  int check_accounts ();
 
   /// Tests if accounts opened with different names return a different account
   /// reference.
-  void test_for_different_name (void);
+  void test_for_different_name ();
 
   /// Tests if accounts opened with the same name return the same
   /// object reference.
-  void test_for_same_name (void);
+  void test_for_same_name ();
 
   /// Tests for the Overdraft Exception when the client tries to
   /// withdraw more money than the current balance.
-  void test_for_overdraft (void);
+  void test_for_overdraft ();
 
   /// Instantiate the client object.
   Client<Bank::AccountManager> client_;
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index f500dbf99c1..bb8f3451a21 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    Broadcaster_i.cpp
@@ -10,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "Broadcaster_i.h"
 
 bool
@@ -25,16 +23,6 @@ Broadcaster_i::Receiver_Data::operator == (const Broadcaster_i::Receiver_Data &r
     && this->nickname_ == receiver_data.nickname_;
 }
 
-Broadcaster_i::Broadcaster_i (void)
-{
-  // No-op
-}
-
-Broadcaster_i::~Broadcaster_i (void)
-{
-  // No-op
-}
-
 void
 Broadcaster_i::add (Receiver_ptr receiver,
                     const char *nickname)
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index 1bf825d1d54..8ba5d447ccc 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -35,10 +35,10 @@ class Broadcaster_i : public POA_Broadcaster
 {
 public:
   /// Constructor.
-  Broadcaster_i (void);
+  Broadcaster_i () = default;
 
   /// Destructor.
-  virtual ~Broadcaster_i (void);
+  virtual ~Broadcaster_i () = default;
 
   /// Saves receiver references in a list.
   virtual void add (Receiver_ptr receiver,
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index f5773f4e00a..714bebc94c0 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -118,7 +118,7 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client_i::run (void)
+Client_i::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n============= Simple Chat =================\n")
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index c9c8d33be78..beb17fffb9d 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -40,13 +40,13 @@ class Client_i : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Client_i (void);
+  Client_i ();
 
   /// Initialize the client communication with the server.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Start the ORB object.
-  int run (void);
+  int run ();
 
   /// Handle the user input.
   virtual int handle_input (ACE_HANDLE);
diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp
index cfebe82f8eb..23aec18bea5 100644
--- a/TAO/examples/Simple/chat/Receiver_i.cpp
+++ b/TAO/examples/Simple/chat/Receiver_i.cpp
@@ -12,12 +12,12 @@
 
 #include "Receiver_i.h"
 
-Receiver_i::Receiver_i (void)
+Receiver_i::Receiver_i ()
   : orb_ (0)
 {
 }
 
-Receiver_i::~Receiver_i (void)
+Receiver_i::~Receiver_i ()
 {
 }
 
@@ -30,7 +30,7 @@ Receiver_i::message (const char *msg)
 }
 
 void
-Receiver_i::shutdown (void)
+Receiver_i::shutdown ()
 {
   // Instruct the ORB to shutdown.
   this->orb_->shutdown ();
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index 1f9fa39a46a..8a552707ea8 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -27,10 +27,10 @@ class Receiver_i : public POA_Receiver
 {
 public:
   /// Constructor.
-  Receiver_i (void);
+  Receiver_i ();
 
   /// Destructor.
-  virtual ~Receiver_i (void);
+  virtual ~Receiver_i ();
 
   /// Receives a message string.
   virtual void message (const char *msg);
@@ -40,7 +40,7 @@ public:
    * implementation should shutdown the chat client in response to
    * this.
    */
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index c62fb1f7bb7..6628b345992 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -24,7 +24,7 @@ Server_i::Server_i ()
   this->broadcaster_i_ = tmp;
 }
 
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
   // NO Op.
 }
@@ -82,7 +82,7 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Running chat server...\n")));
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 232234e6726..b0b0a020a87 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -26,20 +26,19 @@
  */
 class Server_i
 {
-
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Destructor.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialize the server.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the command line arguments.
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index 8d90bd5c998..09e18be9865 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -5,18 +5,6 @@
 
 // This is the interface program that accesses the remote object
 
-// Constructor.
-Echo_Client_i::Echo_Client_i (void)
-{
-  //no-op
-}
-
-//Destructor.
-Echo_Client_i::~Echo_Client_i (void)
-{
-  //no-op
-}
-
 int
 Echo_Client_i::run (const char *name,
                     int argc,
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.h b/TAO/examples/Simple/echo/Echo_Client_i.h
index 8f923282d13..7596f0883ad 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.h
+++ b/TAO/examples/Simple/echo/Echo_Client_i.h
@@ -29,10 +29,10 @@ class Echo_Client_i
 {
 public:
   /// Constructor
-  Echo_Client_i (void);
+  Echo_Client_i () = default;
 
   /// Destructor
-  ~Echo_Client_i (void);
+  ~Echo_Client_i () = default;
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index c96b220634c..c32847e6c1c 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -1,19 +1,6 @@
 #include "Echo_i.h"
 
-// Constructor.
-
-Echo_i::Echo_i (void)
-{
-}
-
-// Destructor.
-
-Echo_i::~Echo_i (void)
-{
-}
-
 // Set the ORB pointer.
-
 void
 Echo_i::orb (CORBA::ORB_ptr o)
 {
@@ -21,7 +8,6 @@ Echo_i::orb (CORBA::ORB_ptr o)
 }
 
 // Return a list of object references.
-
 Echo::List *
 Echo_i::echo_list (const char *)
 {
@@ -44,7 +30,7 @@ Echo_i::echo_list (const char *)
     orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(1)] =
-    orb_->resolve_initial_references ("NameService");;
+    orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(2)] =
     orb_->resolve_initial_references ("NameService");
@@ -80,7 +66,7 @@ Echo_i::echo_string (const char *mesg)
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (void)
+Echo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe echo server is shutting down\n")));
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 24041f3ee2b..88a6fee506e 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -30,10 +30,10 @@ class Echo_i : public POA_Echo
 {
 public:
   /// Constructor.
-  Echo_i (void);
+  Echo_i () = default;
 
   /// Destructor.
-  virtual ~Echo_i (void);
+  virtual ~Echo_i () = default;
 
   /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
@@ -42,7 +42,7 @@ public:
   virtual char *echo_string (const char *mesg);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index c3405df96d7..d9f89666569 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -7,7 +7,7 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Grid_Client_i::Grid_Client_i (void)
+Grid_Client_i::Grid_Client_i ()
   : height_ (0),
     width_ (0),
     setx_ (0),
@@ -19,7 +19,7 @@ Grid_Client_i::Grid_Client_i (void)
 }
 
 //Destructor.
-Grid_Client_i::~Grid_Client_i (void)
+Grid_Client_i::~Grid_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h
index f95daa5c4c6..766f70ea17d 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.h
+++ b/TAO/examples/Simple/grid/Grid_Client_i.h
@@ -29,10 +29,10 @@ class Grid_Client_i
 {
 public:
   /// Constructor
-  Grid_Client_i (void);
+  Grid_Client_i ();
 
   /// Destructor
-  ~Grid_Client_i (void);
+  ~Grid_Client_i ();
 
   /// Execute the methods.
   int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 52419e2f08b..3fa4a1fcd6c 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -10,7 +10,7 @@ Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b)
 }
 
 // Default constructor.
-Grid_i::Grid_i (void)
+Grid_i::Grid_i ()
   : width_ (0),
     height_ (0),
     array_ (0)
@@ -28,7 +28,7 @@ Grid_i::Grid_i (CORBA::Short x,
 }
 
 // Default destructor.
-Grid_i::~Grid_i (void)
+Grid_i::~Grid_i ()
 {
 }
 
@@ -71,13 +71,13 @@ Grid_i::get (CORBA::Short x,
 
 // Access methods.
 CORBA::Short
-Grid_i::width (void)
+Grid_i::width ()
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (void)
+Grid_i::height ()
 {
   return this->height_;
 }
@@ -118,7 +118,7 @@ Grid_i::height (CORBA::Short y)
 
 // Destroy the grid
 void
-Grid_i::destroy (void)
+Grid_i::destroy ()
 {
   // Delete the array.
   ACE_Auto_Array_Ptr<CORBA::Long> tmp (this->array_.release ());
@@ -150,7 +150,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (void)
+Grid_Factory_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Grid Factory is shutting down\n")));
@@ -160,12 +160,12 @@ Grid_Factory_i::shutdown (void)
 }
 
 // Constructor
-Grid_Factory_i::Grid_Factory_i (void)
+Grid_Factory_i::Grid_Factory_i ()
 {
 }
 
 // Destructor
-Grid_Factory_i::~Grid_Factory_i (void)
+Grid_Factory_i::~Grid_Factory_i ()
 {
 }
 
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 8b44630bf84..6d85fddce5d 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -27,20 +27,20 @@ class Grid_i: public POA_Grid
 {
 public:
   /// Constructor
-  Grid_i (void);
+  Grid_i ();
 
   /// Constructor.
   Grid_i (CORBA::Short,
           CORBA::Short);
 
   /// Destructor
-  virtual ~Grid_i (void);
+  virtual ~Grid_i ();
 
   /// Returns the width of the grid
-  virtual CORBA::Short width (void);
+  virtual CORBA::Short width ();
 
   /// Returns the height of the grid
-  virtual CORBA::Short height (void);
+  virtual CORBA::Short height ();
 
   /// Sets the width of the grid.
   virtual void width (CORBA::Short);
@@ -58,7 +58,7 @@ public:
                            CORBA::Short);
 
   /// Destroy the grid.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// Allocates array
@@ -87,17 +87,17 @@ class Grid_Factory_i : public POA_Grid_Factory
 {
 public:
   /// Constructor.
-  Grid_Factory_i (void);
+  Grid_Factory_i ();
 
   /// Destructor.
-  virtual ~Grid_Factory_i (void);
+  virtual ~Grid_Factory_i ();
 
   /// This function creates and returns a <Grid>.
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 935af26ce7c..d1f3f806107 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -17,7 +17,7 @@
 
 
 ACE_Reactor *
-My_Resource_Factory::get_reactor (void)
+My_Resource_Factory::get_reactor ()
 {
 #if defined (ACE_HAS_THREADS)
   // Use whatever the default is if we've got threads.
@@ -31,7 +31,7 @@ My_Resource_Factory::get_reactor (void)
 ACE_FACTORY_DEFINE (Alt_Resource_Factory, My_Resource_Factory)
 
 int
-DLL_ORB::svc (void)
+DLL_ORB::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\tRunning ORB event loop (%t)\n\n")));
@@ -111,7 +111,7 @@ DLL_ORB::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-DLL_ORB::fini (void)
+DLL_ORB::fini ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\tFinalizing the service (%t)\n\n")));
@@ -119,7 +119,7 @@ DLL_ORB::fini (void)
   // return 0;
 }
 
-Time_Date_Servant::Time_Date_Servant (void)
+Time_Date_Servant::Time_Date_Servant ()
   : servant_ (0)
   , ior_output_file_ (0)
   , orb_ ("")
diff --git a/TAO/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h
index fb63add9109..1e109e22091 100644
--- a/TAO/examples/Simple/time-date/Time_Date.h
+++ b/TAO/examples/Simple/time-date/Time_Date.h
@@ -21,7 +21,7 @@ class Alt_Resource_Factory_Export My_Resource_Factory
 {
 public:
   /// Return the @c ACE_Reactor that will be utilized by the ORB.
-  virtual ACE_Reactor *get_reactor (void);
+  virtual ACE_Reactor *get_reactor ();
 };
 
 ACE_FACTORY_DECLARE (Alt_Resource_Factory, My_Resource_Factory)
@@ -66,7 +66,7 @@ class ACE_Svc_Export Time_Date_Servant : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  Time_Date_Servant (void);
+  Time_Date_Servant ();
 
   /// Initialize the @c Time_Date servant.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index 346a83df81f..8197bff6401 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -5,12 +5,12 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Time_Date_Client_i::Time_Date_Client_i (void)
+Time_Date_Client_i::Time_Date_Client_i ()
 {
 }
 
 //Destructor.
-Time_Date_Client_i::~Time_Date_Client_i (void)
+Time_Date_Client_i::~Time_Date_Client_i ()
 {
 }
 
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.h b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
index 9a5df732376..65b745ae5db 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
@@ -29,10 +29,10 @@ class Time_Date_Client_i
 {
 public:
   /// Constructor
-  Time_Date_Client_i (void);
+  Time_Date_Client_i ();
 
   /// Destructor
-  virtual ~Time_Date_Client_i (void);
+  virtual ~Time_Date_Client_i ();
 
   /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index 05d0a085854..d19532eb481 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -21,7 +21,7 @@ Time_Date_i::str_date (CORBA::String_out time_date)
 
 // Shutdown.
 void
-Time_Date_i::shutdown (void)
+Time_Date_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Time_Date_i is shutting down\n")));
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
index 9fccb9e978d..1b6f7347fed 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_i.h
@@ -32,7 +32,7 @@ public:
   virtual void str_date (CORBA::String_out time_date);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// ORB pointer.
   void orb (CORBA::ORB_ptr orb_ptr);
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index 43c46e20502..2ffb6c48a35 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -4,13 +4,13 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Time_Client_i::Time_Client_i (void)
+Time_Client_i::Time_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Time_Client_i::~Time_Client_i (void)
+Time_Client_i::~Time_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/examples/Simple/time/Time_Client_i.h b/TAO/examples/Simple/time/Time_Client_i.h
index a1d995efd7c..4f5540a0964 100644
--- a/TAO/examples/Simple/time/Time_Client_i.h
+++ b/TAO/examples/Simple/time/Time_Client_i.h
@@ -29,10 +29,10 @@ class Time_Client_i
 {
 public:
   /// Constructor
-  Time_Client_i (void);
+  Time_Client_i ();
 
   /// Destructor
-  ~Time_Client_i (void);
+  ~Time_Client_i ();
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR**);
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 65dd56da074..da2012edaef 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -2,12 +2,12 @@
 #include "ace/OS_NS_time.h"
 
 // Constructor
-Time_i::Time_i (void)
+Time_i::Time_i ()
 {
 }
 
 // Destructor
-Time_i::~Time_i (void)
+Time_i::~Time_i ()
 {
 }
 
@@ -20,14 +20,14 @@ Time_i::orb (CORBA::ORB_ptr o)
 
 // Return the current date/time on the server.
 CORBA::Long
-Time_i::current_time (void)
+Time_i::current_time ()
 {
   return CORBA::Long (ACE_OS::time (0));
 }
 
 // Shutdown.
 void
-Time_i::shutdown (void)
+Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Time_i is shutting down\n")));
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index a3c9556d137..9a990e976be 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -29,16 +29,16 @@ class Time_i: public POA_Time
 {
 public:
   /// Constructor
-  Time_i (void);
+  Time_i ();
 
   /// Destructor
-  virtual ~Time_i (void);
+  virtual ~Time_i ();
 
   /// Return the current time/date on the server
-  virtual CORBA::Long current_time (void);
+  virtual CORBA::Long current_time ();
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java b/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
index 45585394930..b51db25c427 100644
--- a/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
+++ b/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
@@ -318,7 +318,7 @@ public class NavWeapDataHandler implements DataHandler {
             weapons_.deadline_time += event.header.creation_time;
           }
 
-	WeaponsObservable wobs = (WeaponsObservable)ObservablesTable.get ("Weapons");;
+	WeaponsObservable wobs = (WeaponsObservable)ObservablesTable.get ("Weapons");
 	wobs.updateWeapons (weapons_);
 	Cpu_UsageObservable cobs = (Cpu_UsageObservable)ObservablesTable.get ("CPU Usage");
 	cobs.updateCpu_Usage (weapons_.utilization);
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index 750be01de8b..9514648ec52 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -54,13 +54,12 @@ DOVE_Supplier::~DOVE_Supplier ()
   delete [] this->connection_params_list_;
 
   delete internal_DOVE_Supplier_ptr_;
-
 }
 
 // Initialize the ORB and the connection to the Name Service
 
 int
-DOVE_Supplier::init (void)
+DOVE_Supplier::init ()
 {
   try
   {
@@ -206,7 +205,6 @@ DOVE_Supplier::connect (const char* MIB_name,
     }
 
   return 0;
-
 }
 
 
@@ -303,7 +301,6 @@ DOVE_Supplier::use_prev_connection ()
 }
 
 
-
 // -------------------- Internal Demo Supplier -----------------------------
 
 DOVE_Supplier::Internal_DOVE_Supplier::Internal_DOVE_Supplier (DOVE_Supplier *impl_ptr)
@@ -400,7 +397,6 @@ DOVE_Supplier::connect_Supplier ()
            static_cast<RtecScheduler::Info_Type_t> (this->current_connection_params_->pod_rt_info_.info_type));
 
 
-
     // Set the publications to report them to the event channel.
 
     CORBA::Short x = 0;
@@ -442,7 +438,6 @@ DOVE_Supplier::connect_Supplier ()
   }
 
   return 0;
-
 }
 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 3fa707d27e8..8fb279a321d 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -30,15 +30,14 @@
 class DOVE_Supplier
 {
 public:
-
   /// Constructor.
   DOVE_Supplier ();
 
   /// Destructor.
-  ~DOVE_Supplier (void);
+  ~DOVE_Supplier ();
 
   /// Initialize the ORB and the connection to the Name Service
-  int init (void);
+  int init ();
 
   /// Connect to the event service.
   int connect (const char * MIB_name = 0,
@@ -62,7 +61,6 @@ public:
   void use_prev_connection ();
 
 private:
-
   // The following Supplier is needed because DOVE_Supplier has not
   // inherited from PushSupplier.
 
@@ -71,20 +69,17 @@ private:
     friend class DOVE_Supplier;
 
   public:
-
-    virtual void disconnect_push_supplier (void)
+    virtual void disconnect_push_supplier ()
     {
     }
 
   private:
-
     Internal_DOVE_Supplier (DOVE_Supplier* impl_ptr);
 
     DOVE_Supplier* impl_ptr_;
   };
 
 private:
-
   struct Connection_Params
   {
     const char * es_name_;
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index fb2b427f324..5eaee1f34e9 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)
   {
@@ -266,7 +265,7 @@ DualEC_Supplier::init ()
 // Private class that implements a termination servant.
 
 void
-DualEC_Supplier::Terminator::shutdown (void)
+DualEC_Supplier::Terminator::shutdown ()
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
@@ -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&)
     {
@@ -431,12 +426,11 @@ DualEC_Supplier::run_weap_thread (void *arg)
 }
 
 
-
 // Create two scheduling service instances, register
 // them with the Naming Service.
 
 int
-DualEC_Supplier::create_schedulers (void)
+DualEC_Supplier::create_schedulers ()
 {
   // @@TBD - look at a command line modified setting,
   // create either a runtime or a config scheduler for
@@ -548,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)
@@ -566,7 +558,7 @@ DualEC_Supplier::create_schedulers (void)
 // them with the Naming Service.
 
 int
-DualEC_Supplier::create_event_channels (void)
+DualEC_Supplier::create_event_channels ()
 {
   try
     {
@@ -601,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)
   {
@@ -613,7 +604,7 @@ DualEC_Supplier::create_event_channels (void)
 }
 
 void
-DualEC_Supplier::compute_schedules (void)
+DualEC_Supplier::compute_schedules ()
 {
   try
     {
@@ -662,7 +653,7 @@ DualEC_Supplier::compute_schedules (void)
 }
 
 void
-DualEC_Supplier::start_generating_events (void)
+DualEC_Supplier::start_generating_events ()
 {
   try
     {
@@ -1032,7 +1023,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
 
-
   try
     {
       // Initialize ORB.
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index e9df243f731..cc5dc5f289f 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -50,29 +50,27 @@ struct Schedule_Viewer_Data
 class DualEC_Supplier
 {
 public:
-
   DualEC_Supplier (int argc, ACE_TCHAR** argv);
 
-  ~DualEC_Supplier (void);
+  ~DualEC_Supplier ();
 
   /// Initialize: set up, resolve ORB services,
   /// connect the DOVE_Suppliers.
-  int init (void);
+  int init ();
 
   /// Compute schedule priorities, possibly dump
   /// data into runtime scheduler header files.
-  void compute_schedules (void);
+  void compute_schedules ();
 
   /// here is really something going on,
   /// here we deliver the messages
-  void start_generating_events (void);
+  void start_generating_events ();
 
   /// Load the scheduling information into memory
   void load_schedule_data ();
 
 
 private:
-
 /**
  * @class Terminator
  *
@@ -80,7 +78,7 @@ private:
  */
   class Terminator : public POA_NavWeapTerminator
   {
-    void shutdown (void);
+    void shutdown ();
   };
 
   /// Run the orb event loop.
@@ -94,11 +92,11 @@ private:
 
   /// Create two scheduling service instances, registers
   /// them with the Naming Service.
-  int create_schedulers (void);
+  int create_schedulers ();
 
   /// Create two event service instances, registers
   /// them with the Naming Service.
-  int create_event_channels (void);
+  int create_event_channels ();
 
   /// Get command line options.
   unsigned int get_options (int argc, ACE_TCHAR *argv []);
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 8b3f456d39c..a4559e8963c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -44,7 +44,7 @@ static int received = 0;
 
 // ************************************************************
 
-Demo_Consumer::Demo_Consumer (void)
+Demo_Consumer::Demo_Consumer ()
 {
 }
 
@@ -123,7 +123,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-Demo_Consumer::disconnect_push_consumer (void)
+Demo_Consumer::disconnect_push_consumer ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Consumer received disconnect from channel.\n"));
@@ -132,7 +132,6 @@ Demo_Consumer::disconnect_push_consumer (void)
 void
 Demo_Consumer::push (const RtecEventComm::EventSet &events)
 {
-
   if (events.length () == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "no events\n"));
@@ -194,7 +193,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Demo_Consumer::shutdown (void)
+Demo_Consumer::shutdown ()
 {
   try
     {
@@ -332,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_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index 5536e2fe442..377344095a7 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -32,7 +32,7 @@
 class Demo_Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
-  Demo_Consumer (void);
+  Demo_Consumer ();
 
   /**
    * Uses the name server to obtain a reference to the <supplier_name>
@@ -45,7 +45,7 @@ public:
                      const char *my_name);
 
   /// The channel is disconnecting.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = (not protected to allow short-circuiting) protected:
   /**
@@ -57,7 +57,7 @@ public:
 
 protected:
   /// Disconnect from the Event Service.
-  void shutdown (void);
+  void shutdown ();
 
   // = Event channel adminstration references.
   RtecEventChannelAdmin::EventChannel_var channel_admin_;
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 5afcf85c89c..984e5904e7b 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -56,7 +56,7 @@ Event_Supplier::init ()
 }
 
 void
-Event_Supplier::start_generating_events (void)
+Event_Supplier::start_generating_events ()
 {
   unsigned long total_sent = 0;
 
@@ -78,7 +78,6 @@ Event_Supplier::start_generating_events (void)
 
   do
   {
-
   // Insert the event data
     this->insert_event_data (any,
                              schedule_iter);
@@ -330,7 +329,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
       }
 
 
-
             if (last_completion > (*sched_data)->completion_time)
               last_completion = 0;
 
@@ -361,7 +359,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
 }
 
 
-
 // Function get_options.
 
 unsigned int
@@ -456,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/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
index 9b27ba8c1f6..a15bc247c4a 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
@@ -42,17 +42,16 @@ struct Schedule_Viewer_Data
 class Event_Supplier
 {
 public:
-
   Event_Supplier (int argc, ACE_TCHAR** argv);
 
-  ~Event_Supplier (void);
+  ~Event_Supplier ();
 
   /// connect the DOVE_Supplier
-  int init (void);
+  int init ();
 
   /// here is really something going on,
   /// here we deliver the messages
-  void start_generating_events (void);
+  void start_generating_events ();
 
   /// Load the scheduling information into memory
   void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 2f343983540..9cda0d5e84f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -69,7 +69,7 @@ Logging_Supplier::init ()
 }
 
 void
-Logging_Supplier::start_generating_events (void)
+Logging_Supplier::start_generating_events ()
 {
   unsigned long total_sent = 0;
 
@@ -91,7 +91,6 @@ Logging_Supplier::start_generating_events (void)
 
   do
   {
-
   // Insert the event data
     this->insert_event_data (any,
                              schedule_iter);
@@ -364,7 +363,6 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
       }
 
 
-
             if (last_completion > (*sched_data)->completion_time)
               last_completion = 0;
 
@@ -504,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/Simulator/Event_Supplier/Logging_Sup.h b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
index 3ebcc0dbf10..dc73fa496dc 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
@@ -43,17 +43,16 @@ struct Schedule_Viewer_Data
 class Logging_Supplier
 {
 public:
-
   Logging_Supplier (int argc, ACE_TCHAR** argv);
 
-  ~Logging_Supplier (void);
+  ~Logging_Supplier ();
 
   /// connect the DOVE_Supplier
-  int init (void);
+  int init ();
 
   /// here is really something going on,
   /// here we deliver the messages
-  void start_generating_events (void);
+  void start_generating_events ();
 
   /// Load the scheduling information into memory
   void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index ba0c21c4a93..bc39e1fb4b7 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -3,7 +3,6 @@
 #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
 
 
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
@@ -94,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/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp
index 276db75fa4a..27a05cdf666 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -14,7 +14,6 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
-
   try
     {
       // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
index 76222292423..3a96702b496 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -17,18 +17,17 @@
 #include "ace/Read_Buffer.h"
 
 // Constructor
-IOR_corbaloc_Client_i::IOR_corbaloc_Client_i (void)
+IOR_corbaloc_Client_i::IOR_corbaloc_Client_i ()
 {
 }
 
-IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void)
+IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i ()
 {
 }
 
 int
-IOR_corbaloc_Client_i::run (void)
+IOR_corbaloc_Client_i::run ()
 {
-
   try
     {
       CosNaming::Name name (1);
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
index 383cb71e21e..4cd6e443d85 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
@@ -28,14 +28,13 @@
  */
 class IOR_corbaloc_Client_i
 {
-
  public:
   // = Constructor and destructor.
-  IOR_corbaloc_Client_i (void);
-  ~IOR_corbaloc_Client_i (void);
+  IOR_corbaloc_Client_i ();
+  ~IOR_corbaloc_Client_i ();
 
   /// Execute the client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with the server.
   int init (int& argc, ACE_TCHAR *argv[]);
diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp
index d9e7c972a22..b61f0355899 100644
--- a/TAO/examples/ior_corbaloc/status_i.cpp
+++ b/TAO/examples/ior_corbaloc/status_i.cpp
@@ -7,7 +7,7 @@ corbaloc_Status_i::corbaloc_Status_i ()
 }
 
 CORBA::Boolean
-corbaloc_Status_i::print_status (void)
+corbaloc_Status_i::print_status ()
 {
   // If the server received the request from the client, return true
   // == 0;
diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h
index 59438b1b708..dbbd61f1d74 100644
--- a/TAO/examples/ior_corbaloc/status_i.h
+++ b/TAO/examples/ior_corbaloc/status_i.h
@@ -9,7 +9,7 @@ class corbaloc_Status_i : public POA_corbaloc::Status
 public:
   corbaloc_Status_i ();
 
-  CORBA::Boolean print_status (void);
+  CORBA::Boolean print_status ();
 
   void set_name (const char *name) { server_name_ = name; }
 
diff --git a/TAO/examples/mfc/MainFrm.h b/TAO/examples/mfc/MainFrm.h
index 2e29e9f9c81..cfdeaa6c135 100644
--- a/TAO/examples/mfc/MainFrm.h
+++ b/TAO/examples/mfc/MainFrm.h
@@ -17,10 +17,8 @@ protected: // create from serialization only
 
 // Attributes
 public:
-
 // Operations
 public:
-
 // Overrides
   // ClassWizard generated virtual function overrides
   //{{AFX_VIRTUAL(CMainFrame)
diff --git a/TAO/examples/mfc/StdAfx.cpp b/TAO/examples/mfc/StdAfx.cpp
index bd1211b1c68..f02b85711c1 100644
--- a/TAO/examples/mfc/StdAfx.cpp
+++ b/TAO/examples/mfc/StdAfx.cpp
@@ -5,4 +5,3 @@
 #include "stdafx.h"
 
 
-
diff --git a/TAO/examples/mfc/serverDoc.h b/TAO/examples/mfc/serverDoc.h
index 7abfa6f910a..d8761b778ee 100644
--- a/TAO/examples/mfc/serverDoc.h
+++ b/TAO/examples/mfc/serverDoc.h
@@ -18,10 +18,8 @@ protected: // create from serialization only
 
 // Attributes
 public:
-
 // Operations
 public:
-
 // Overrides
 // ClassWizard generated virtual function overrides
 //{{AFX_VIRTUAL(CServerDoc)
@@ -39,7 +37,6 @@ public:
 #endif
 
 protected:
-
 // Generated message map functions
 protected:
   //{{AFX_MSG(CServerDoc)
diff --git a/TAO/examples/mfc/serverView.h b/TAO/examples/mfc/serverView.h
index 25c5a1714be..89f879ba3ee 100644
--- a/TAO/examples/mfc/serverView.h
+++ b/TAO/examples/mfc/serverView.h
@@ -22,7 +22,6 @@ public:
 
 // Operations
 public:
-
 // Overrides
 // ClassWizard generated virtual function overrides
 //{{AFX_VIRTUAL(CServerView)
@@ -44,7 +43,6 @@ public:
 #endif
 
 protected:
-
 // Generated message map functions
 protected:
   //{{AFX_MSG(CServerView)
diff --git a/TAO/examples/mfc/w32_test_impl.cpp b/TAO/examples/mfc/w32_test_impl.cpp
index eecacc3dbc4..d6b722b20c2 100644
--- a/TAO/examples/mfc/w32_test_impl.cpp
+++ b/TAO/examples/mfc/w32_test_impl.cpp
@@ -2,11 +2,11 @@
 
 #include "w32_test_impl.h"
 
-W32_Test_Impl::~W32_Test_Impl (void)
+W32_Test_Impl::~W32_Test_Impl ()
 {
 }
 
-W32_Test_Impl::W32_Test_Impl (void)
+W32_Test_Impl::W32_Test_Impl ()
 {
   blabla = 1;
 }
diff --git a/TAO/examples/mfc/w32_test_impl.h b/TAO/examples/mfc/w32_test_impl.h
index 1022be5cf40..386c775b173 100644
--- a/TAO/examples/mfc/w32_test_impl.h
+++ b/TAO/examples/mfc/w32_test_impl.h
@@ -6,9 +6,9 @@
 class W32_Test_Impl : public POA_W32_Test_Interface
 {
 public:
-  ~W32_Test_Impl (void);
+  ~W32_Test_Impl ();
 
-  W32_Test_Impl (void);
+  W32_Test_Impl ();
 
   char *getresponse (CORBA::Long respnr);
 
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp
index c6ff430c4fb..903fee8cbe5 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp
@@ -156,7 +156,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // struct tests
   try
     {
-
       Demo::BaseStruct foo1;
       foo1.str = CORBA::string_dup("BaseStruct 1");
 
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
index b0c7a59fe9c..9d2c8faa312 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
@@ -32,12 +32,12 @@
 #include "ace/Log_Msg.h"
 
 // Implementation skeleton constructor
-ATC_Test_i::ATC_Test_i (void)
+ATC_Test_i::ATC_Test_i ()
 {
 }
 
 // Implementation skeleton destructor
-ATC_Test_i::~ATC_Test_i (void)
+ATC_Test_i::~ATC_Test_i ()
 {
 }
 
@@ -166,7 +166,7 @@ ATC_Test_i::do_value (const ::CORBA::Any & a)
 }
 
 void
-ATC_Test_i::shutdown (void)
+ATC_Test_i::shutdown ()
 {
   int argc = 0;
   ACE_TCHAR **argv = 0;
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
index c04236e94ea..33eac69ba61 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
@@ -38,16 +38,15 @@
 class  ATC_Test_i : public virtual POA_Demo::ATC_Test
 {
 public:
-  ATC_Test_i (void);
+  ATC_Test_i ();
 
-  virtual ~ATC_Test_i (void);
+  virtual ~ATC_Test_i ();
 
   virtual char * do_union (const ::CORBA::Any & a);
   virtual char * do_struct (const ::CORBA::Any & a);
   virtual char * do_value (const ::CORBA::Any & a);
 
-  virtual void shutdown (void);
-
+  virtual void shutdown ();
 };
 
 
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
index 1eee8431332..89dfd4b0c93 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
@@ -2,7 +2,7 @@
 #include "NestedValueImpl.h"
 
 CORBA::ValueBase*
-Demo_NestedValueFactory::create_for_unmarshal (void)
+Demo_NestedValueFactory::create_for_unmarshal ()
 {
   return new Demo_NestedValueImpl ();
 }
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
index 0ae211131d8..260dc8111c4 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
@@ -1,15 +1,15 @@
 #include "NestedValueImpl.h"
 
-Demo_NestedValueImpl::Demo_NestedValueImpl (void)
+Demo_NestedValueImpl::Demo_NestedValueImpl ()
 {
 }
 
-Demo_NestedValueImpl::~Demo_NestedValueImpl (void)
+Demo_NestedValueImpl::~Demo_NestedValueImpl ()
 {
 }
 
 CORBA::ValueBase*
-Demo_NestedValueImpl::_copy_value (void)
+Demo_NestedValueImpl::_copy_value ()
 {
   Demo_NestedValueImpl *nestedValueImpl = new Demo_NestedValueImpl();
   nestedValueImpl->foo1 (foo1 ());
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
index d84a54fdedf..8932fb90144 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
@@ -8,9 +8,9 @@ class Demo_NestedValueImpl : public virtual OBV_Demo::NestedValue,
                              public virtual CORBA::DefaultValueRefCountBase
 {
 public:
-  Demo_NestedValueImpl (void);
-  ~Demo_NestedValueImpl (void);
-  virtual CORBA::ValueBase* _copy_value (void);
+  Demo_NestedValueImpl ();
+  ~Demo_NestedValueImpl ();
+  virtual CORBA::ValueBase* _copy_value ();
 };
 
 #endif
diff --git a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
index d2f36f04d3f..219ebf257eb 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
@@ -13,7 +13,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
index 019e4210026..2235d3beb57 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
@@ -10,16 +10,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/interop-tests/CdrOutArg/orbix/test_i.h b/TAO/interop-tests/CdrOutArg/orbix/test_i.h
index 57f5a544703..3562dda71ce 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/test_i.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/test_i.h
@@ -26,7 +26,7 @@ public:
 
   void get_out (CORBA::Long_out arg) IT_THROW_DECL((CORBA::SystemException));
 
-  void shutdown (void) IT_THROW_DECL((CORBA::SystemException));
+  void shutdown () IT_THROW_DECL((CORBA::SystemException));
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
index 1f166b93d43..cc83c5b7e3b 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
@@ -17,7 +17,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
index dd22dcc19d3..2d12efbd1f0 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
index 9554057647d..e3d1af0b6df 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
@@ -26,7 +26,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
index 45ffa3d97a6..d23af7e6cba 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
@@ -14,18 +14,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -39,7 +39,6 @@ void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
@@ -65,7 +64,6 @@ Echo_Client_Request_Interceptor::send_request (
 #endif /*if 0*/
 
 
-
   // Populate target member of the ClientRequestInfo.
 
   // Make the context to send the context to the target
diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
index e7b490fa096..d3fb25ea8be 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
index 1761e2b4f04..ac639a0e1c9 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
@@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "12345678";
 
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -32,7 +32,6 @@ void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
index 2755fd363b3..1659c5f6071 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
@@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
index 28251a8109b..ab75e516797 100644
--- a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
@@ -12,7 +12,7 @@ CDR_Out_Arg_i::get_out (CORBA::Long_out arg)
 }
 
 void
-CDR_Out_Arg_i::shutdown (void)
+CDR_Out_Arg_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.h b/TAO/interop-tests/CdrOutArg/tao/test_i.h
index 087c0c86fbf..90dfd48bda9 100644
--- a/TAO/interop-tests/CdrOutArg/tao/test_i.h
+++ b/TAO/interop-tests/CdrOutArg/tao/test_i.h
@@ -21,20 +21,16 @@
  */
 class CDR_Out_Arg_i : public POA_Interop::CDR_Out_Arg
 {
-
 public:
-
   CDR_Out_Arg_i (CORBA::ORB_ptr orb);
 
   void get_out (CORBA::Long_out arg);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
-
   /// The ORB pseudo-reference (for shutdown).
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index 59a5b5b8ab1..6a9597d01ed 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -10,12 +10,12 @@ interop_WChar_Passer_i::interop_WChar_Passer_i (CORBA::ORB_ptr o,
 }
 
 // Implementation skeleton destructor
-interop_WChar_Passer_i::~interop_WChar_Passer_i (void)
+interop_WChar_Passer_i::~interop_WChar_Passer_i ()
 {
 }
 
 char *
-interop_WChar_Passer_i::orb_name (void)
+interop_WChar_Passer_i::orb_name ()
 {
   return CORBA::string_dup ("TAO");
 }
@@ -211,7 +211,7 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key)
 }
 
 void
-interop_WChar_Passer_i::shutdown (void)
+interop_WChar_Passer_i::shutdown ()
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index 50890e75163..83bd1198afe 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -37,9 +37,9 @@ public:
   interop_WChar_Passer_i (CORBA::ORB_ptr o, int verbose);
 
   //Destructor
-  virtual ~interop_WChar_Passer_i (void);
+  virtual ~interop_WChar_Passer_i ();
 
-  virtual char * orb_name (void);
+  virtual char * orb_name ();
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
                                           CORBA::Short key);
@@ -82,12 +82,11 @@ public:
 
 virtual void exception_test (CORBA::Short key);
 
-virtual void shutdown (void);
+virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
   wchar_reference ref_;
-
 };
 
 
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 6b94ed9fd35..f855f940610 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -23,7 +23,6 @@ int verbose = 0;
 int
 parse_args (int argc, ACE_TCHAR* argv[])
 {
-
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:v"));
   int c;
 
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 70e52c70f6c..f51a46180bf 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -23,13 +23,13 @@
 
 // Default Constructor.
 
-Concurrency_Service::Concurrency_Service (void)
+Concurrency_Service::Concurrency_Service ()
   : use_naming_service_ (1),
     ior_file_name_ (0),
     pid_file_name_ (0)
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
-             ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n")));
+             ACE_TEXT("Concurrency_Service::Concurrency_Service ()\n")));
 }
 
 // Constructor taking command-line arguments.
@@ -147,7 +147,7 @@ Concurrency_Service::init (int argc,
 }
 
 int
-Concurrency_Service::init_naming_service (void)
+Concurrency_Service::init_naming_service ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
   CORBA::ORB_var orb;
@@ -180,7 +180,7 @@ Concurrency_Service::init_naming_service (void)
 // Run the ORB event loop.
 
 int
-Concurrency_Service::run (void)
+Concurrency_Service::run ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "Concurrency_Service::run (...)\n"));
@@ -195,10 +195,10 @@ Concurrency_Service::run (void)
 
 // Destructor.
 
-Concurrency_Service::~Concurrency_Service (void)
+Concurrency_Service::~Concurrency_Service ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
-              "Concurrency_Service::~Concurrency_Service (void)\n"));
+              "Concurrency_Service::~Concurrency_Service ()\n"));
 }
 
 int
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index a80045d75fa..c630331101b 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -39,21 +39,21 @@ class Concurrency_Service : public TAO_ORB_Manager
 {
 public:
   /// Default Constructor.
-  Concurrency_Service (void);
+  Concurrency_Service ();
 
   /// Constructor taking the command-line arguments.
   Concurrency_Service (int argc,
                        ACE_TCHAR **argv);
 
   /// Destructor.
-  ~Concurrency_Service (void);
+  ~Concurrency_Service ();
 
   /// Initialize the Concurrency Service with the arguments.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the Concurrency_Service.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
@@ -65,7 +65,7 @@ private:
    * the individual lock sets with the naming service. At present the
    * clients must keep track of the reference and pass 'by hand'
    */
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Flag to tell wheter the naming service will be used.
   int use_naming_service_;
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
index d6e04baa4f1..625480e6fec 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
@@ -20,7 +20,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb,
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
index 88d3007c575..614219cd901 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
@@ -28,7 +28,7 @@ public:
                int event_limit);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual void send_message (const char * user_name,
                              const char * subject,
@@ -38,7 +38,6 @@ private:
   CORBA::ORB_var orb_;
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_;
   int event_limit_;
-
 };
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
index 33d2946cabe..0c2e1f49dd9 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
@@ -140,13 +140,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     std::cout << "Supplier starting sending of events.\n";
 
     while (1) {
-
       consumer->push (event);
       ACE_Time_Value tv(0, 1000 * EVENT_DELAY_MS);
       orb->run(tv);
 
       if ((remote_ecname != 0)  && (!gateway_initialized)) {
-
         try {
           // Get the remote event channel object
           CORBA::Object_var obj = root_context->resolve_str (ACE_TEXT_ALWAYS_CHAR (remote_ecname));
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
index bc04b0e8996..1f892b0062b 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
@@ -91,7 +91,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     std::cout << "Supplier starting sending events.\n";
     while (1) {
-
       event[0].header.type++;
       if (event[0].header.type > MY_EVENT_END) {
         event[0].header.type = MY_EVENT_START;
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
index 45ddebdb3a4..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
@@ -14,7 +14,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
 // Override the disconnect_push_Supplier() operation.
 void EchoEventSupplier_i::disconnect_push_supplier()
 {
-
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
   PortableServer::Current_var current = PortableServer::Current::_narrow(obj.in());
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/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 18dd4175aff..58711925023 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -19,7 +19,7 @@
 
 #include "tao/ORB_Core.h"
 
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include <iostream>
 #include <fstream>
 
@@ -180,22 +180,20 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     receiver->connect (pub);
 
     // Create the appropriate event handler and register it with the reactor
-    auto_ptr<ACE_Event_Handler> eh;
+    std::unique_ptr<ACE_Event_Handler> eh;
     if (mcast) {
-      auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
+      std::unique_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
       mcast_eh->reactor (orb->orb_core ()->reactor ());
       mcast_eh->open (ec.in());
-      ACE_auto_ptr_reset(eh,mcast_eh.release());
-      //eh.reset(mcast_eh.release());
+      eh.reset(mcast_eh.release());
     } else {
-      auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
+      std::unique_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
       udp_eh->reactor (orb->orb_core ()->reactor ());
       ACE_INET_Addr local_addr (listenport);
       if (udp_eh->open (local_addr) == -1) {
         std::cerr << "Cannot open EH" << std::endl;
       }
-      ACE_auto_ptr_reset(eh,udp_eh.release());
-      //eh.reset(udp_eh.release());
+      eh.reset(udp_eh.release());
     }
 
     // Create an event (just a string in this case).
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
index b86312d4220..7fc342c949b 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
@@ -37,7 +37,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 PortableServer::POA_ptr
 createPersistentPOA(PortableServer::POA_ptr root_poa,
                     const char* poa_name) {
-
   PortableServer::LifespanPolicy_var life =
     root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
index cad9543fb1c..5a2521f4bf2 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
index 51a17c26b09..a59513010b0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
index 5e857eefb2b..9cd0461819f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
@@ -11,13 +11,13 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
   std::cout << "Hello";
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
index 9436c6ad8e6..e474955373f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
@@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try {
     // Initialize orb
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
index 51a17c26b09..a59513010b0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
index 2c39b9ac146..63ad758730f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
@@ -21,17 +21,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
index 9a758e812a6..57bbf13048a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
@@ -19,7 +19,6 @@ void MessengerTask::end()
 
 int MessengerTask::svc()
 {
-
   try {
     // Get reference to Root POA
     CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
index ed58ae335d9..787ab998278 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
@@ -11,12 +11,12 @@
 
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
index 2c39b9ac146..63ad758730f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
@@ -21,17 +21,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
index 4e0eb4783bf..3776f962281 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
 {
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
index 64dc97e2741..7e82cd7890e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
index f5ae4c1b664..a5a1587e151 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
index 5b85d67ecd4..3245e521a62 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
index 6d05f65ede8..7a21c088df0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
@@ -12,7 +12,6 @@ EventSequenceConsumer_i::push_structured_events (
   const CosNotification::EventBatch& events
   )
 {
-
   std::cout << "events received " << std::endl;
 
   const char* value = 0;
@@ -28,14 +27,12 @@ EventSequenceConsumer_i::push_structured_events (
 void
 EventSequenceConsumer_i::disconnect_sequence_push_consumer ()
 {
-
   CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
   PortableServer::Current_var current =
     PortableServer::Current::_narrow (obj.in());
   PortableServer::POA_var poa = current->get_POA ();
   PortableServer::ObjectId_var objectId = current->get_object_id();
   poa->deactivate_object(objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
index c47f465d145..697d711ff81 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
@@ -9,14 +9,12 @@ EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb)
 void
 EventSequenceSupplier_i::disconnect_sequence_push_supplier ()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
index 54a3ec2ab39..0bfc413654b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
@@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   }
 
   return 0;
-
 }
 
 
@@ -76,5 +75,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 
 
 
-
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
index 9e0a217a91a..60153e1b1a5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
@@ -11,7 +11,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 : orb_ (CORBA::ORB::_duplicate (orb))
 , supplier_(new EventSequenceSupplier_i(orb))
 {
-
   CORBA::Object_var naming_obj =
     orb_->resolve_initial_references ("NameService");
 
@@ -67,7 +66,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -116,6 +115,5 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name,
   consumer_proxy_->push_structured_events(events);
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
index 524f58f339c..a74227a4345 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
@@ -31,4 +31,3 @@ private:
 
 
 
-
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 10a9e283676..4ef01eb8480 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;
@@ -102,7 +101,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -112,14 +111,12 @@ CORBA::Boolean Messenger_i::send_message (
     char *& message
   )
 {
-
    std::cout << "Message from: " << user_name << std::endl;
    std::cout << "Subject:      " << subject << std::endl;
    std::cout << "Message:      " << message << std::endl;
 
    try
      {
-
        // Event Definition
        CosNotification::StructuredEvent event;
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
index 4327f7e112f..cb3d1512f6b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
@@ -15,7 +15,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
  CORBA::Boolean send_message (
     const char * user_name,
@@ -26,7 +26,6 @@ public:
 private:
    CORBA::ORB_var orb_;
    CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_;
-
 };
 
 #endif /* MESSENGERI_H_  */
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
index 28e2fb05627..73572e2fd88 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
@@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
 {
-
    const char *value;
 
    for (unsigned int i=0; i<event.filterable_data.length(); i++) {
@@ -27,14 +26,12 @@ void
 StructuredEventConsumer_i::disconnect_structured_push_consumer(
       )
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
index a8331596d84..932640f7adf 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
@@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
   CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
   PortableServer::Current_var current =
     PortableServer::Current::_narrow (obj.in());
   PortableServer::POA_var poa = current->get_POA ();
   PortableServer::ObjectId_var objectId = current->get_object_id ();
   poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
index 8728eb776c4..d4f1ee8853a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   }
 
   return 0;
-
 }
 
 
@@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 
 
 
-
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
index bdbdc2eb77a..34156bd41a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
@@ -10,7 +10,6 @@
 Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
-
   CORBA::Object_var naming_obj =
     orb_->resolve_initial_references ("NameService");
 
@@ -75,7 +74,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
     connect_structured_push_supplier (supplier.in());
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
index 2d9c4182adb..ce9aa7c930b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
@@ -9,7 +9,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
@@ -25,4 +25,3 @@ class  Messenger_i : public POA_Messenger
 
 
 
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
index 11cb57adaf5..97d8865479b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
@@ -15,7 +15,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
index 0208d26fc7f..d32ac5960fc 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
@@ -43,10 +43,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 
   std::cout << "MessengerClient: success" << std::endl;
   return 0;
-
 }
 
 
 
 
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
index ad834dd609c..b9acf920824 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
@@ -88,5 +88,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 
 
 
-
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
index d9fb63f56d8..6e4bc4d8073 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
@@ -106,7 +106,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   s_proxy_consumer_->offer_change(added, removed);
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -115,7 +115,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message)
 {
-
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
   std::cout << "Message:      " << message << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
index 9ccdbcc3740..69a75da32e9 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
@@ -8,7 +8,7 @@ class  Messenger_i : public POA_Messenger
 {
 public:
   Messenger_i (CORBA::ORB_ptr orb);
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
  CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
index a1c11e2cc82..0ec2cb4cc1e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
@@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
 {
-
     const char *value;
 
     for (unsigned int i=0; i<event.filterable_data.length(); i++) {
@@ -26,14 +25,12 @@ void
 StructuredEventConsumer_i::disconnect_structured_push_consumer(
       )
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
index 0c3cf2b94d5..f7e401db29f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
@@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
index f053d4af659..7de7ea60031 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
@@ -88,7 +88,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -97,7 +97,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message)
 {
-
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
   std::cout << "Message:      " << message << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
index 2d9c4182adb..ce9aa7c930b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
@@ -9,7 +9,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
@@ -25,4 +25,3 @@ class  Messenger_i : public POA_Messenger
 
 
 
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
index e80efb54cee..f242d528c43 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
@@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
 {
-
   std::cout << "event received " << std::endl;
 
   const char *value;
@@ -27,14 +26,12 @@ StructuredEventConsumer_i::push_structured_event(
 void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
index b11df7abb34..75ebbf9449a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
@@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
index 8728eb776c4..d4f1ee8853a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   }
 
   return 0;
-
 }
 
 
@@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 
 
 
-
-
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
index d269451a068..569cd0b9f57 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
@@ -105,7 +105,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
index 83115d8465c..21d197d81a2 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
@@ -10,7 +10,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
index e80efb54cee..f242d528c43 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
@@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
 {
-
   std::cout << "event received " << std::endl;
 
   const char *value;
@@ -27,14 +26,12 @@ StructuredEventConsumer_i::push_structured_event(
 void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
index 263b4d03d66..4f5d0f097ea 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
@@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/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 14e332e2672..6573ddbd7a8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
@@ -75,14 +75,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     // Accept requests
     orb->run();
     orb->destroy();
-
   }
   catch(const CORBA::Exception& ex) {
     std::cerr << ex << std::endl;
     return 1;
   }
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index ea1a56d9e66..4410caa5332 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;
@@ -113,7 +112,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -127,7 +126,6 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name,
 
   try
   {
-
     // Event Definition
     CosNotification::StructuredEvent event;
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
index 28e15e9d4f9..cb3d1512f6b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
@@ -15,7 +15,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
  CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
index b3d363c0d52..1218fb6a243 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
@@ -11,7 +11,6 @@ void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event)
 {
-
    const char *value;
 
    for (unsigned int i=0; i<event.filterable_data.length(); i++) {
@@ -25,14 +24,12 @@ StructuredEventConsumer_i::push_structured_event(
 void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
index 8cf0e0abd35..e75774d4483 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
@@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
   CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
   PortableServer::Current_var current =
     PortableServer::Current::_narrow (obj.in());
   PortableServer::POA_var poa = current->get_POA ();
   PortableServer::ObjectId_var objectId = current->get_object_id ();
   poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
index 26400a9741a..55532bfbfa0 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 #include <iostream>
 
-ClientInitializer::ClientInitializer (void)
+ClientInitializer::ClientInitializer ()
  : slot_ (0),
    current_ (PortableInterceptor::Current::_nil())
 {
@@ -65,7 +65,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 }
 
 void
-ClientInitializer::set_slot_data (void)
+ClientInitializer::set_slot_data ()
 {
   // Set the recursion flag
   CORBA::Any flag;
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
index 4870f1877c3..c3d497c1008 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
@@ -11,10 +11,10 @@ class ClientInitializer :
   public virtual ::CORBA::LocalObject
 {
  public:
-  ClientInitializer (void);
+  ClientInitializer ();
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
-  void set_slot_data (void);
+  void set_slot_data ();
 
  private:
    PortableInterceptor::SlotId slot_;
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
index 6bdd7c6a1de..6fc2e054d63 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
@@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger,
   this->slot = theSlot;
 }
 
-ClientInterceptor::~ClientInterceptor (void)
+ClientInterceptor::~ClientInterceptor ()
 {
 }
 
@@ -84,7 +84,6 @@ ClientInterceptor::send_request (
   // reset recursion test
   flag <<= 0;
   pic->set_slot(slot,flag);
-
 }
 
 void
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
index f3ec546e4b4..17440a354b4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
@@ -11,7 +11,6 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual ::CORBA::LocalObject
 {
-
  public:
   ClientInterceptor (Messenger_var theMessage,
                      PortableInterceptor::Current_ptr thePic,
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/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
index 4cbb4f32191..49f716877e6 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
@@ -12,12 +12,12 @@
 #include <iostream>
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
index e0249baef77..ed581d27abf 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
@@ -21,10 +21,10 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
@@ -35,7 +35,6 @@ virtual CORBA::Boolean send_message (
 virtual char * get_time (
 
   );
-
 };
 
 #endif /* MESSENGERI_H_  */
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
index 7b4bef43561..80041289ce9 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
@@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
-ServerInterceptor::ServerInterceptor (void)
+ServerInterceptor::ServerInterceptor ()
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
@@ -70,7 +70,7 @@ ServerInterceptor::receive_request (
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;;
+    std::cout << "Permission Denied " << std::endl;
   }
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
index a8da1affe95..3e8e46e14a9 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
@@ -8,7 +8,7 @@ class ServerInterceptor
 : public PortableInterceptor::ServerRequestInterceptor
 {
  public:
-  ServerInterceptor (void);
+  ServerInterceptor ();
 
   ~ServerInterceptor ();
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp
index a7e2813c2d2..a0046a31b21 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp
@@ -66,7 +66,6 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-
     CORBA::ORB_var orb =
       CORBA::ORB_init( argc, argv );
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
index 4358936462e..bb3e8a4048c 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
@@ -37,7 +37,6 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
 
     if (parse_args (argc, argv) != 0)
@@ -84,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/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
index 037e494f62d..4c71c9969b0 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
@@ -13,7 +13,7 @@ Messenger_i::Messenger_i (
   {
   }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
index febd241327e..947ce475082 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
@@ -21,7 +21,7 @@ public:
       SSLIOP::Current_ptr ssliop_current
     );
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
    virtual CORBA::Boolean send_message (
      const char * user_name,
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
index c3a3b8d849d..540925e5f4d 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
@@ -120,7 +120,6 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-
     CORBA::ORB_var orb =
       CORBA::ORB_init( argc, argv );
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
index 062708bd920..8f2c72c4817 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
@@ -3,12 +3,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
index 0a628dac14e..dced78f9cd4 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
@@ -14,17 +14,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
index cd9f4219370..fe9a9e53fc3 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
@@ -19,12 +19,12 @@
 #include "MessengerI.h"
 
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
index ed4ef394a2f..586ce510a09 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
index 0a628dac14e..dced78f9cd4 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
@@ -14,17 +14,16 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
   );
-
 };
 
 
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README
index 8c5ac264903..23a6f3b525b 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README
@@ -44,7 +44,7 @@ server and therefore does not need a value for SSL_CERT_FILE.
 Example 1: Secured server and unsecured client
 ----------------------------------------------
 The server is configured to accept requests only via secured
-connections.  No specific configurationi is provided for the
+connections.  No specific configuration is provided for the
 client so it has the default configuration.
 
 The server's configuration is:
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
index c47878eb0fc..da4b376c2c2 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
@@ -21,7 +21,7 @@ public:
     kind(k);
   }
 
-  virtual ::CORBA::ValueBase *_copy_value (void)
+  virtual ::CORBA::ValueBase *_copy_value ()
   {
     ::CORBA::ValueBase *ret_val = 0;
     ACE_NEW_THROW_EX (
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
index ac2684ce17d..5a51f6c45e3 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
@@ -59,7 +59,6 @@ class TestConsumer : public POA_CosEventComm::PushConsumer
   PortableServer::POA_ptr poa_;
   CORBA::ORB_ptr orb_;
 public:
-
   TestConsumer(int evts,
                CosNotifyChannelAdmin::EventChannelFactory_ptr ecf,
                PortableServer::POA_ptr poa,
@@ -153,11 +152,9 @@ public:
 
   void disconnect_self() {
   }
-
 };
 
 int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
-
   int num_events = 0;
 
   try {
@@ -202,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 a443e406eb6..303108b72d7 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
@@ -76,7 +76,6 @@ class TestSupplier
   CORBA::ORB_ptr orb_;
 
 public:
-
   TestSupplier(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf,
                CORBA::ORB_ptr orb,
                PortableServer::POA_ptr poa)
@@ -186,12 +185,10 @@ public:
 };
 
 int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
-
   int num_events = 0;
   int pay_size = 1;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init(ac, av);
 
     if (parse_args (ac, av) != 0)
@@ -247,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/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 29726be0784..78814972504 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -42,7 +42,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
 // ****************************************************************
 
-Event_Service::Event_Service (void)
+Event_Service::Event_Service ()
   : sched_impl_ (0),
     ec_impl_ (0),
     scheduler_type_ (ES_SCHED_NONE),
@@ -51,7 +51,7 @@ Event_Service::Event_Service (void)
 {
 }
 
-Event_Service::~Event_Service (void)
+Event_Service::~Event_Service ()
 {
   delete this->ec_impl_;
   this->ec_impl_ = 0;
@@ -402,19 +402,19 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (void)
+Event_Service::for_consumers ()
 {
   return this->ec_impl_->for_consumers ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (void)
+Event_Service::for_suppliers ()
 {
   return this->ec_impl_->for_suppliers ();
 }
 
 void
-Event_Service::destroy (void)
+Event_Service::destroy ()
 {
   this->ec_impl_->destroy ();
   this->orb_->shutdown ();
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index bd7dbc3a5dc..06a95d327bb 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -31,18 +31,18 @@
 class Event_Service : public POA_RtecEventChannelAdmin::EventChannel
 {
 public:
-  Event_Service (void);
-  virtual ~Event_Service (void);
+  Event_Service ();
+  virtual ~Event_Service ();
 
   /// Run the event service.
   int run (int argc, ACE_TCHAR* argv[]);
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void);
-  virtual void destroy (void);
+    for_suppliers ();
+  virtual void destroy ();
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer);
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle);
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 40368f9daef..179afa5da9f 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -248,7 +248,7 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
       ORBSVCS_DEBUG((LM_DEBUG,"Factory connected\n"));
       CORBA::String_var my_ior_string = orb->object_to_string(ec);
 
-      int const len = ACE_OS::strlen(my_ior_string.in()) ;
+      size_t const len = ACE_OS::strlen(my_ior_string.in()) ;
 
       if (stream.send_n(my_ior_string.in(), len) != len)
         ORBSVCS_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1);
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index aeb2d6bfb1c..cced9d94274 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -21,13 +21,11 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
   )
 {
-
   ORBSVCS_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n"));
   FILE* file = 0;
   char *id_str=0, *prog=0;
 
   try{
-
     file = ACE_OS::fopen(conf_file, "r");
     if (file == 0)
       throw PortableGroup::NoFactory();
@@ -103,7 +101,8 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   const int ENV_BUF_LEN = 512;
   ACE_TCHAR buf[ENV_BUF_LEN];
   server_addr.addr_to_string(buf,ENV_BUF_LEN,0);
-  options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf);
+  options.setenv(ACE_TEXT("EventChannelFactoryAddr"),
+                 ACE_TEXT("%") ACE_TEXT_PRIs, buf);
 
   // extract the object ID from the criteria
   for (CORBA::ULong i = 0; i < the_criteria.length(); ++i)
@@ -114,7 +113,8 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
       const char* id_str = name[0].id.in();
       the_criteria[i].val >>= val;
       if (id_str[0] != '-') // environment variable
-        options.setenv(ACE_TEXT_CHAR_TO_TCHAR(id_str), ACE_TEXT("%s"), val);
+        options.setenv(ACE_TEXT_CHAR_TO_TCHAR(id_str),
+                       ACE_TEXT("%") ACE_TEXT_PRIs, val);
       else {// command line option
         ACE_OS::sprintf(buf, ACE_TEXT(" %s %s"), id_str, val);
         str += buf;
@@ -124,7 +124,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
 
   ORBSVCS_DEBUG((LM_DEBUG, "Command Line : %s\n", str.c_str()));
 
-  options.command_line(str.c_str());
+  options.command_line(ACE_TEXT("%") ACE_TEXT_PRIs, str.c_str());
 
   // Try to create a new process running date.
   ACE_Process new_process;
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 3d1fb378775..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
@@ -50,7 +50,6 @@ int parse_args(int argc, ACE_TCHAR* argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try{
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
@@ -117,7 +116,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
     orb->run();
-
   }
   catch (const CORBA::Exception& ex)
   {
@@ -125,7 +123,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   }
 
 
-
   return 0;
 }
 
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
index 11362ff2019..6958151e8dc 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
@@ -9,7 +9,7 @@
 #include "ace/Task.h"
 
 // Default Constructor.
-TAO_FT_Naming_Service::TAO_FT_Naming_Service (void)
+TAO_FT_Naming_Service::TAO_FT_Naming_Service ()
   : time_ (0),
     num_threads_ (1)
 {
@@ -50,7 +50,6 @@ TAO_FT_Naming_Service::init (int argc, ACE_TCHAR* argv[])
 
       if (result == -1)
         return result;
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -124,7 +123,7 @@ public:
       time_(t)
   {}
 
-  int svc (void)
+  int svc ()
   {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -148,7 +147,7 @@ private:
 };
 
 int
-TAO_FT_Naming_Service::run (void)
+TAO_FT_Naming_Service::run ()
 {
   ORB_Runner runner (this->orb_.in(), time_);
   if (this->num_threads_ == 1)
@@ -170,7 +169,7 @@ TAO_FT_Naming_Service::run (void)
 }
 
 void
-TAO_FT_Naming_Service::shutdown (void)
+TAO_FT_Naming_Service::shutdown ()
 {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -179,7 +178,7 @@ TAO_FT_Naming_Service::shutdown (void)
 }
 
 int
-TAO_FT_Naming_Service::fini (void)
+TAO_FT_Naming_Service::fini ()
 {
   this->my_naming_server_.fini();
 
@@ -200,6 +199,6 @@ TAO_FT_Naming_Service::fini (void)
 }
 
 // Destructor.
-TAO_FT_Naming_Service::~TAO_FT_Naming_Service (void)
+TAO_FT_Naming_Service::~TAO_FT_Naming_Service ()
 {
 }
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
index acd6971f46e..d8feffc6453 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
@@ -29,7 +29,7 @@ class TAO_FT_Naming_Service
 {
 public:
   /// Default Constructor.
-  TAO_FT_Naming_Service (void);
+  TAO_FT_Naming_Service ();
 
   /// Constructor taking the command-line arguments.
   TAO_FT_Naming_Service (int argc, ACE_TCHAR* argv[]);
@@ -41,16 +41,15 @@ public:
   virtual int fini ();
 
   /// Run the TAO_Naming_Service.
-  virtual int run (void);
+  virtual int run ();
 
   /// Shut down the TAO_Naming_Service; you must still call fini().
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Destructor.
-  virtual ~TAO_FT_Naming_Service (void);
+  virtual ~TAO_FT_Naming_Service ();
 
 protected:
-
   /// Parse the command line arguments to find
   /// the timeout period.
   int parse_args (int &argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index 992d9d4a0d9..36baa65335c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -30,7 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
   * Default fault analyzer.
   *
@@ -38,7 +37,6 @@ namespace TAO
   class TAO_ReplicationManagerLib_Export FT_DefaultFaultAnalyzer
     : public ::TAO::FT_FaultAnalyzer
   {
-
   public:
     /**
     * Default constructor.
@@ -51,7 +49,6 @@ namespace TAO
     virtual ~FT_DefaultFaultAnalyzer ();
 
   public:
-
     /**
     * Validate event type to make sure it is one we can handle.
     * @param event The structured fault event, as from the Fault Notifier.
@@ -75,9 +72,7 @@ namespace TAO
     FT_DefaultFaultAnalyzer (const FT_DefaultFaultAnalyzer & rhs);
     /// Assignment operator.
     FT_DefaultFaultAnalyzer & operator = (const FT_DefaultFaultAnalyzer & rhs);
-
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index ac81edbb323..882af564e02 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -33,7 +33,6 @@ namespace TAO
   */
   class TAO_ReplicationManagerLib_Export FT_FaultAnalyzer
   {
-
   public:
     /**
     * Default constructor.
@@ -46,7 +45,6 @@ namespace TAO
     virtual ~FT_FaultAnalyzer ();
 
   public:
-
     /**
     * Validate event type to make sure it is one we can handle.
     * @param event The structured fault event, as from the Fault Notifier.
@@ -74,9 +72,7 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index f01bf130997..baa75633fb6 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -54,7 +54,6 @@ int TAO::FT_FaultConsumer::init (
   FT::FaultNotifier_ptr fault_notifier,
   TAO::FT_FaultAnalyzer * fault_analyzer)
 {
-
   if (TAO_debug_level > 1)
   {
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -114,9 +113,8 @@ int TAO::FT_FaultConsumer::init (
 * - Disconnect from FT::FaultNotifier.
 * - Deactivate from the POA.
 */
-int TAO::FT_FaultConsumer::fini (void)
+int TAO::FT_FaultConsumer::fini ()
 {
-
   if (TAO_debug_level > 1)
   {
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -130,7 +128,6 @@ int TAO::FT_FaultConsumer::fini (void)
   {
     if (!CORBA::is_nil (this->fault_notifier_.in()))
     {
-
       if (TAO_debug_level > 1)
       {
         ORBSVCS_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 48cf24e5970..cf86895b424 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   ///////////////////////
   // Forward declarations
   class FT_FaultAnalyzer;
@@ -40,7 +39,6 @@ namespace TAO
   class TAO_ReplicationManagerLib_Export FT_FaultConsumer
     : public virtual POA_CosNotifyComm::StructuredPushConsumer
   {
-
     //////////////////////
     // non-CORBA interface
 
@@ -76,7 +74,7 @@ namespace TAO
     * - Disconnect from FT::FaultNotifier.
     * - Deactivate from the POA.
     */
-    int fini (void);
+    int fini ();
 
     /**
     * Accessor for a duplicate of this consumer's object reference.
@@ -90,7 +88,6 @@ namespace TAO
     size_t notifications () const;
 
   public:
-
     /**
     * @name POA_CosNotifyComm::StructuredPushConsumer Methods
     *
@@ -98,7 +95,6 @@ namespace TAO
     * interface.
     */
     //@{
-
     ////////////////
     // CORBA methods
     virtual void push_structured_event (
@@ -123,7 +119,6 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
     /// The POA with which we are activated.
     PortableServer::POA_var poa_;
 
@@ -145,9 +140,7 @@ 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
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index 1a20aad8742..8d93dc33a79 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -32,7 +32,6 @@ namespace TAO
   struct TAO_ReplicationManagerLib_Export FT_FaultEventDescriptor
   {
   public:
-
     /// Default constructor.
     FT_FaultEventDescriptor ();
 
@@ -65,9 +64,7 @@ namespace TAO
 
     /// The object group's factories.
     PortableGroup::FactoryInfos_var factories;
-
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 30baef0cd46..4893362ece5 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::FT_Property_Validator::FT_Property_Validator (void)
+TAO::FT_Property_Validator::FT_Property_Validator ()
   : replication_style_ (1),
     membership_style_ (1),
     consistency_style_ (1),
@@ -32,7 +32,7 @@ TAO::FT_Property_Validator::FT_Property_Validator (void)
 }
 
 
-TAO::FT_Property_Validator::~FT_Property_Validator (void)
+TAO::FT_Property_Validator::~FT_Property_Validator ()
 {
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 3ed49696565..44fa0384d58 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -35,12 +35,11 @@ namespace TAO
   class FT_Property_Validator : public TAO_PG_Default_Property_Validator
   {
   public:
-
     /// Constructor.
-    FT_Property_Validator (void);
+    FT_Property_Validator ();
 
     /// Destructor.
-    virtual ~FT_Property_Validator (void);
+    virtual ~FT_Property_Validator ();
 
     /// Validate the given properties.  Throw an exception when the
     /// first invalid property is encountered.  The remaining properties
@@ -55,7 +54,6 @@ namespace TAO
     void validate_criteria (const PortableGroup::Properties & criteria);
 
   private:
-
     /**
     * @name Pre-initialize property Names.
     *
@@ -77,7 +75,6 @@ namespace TAO
     //@}
 
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 270584224fd..c9f53833ab4 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -81,7 +81,7 @@ TAO::FT_ReplicationManager::FT_ReplicationManager ()
   // init must be called before using this object.
 }
 
-TAO::FT_ReplicationManager::~FT_ReplicationManager (void)
+TAO::FT_ReplicationManager::~FT_ReplicationManager ()
 {
   // cleanup happens in fini
 }
@@ -324,7 +324,7 @@ int TAO::FT_ReplicationManager::idle (int & result)
 
 
 //public
-int TAO::FT_ReplicationManager::fini (void)
+int TAO::FT_ReplicationManager::fini ()
 {
   int result = 0;
 
@@ -487,7 +487,6 @@ void
 TAO::FT_ReplicationManager::set_default_properties (
   const PortableGroup::Properties & props)
 {
-
   this->properties_support_.set_default_properties (props);
   //@@ validate properties?
 }
@@ -543,7 +542,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Properties & overrides)
 {
-
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
@@ -591,7 +589,6 @@ TAO::FT_ReplicationManager::set_primary_member (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-
     PortableGroup::TagGroupTaggedComponent tag_component;
     TAO_FT_IOGR_Property prop (tag_component);
 
@@ -660,7 +657,6 @@ TAO::FT_ReplicationManager::add_member (
       member);
 
     result = group->reference ();
-
   }
   else
   {
@@ -894,7 +890,6 @@ void
 TAO::FT_ReplicationManager::delete_object (
   const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
 {
-
   PortableGroup::ObjectGroupId group_id = 0;
   if (factory_creation_id >>= group_id)
   {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 462c98a8168..6d7d99d8d2e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -77,7 +77,6 @@ namespace TAO
   class FT_ReplicationManager
     : public virtual POA_FT::ReplicationManager
   {
-
     //////////////////////
     // non-CORBA interface
 
@@ -95,7 +94,6 @@ namespace TAO
     virtual ~FT_ReplicationManager ();
 
   public:
-
     /**
      * Parse command line arguments.
      * @param argc traditional C argc
@@ -115,7 +113,7 @@ namespace TAO
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Idle-time activity.
@@ -144,14 +142,12 @@ namespace TAO
   // CORBA interface(s)
 
   public:
-
     /**
     * @name POA_FT::ReplicationManager Methods
     *
     * Methods required by the POA_FT::ReplicationManager interface.
     */
     //@{
-
     /// Registers the Fault Notifier with the Replication Manager.
     virtual void register_fault_notifier (
         FT::FaultNotifier_ptr fault_notifier);
@@ -174,7 +170,6 @@ namespace TAO
     * Methods required by the PortableGroup::PropertyManager interface.
     */
     //@{
-
     /// Set the default properties to be used by all object groups.
     virtual void set_default_properties (
         const PortableGroup::Properties & props);
@@ -236,7 +231,6 @@ namespace TAO
      * interface.
      */
     //@{
-
     /// Create a member in an object group.
     virtual PortableGroup::ObjectGroup_ptr create_member (
         PortableGroup::ObjectGroup_ptr object_group,
@@ -314,7 +308,6 @@ namespace TAO
      * Methods required by the PortableGroup::GenericFactory interface.
      */
     //@{
-
     /**
      * Create an object of the specified type that adheres to the
      * restrictions defined by the provided Criteria.  The out
@@ -349,7 +342,7 @@ namespace TAO
     /**
      * Write this factory's IOR to a file
      */
-    int write_ior (void);
+    int write_ior ();
 
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
@@ -364,7 +357,6 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
     /// The orb
     CORBA::ORB_var orb_;
 
@@ -405,7 +397,6 @@ namespace TAO
     /// Quit flag.
     int quit_;
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index a5ae04091f5..4c8faf71294 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -366,7 +366,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
   const PortableGroup::Location & location,
   int & object_is_primary)
 {
-
   // To determine if this was a primary that faulted:
   // Get the TagFTGroupTaggedComponent from the IOGR and search
   // for the primary, using the TAO_FT_IOGR_Property helper class.
@@ -669,7 +668,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
   if ((result == 0) &&
       (fault_event_desc.membership_style == FT::MEMB_INF_CTRL))
   {
-
     PortableGroup::ObjectGroup_var new_object_group;
     result = this->remove_failed_member (
         the_object_group.in(),
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index a8e714f4ae3..520cfe46714 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   ///////////////////////
   // Forward declarations
   class FT_ReplicationManager;
@@ -49,7 +48,6 @@ namespace TAO
   class FT_ReplicationManagerFaultAnalyzer
     : public ::TAO::FT_DefaultFaultAnalyzer
   {
-
   public:
     /**
     * Constructor.
@@ -64,7 +62,6 @@ namespace TAO
     virtual ~FT_ReplicationManagerFaultAnalyzer ();
 
   public:
-
     /**
     * Validate event type to make sure it is one we can handle.
     * @param event The structured fault event, as from the Fault Notifier.
@@ -98,7 +95,6 @@ namespace TAO
     /////////////////////////
     // Implementation methods
   protected:
-
     /// Helper functions for fault analysis.
 
     // Extract the type id from a CORBA any.
@@ -185,9 +181,7 @@ namespace TAO
     // Data Members
   private:
     FT_ReplicationManager * replication_manager_;
-
   };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index b3139b404ba..4ba0ec642ae 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -90,7 +90,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
 ////////////////////////////////////////////
 // FT_FaultDetectorFactory_i private methods
 
-void TAO::FT_FaultDetectorFactory_i::shutdown_i(void)
+void TAO::FT_FaultDetectorFactory_i::shutdown_i()
 {
   // assume mutex is locked
   for (size_t nDetector = 0; nDetector < this->detectors_.size(); ++nDetector)
@@ -103,7 +103,7 @@ void TAO::FT_FaultDetectorFactory_i::shutdown_i(void)
   }
 }
 
-int TAO::FT_FaultDetectorFactory_i::write_ior(void)
+int TAO::FT_FaultDetectorFactory_i::write_ior()
 {
   int result = -1;
   FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
@@ -346,7 +346,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb)
   return result;
 }
 
-int TAO::FT_FaultDetectorFactory_i::fini (void)
+int TAO::FT_FaultDetectorFactory_i::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -465,7 +465,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::change_properties);
 }
 
-void TAO::FT_FaultDetectorFactory_i::shutdown (void)
+void TAO::FT_FaultDetectorFactory_i::shutdown ()
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown);
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_);
@@ -654,7 +654,7 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::delete_object);
 }
 
-CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void)
+CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive ()
 {
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive)
     1;
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index 75de43bf26d..9f2dc08d010 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -120,7 +120,7 @@ namespace TAO
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Idle-time activity.
@@ -154,7 +154,7 @@ namespace TAO
     virtual void change_properties (
         const PortableGroup::Properties & property_set);
 
-    virtual void shutdown (void);
+    virtual void shutdown ();
 
     /////////////////////////////////////////
     // CORBA interface GenericFactory methods
@@ -169,7 +169,7 @@ namespace TAO
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
 
-    virtual CORBA::Boolean is_alive (void);
+    virtual CORBA::Boolean is_alive ();
 
     /////////////////////////
     // Implementation methods
@@ -192,7 +192,6 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
     /**
      * Protect internal state.
      * Mutex should be locked by corba methods, or by
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index 5afca4f3aac..40c9d52d71c 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -165,7 +165,6 @@ void TAO::Fault_Detector_i::notify()
       this->notifier_->push_structured_fault(vEvent.in());
       if (TAO_debug_level > 5)
       {
-
         ORBSVCS_ERROR ((LM_ERROR,
         "return from Fault Detector push Structured Event.\n"
         ));
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index 1052ea3760e..23698aaecda 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -193,13 +193,13 @@ const char * TAO::FT_FaultNotifier_i::identity () const
   return this->identity_.c_str();
 }
 
-PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (void)
+PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA ()
 {
   return this->poa_.in();
 }
 
 
-void TAO::FT_FaultNotifier_i::_remove_ref (void)
+void TAO::FT_FaultNotifier_i::_remove_ref ()
 {
   notify_channel_->destroy();
 
@@ -209,7 +209,7 @@ void TAO::FT_FaultNotifier_i::_remove_ref (void)
   this->gone_ = 1;
 }
 
-int TAO::FT_FaultNotifier_i::fini (void)
+int TAO::FT_FaultNotifier_i::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -683,7 +683,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
   METHOD_RETURN(TAO::FT_FaultNotifier_i::disconnect_consumer);
 }
 
-CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void)
+CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive ()
 {
   METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1;
 }
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index ecc69f45a19..1f3634355fb 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -69,7 +69,7 @@ namespace TAO
      * Prepare to exit
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Identify this fault notifier.
@@ -110,13 +110,13 @@ namespace TAO
 
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
-    virtual CORBA::Boolean is_alive (void);
+    virtual CORBA::Boolean is_alive ();
 
     /////////////////////////////////////////
     // Override CORBA servant virtual methods
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
 
-    virtual void _remove_ref (void);
+    virtual void _remove_ref ();
 
     /////////////////////////
     // Implementation methods
@@ -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/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index d51d3ad101b..cfc41f9e387 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -9,11 +9,11 @@
 #include "tao/ORB_Core.h"
 #include "ace/Auto_Ptr.h"
 
-IFR_Service::IFR_Service (void)
+IFR_Service::IFR_Service ()
 {
 }
 
-IFR_Service::~IFR_Service (void)
+IFR_Service::~IFR_Service ()
 {
 }
 
@@ -45,7 +45,7 @@ IFR_Service::init (int argc,
 }
 
 int
-IFR_Service::run (void)
+IFR_Service::run ()
 {
   this->orb_->run (0);
 
@@ -53,7 +53,7 @@ IFR_Service::run (void)
 }
 
 int
-IFR_Service::fini (void)
+IFR_Service::fini ()
 {
   try
     {
@@ -68,7 +68,7 @@ IFR_Service::fini (void)
 }
 
 void
-IFR_Service::shutdown (void)
+IFR_Service::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index 6e3d62ee102..8a1eb7337b2 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -28,25 +28,24 @@
 class IFR_Service
 {
 public:
-
   /// Default constructor.
-  IFR_Service (void);
+  IFR_Service ();
 
   /// Destructor
-  ~IFR_Service (void);
+  ~IFR_Service ();
 
   /// Initialize the IFR service.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Shut down the IFR Service.
-  int fini (void);
+  int fini ();
 
   /// Run the IFR service.
-  int run (void);
+  int run ();
 
   /// Shutdown the Service.
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   /// Reference to our ORB.
diff --git a/TAO/orbsvcs/IFR_Service/be_extern.h b/TAO/orbsvcs/IFR_Service/be_extern.h
index c28a7c0c15e..52e35843295 100644
--- a/TAO/orbsvcs/IFR_Service/be_extern.h
+++ b/TAO/orbsvcs/IFR_Service/be_extern.h
@@ -76,9 +76,9 @@ extern TAO_IFR_BE_Export BE_GlobalData *be_global;
 
 extern TAO_IFR_BE_Export int BE_init (int &, ACE_TCHAR*[]);
 extern TAO_IFR_BE_Export void BE_post_init (char *[], long);
-extern TAO_IFR_BE_Export void BE_version (void);
-extern TAO_IFR_BE_Export void BE_produce (void);
-extern TAO_IFR_BE_Export void BE_cleanup (void);
-extern TAO_IFR_BE_Export void BE_abort (void);
+extern TAO_IFR_BE_Export void BE_version ();
+extern TAO_IFR_BE_Export void BE_produce ();
+extern TAO_IFR_BE_Export void BE_cleanup ();
+extern TAO_IFR_BE_Export void BE_abort ();
 
 #endif /* TAO_IFR_BE_EXTERN_H */
diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp
index 4e90faf42b0..89a0ed5262c 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_global.cpp
@@ -18,7 +18,7 @@
 
 TAO_IFR_BE_Export BE_GlobalData *be_global = 0;
 
-BE_GlobalData::BE_GlobalData (void)
+BE_GlobalData::BE_GlobalData ()
   : removing_ (false),
     filename_ (0),
     enable_locking_ (false),
@@ -30,7 +30,7 @@ BE_GlobalData::BE_GlobalData (void)
   idl_global->preserve_cpp_keywords (true);
 }
 
-BE_GlobalData::~BE_GlobalData (void)
+BE_GlobalData::~BE_GlobalData ()
 {
 }
 
@@ -71,13 +71,13 @@ BE_GlobalData::repository (CORBA::Repository_ptr repo)
 }
 
 ACE_Unbounded_Stack<CORBA::Container_ptr> &
-BE_GlobalData::ifr_scopes (void)
+BE_GlobalData::ifr_scopes ()
 {
   return this->ifr_scopes_;
 }
 
 void
-BE_GlobalData::destroy (void)
+BE_GlobalData::destroy ()
 {
 }
 
@@ -142,7 +142,7 @@ BE_GlobalData::orb_args (const ACE_CString& args)
 }
 
 ACE_CString
-BE_GlobalData::spawn_options (void)
+BE_GlobalData::spawn_options ()
 {
   return this->orb_args_ + idl_global->idl_flags ();
 }
diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h
index 7ad1bb1abf7..21d5e0885bc 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.h
+++ b/TAO/orbsvcs/IFR_Service/be_global.h
@@ -38,10 +38,10 @@ public:
   //    Storage of global data specific to the compiler back end
   //
   /// Constructor.
-  BE_GlobalData (void);
+  BE_GlobalData ();
 
   /// Destructor.
-  virtual ~BE_GlobalData (void);
+  virtual ~BE_GlobalData ();
 
   // Data accessors.
 
@@ -54,10 +54,10 @@ public:
   CORBA::Repository_ptr repository () const;
   void repository (CORBA::Repository_ptr repo);
 
-  ACE_Unbounded_Stack<CORBA::Container_ptr> &ifr_scopes (void);
+  ACE_Unbounded_Stack<CORBA::Container_ptr> &ifr_scopes ();
 
   /// Cleanup function.
-  void destroy (void);
+  void destroy ();
 
   const char *filename () const;
   void filename (char *fname);
@@ -76,7 +76,7 @@ public:
 
   /// Command line passed to ACE_Process::spawn. Different
   /// implementations in IDL and IFR backends.
-  ACE_CString spawn_options (void);
+  ACE_CString spawn_options ();
 
   /// Parse an argument that might affect the backend.
   void parse_args (long &i, char **av);
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 94916420226..6a8bea44587 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -86,7 +86,7 @@ BE_ifr_orb_init (int &ac, ACE_TCHAR *av[])
 }
 
 TAO_IFR_BE_Export void
-BE_version (void)
+BE_version ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "%s %s\n",
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 2774ca20bfb..2e307463a62 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -77,14 +77,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Clean up before exit, whether successful or not.
 TAO_IFR_BE_Export void
-BE_cleanup (void)
+BE_cleanup ()
 {
   idl_global->destroy ();
 }
 
 // Abort this run of the BE.
 TAO_IFR_BE_Export void
-BE_abort (void)
+BE_abort ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
               ACE_TEXT ("Fatal Error - Aborting\n")));
@@ -94,7 +94,7 @@ BE_abort (void)
 }
 
 int
-BE_ifr_repo_init (void)
+BE_ifr_repo_init ()
 {
   try
   {
@@ -138,7 +138,7 @@ BE_ifr_repo_init (void)
 
 // Do the work of this BE. This is the starting point for code generation.
 TAO_IFR_BE_Export void
-BE_produce (void)
+BE_produce ()
 {
   try
     {
@@ -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/IFR_Service/be_util.cpp b/TAO/orbsvcs/IFR_Service/be_util.cpp
index 0459215ea0b..15e4f2b0a85 100644
--- a/TAO/orbsvcs/IFR_Service/be_util.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_util.cpp
@@ -24,12 +24,12 @@ be_util::prep_be_arg (char *)
 }
 
 void
-be_util::arg_post_proc (void)
+be_util::arg_post_proc ()
 {
 }
 
 void
-be_util::usage (void)
+be_util::usage ()
 {
   ORBSVCS_DEBUG ((
       LM_DEBUG,
@@ -44,7 +44,7 @@ be_util::usage (void)
 }
 
 AST_Generator *
-be_util::generator_init (void)
+be_util::generator_init ()
 {
   AST_Generator *gen = 0;
   ACE_NEW_RETURN (gen,
diff --git a/TAO/orbsvcs/IFR_Service/be_util.h b/TAO/orbsvcs/IFR_Service/be_util.h
index 6e41caf36e6..01640c194cb 100644
--- a/TAO/orbsvcs/IFR_Service/be_util.h
+++ b/TAO/orbsvcs/IFR_Service/be_util.h
@@ -26,15 +26,15 @@ public:
 
   /// Checks made after parsing args.
   static TAO_IFR_BE_Export void
-  arg_post_proc (void);
+  arg_post_proc ();
 
   /// Display usage of BE-specific options.
   static TAO_IFR_BE_Export void
-  usage (void);
+  usage ();
 
   /// Create an AST node generator.
   static TAO_IFR_BE_Export AST_Generator *
-  generator_init (void);
+  generator_init ();
 };
 
 #endif // if !defined
diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
index 3012c700d76..07953dded01 100644
--- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
@@ -70,11 +70,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "be_extern.h"
 
 
-
 const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
 
 void
-DRV_init (void)
+DRV_init ()
 {
   // Initialize FE global data object.
   ACE_NEW (idl_global,
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
index 293564a0d33..95b7fb43177 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
@@ -69,7 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "drv_private_ifr.h"
 
 
-
 // Storage for file names
 
 #if !defined (NFILES)
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 057e05a5013..826c5536758 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -61,7 +61,7 @@ ifr_adding_visitor::ifr_adding_visitor (
 {
 }
 
-ifr_adding_visitor::~ifr_adding_visitor (void)
+ifr_adding_visitor::~ifr_adding_visitor ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 773f97a4b9d..61cc748ff5d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -38,7 +38,7 @@ public:
                       CORBA::Boolean in_reopened = 0,
                       bool allow_duplicate_typedefs = false);
 
-  virtual ~ifr_adding_visitor (void);
+  virtual ~ifr_adding_visitor ();
 
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_predefined_type (AST_PredefinedType *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 2a622afb5af..10ce5c043da 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -20,7 +20,7 @@ ifr_adding_visitor_exception::ifr_adding_visitor_exception (
 {
 }
 
-ifr_adding_visitor_exception::~ifr_adding_visitor_exception (void)
+ifr_adding_visitor_exception::~ifr_adding_visitor_exception ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
index 45c4ceb6d74..abea0065cf1 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
@@ -36,7 +36,7 @@ public:
                                 CORBA::Boolean in_reopened_);
 
   /// Destructor.
-  virtual ~ifr_adding_visitor_exception (void);
+  virtual ~ifr_adding_visitor_exception ();
 
   /// Visit a struct.
   virtual int visit_scope (UTL_Scope *node);
@@ -65,7 +65,6 @@ private:
   /// Holder for the member list passed to create_struct() or
   /// create_exception().
   CORBA::StructMemberSeq members_;
-
 };
 
 #endif /* TAO_IFR_ADDING_VISITOR_EXCEPTION_H */
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 368763cd70b..9411447ca73 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -18,7 +18,7 @@ ifr_adding_visitor_operation::ifr_adding_visitor_operation (AST_Decl *scope)
 {
 }
 
-ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
+ifr_adding_visitor_operation::~ifr_adding_visitor_operation ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
index 2975da818cd..f0984d11e0a 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
@@ -35,7 +35,7 @@ public:
   ifr_adding_visitor_operation (AST_Decl *scope);
 
   /// Destructor.
-  virtual ~ifr_adding_visitor_operation (void);
+  virtual ~ifr_adding_visitor_operation ();
 
   /// Visit an operation.
   virtual int visit_operation (AST_Operation *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 234142c65cf..8b2bcddb295 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -14,7 +14,7 @@ ifr_adding_visitor_structure::ifr_adding_visitor_structure (AST_Decl *scope)
 {
 }
 
-ifr_adding_visitor_structure::~ifr_adding_visitor_structure (void)
+ifr_adding_visitor_structure::~ifr_adding_visitor_structure ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
index 10609bf9939..0803c307aac 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
@@ -33,7 +33,7 @@ class ifr_adding_visitor_structure : public ifr_adding_visitor
 public:
   ifr_adding_visitor_structure (AST_Decl *scope);
 
-  virtual ~ifr_adding_visitor_structure (void);
+  virtual ~ifr_adding_visitor_structure ();
 
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_structure (AST_Structure *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 4f7015b2fa6..2c8e0d5e89c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -18,7 +18,7 @@ ifr_adding_visitor_union::ifr_adding_visitor_union (AST_Decl *scope)
 {
 }
 
-ifr_adding_visitor_union::~ifr_adding_visitor_union (void)
+ifr_adding_visitor_union::~ifr_adding_visitor_union ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
index 747fb2e7628..0029f754649 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
@@ -33,7 +33,7 @@ class ifr_adding_visitor_union : public ifr_adding_visitor
 public:
   ifr_adding_visitor_union (AST_Decl *scope);
 
-  virtual ~ifr_adding_visitor_union (void);
+  virtual ~ifr_adding_visitor_union ();
 
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_structure (AST_Structure *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 8c9c04bb1e8..dcb44de6140 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -4,11 +4,11 @@
 #include "utl_scope.h"
 #include "ast_root.h"
 
-ifr_removing_visitor::ifr_removing_visitor (void)
+ifr_removing_visitor::ifr_removing_visitor ()
 {
 }
 
-ifr_removing_visitor::~ifr_removing_visitor (void)
+ifr_removing_visitor::~ifr_removing_visitor ()
 {
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h
index 9499a726cc9..9f830bdddf2 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h
@@ -32,10 +32,10 @@ class ifr_removing_visitor : public ifr_visitor
 {
 public:
   /// Constructor.
-  ifr_removing_visitor (void);
+  ifr_removing_visitor ();
 
   /// Destructor.
-  virtual ~ifr_removing_visitor (void);
+  virtual ~ifr_removing_visitor ();
 
   /// Visit the scope.
   virtual int visit_scope (UTL_Scope *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index f7a0750d2cc..b440b045419 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -8,7 +8,7 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
 
-ifr_visitor::ifr_visitor (void)
+ifr_visitor::ifr_visitor ()
   : lock_ (0)
 {
   // Create the appropriate lock.
@@ -24,7 +24,7 @@ ifr_visitor::ifr_visitor (void)
     }
 }
 
-ifr_visitor::~ifr_visitor (void)
+ifr_visitor::~ifr_visitor ()
 {
   delete this->lock_;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index 99b48ca2a99..9c43d0348a7 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -34,7 +34,7 @@
 class ifr_visitor : public ast_visitor
 {
 public:
-  virtual ~ifr_visitor (void);
+  virtual ~ifr_visitor ();
 
   virtual int visit_decl (AST_Decl *d);
   virtual int visit_scope (UTL_Scope *node);
@@ -93,7 +93,7 @@ public:
 
 protected:
   // Not abstract but we want to force subclassing anyway.
-  ifr_visitor (void);
+  ifr_visitor ();
 
 private:
   /// Lock.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
index 4633fa0dfcf..d2c30c71aaa 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
@@ -1,6 +1,6 @@
 #include "Activator_Info.h"
 
-Activator_Info::Activator_Info (void)
+Activator_Info::Activator_Info ()
   : name ("")
   , token (0)
   , ior ("")
@@ -27,7 +27,7 @@ Activator_Info::Activator_Info (const ACE_CString& aname,
 }
 
 void
-Activator_Info::clear (void)
+Activator_Info::clear ()
 {
   this->name = "";
   this->token = 0;
@@ -36,7 +36,7 @@ Activator_Info::clear (void)
 }
 
 void
-Activator_Info::reset_runtime (void)
+Activator_Info::reset_runtime ()
 {
   this->ior = "";
   this->activator = ImplementationRepository::Activator::_nil ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
index 704e489a354..1bf3a3c14db 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
@@ -15,7 +15,7 @@
 */
 struct Activator_Info
 {
-  Activator_Info (void);
+  Activator_Info ();
   Activator_Info (const Activator_Info& other);
 
   Activator_Info (const ACE_CString& aname,
@@ -24,10 +24,10 @@ struct Activator_Info
     ImplementationRepository::Activator_ptr act =
     ImplementationRepository::Activator::_nil ());
 
-  void clear (void);
+  void clear ();
 
   /// Reset the connection portion
-  void reset_runtime(void);
+  void reset_runtime();
 
   ACE_CString name;
   CORBA::Long token;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 2023bcad320..f23b234e7e2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -19,7 +19,7 @@ public:
   }
 };
 
-ImR_Activator_Loader::ImR_Activator_Loader (void)
+ImR_Activator_Loader::ImR_Activator_Loader ()
 {
 }
 
@@ -56,7 +56,7 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ImR_Activator_Loader::fini (void)
+ImR_Activator_Loader::fini ()
 {
   ACE_ASSERT (this->runner_.get() != 0);
   try
@@ -82,7 +82,7 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
 }
 
 int
-ImR_Activator_Loader::run (void)
+ImR_Activator_Loader::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index 8441aa9113d..deb6a53607a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -18,7 +18,7 @@ class ImR_Activator_ORB_Runner;
 class Activator_Export ImR_Activator_Loader : public TAO_Object_Loader
 {
 public:
-  ImR_Activator_Loader(void);
+  ImR_Activator_Loader();
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -29,7 +29,7 @@ public:
                                            ACE_TCHAR *argv[]);
 
  // Unlike other service objects, we have our own orb.
- int run(void);
+ int run();
 
 private:
   ImR_Activator_i service_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index a05fe2197c8..f52131335bc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -61,7 +61,7 @@ Activator_NT_Service::handle_exception (ACE_HANDLE)
  * we update the report_status after init.
  */
 int
-Activator_NT_Service::svc (void)
+Activator_NT_Service::svc ()
 {
   ImR_Activator_i server;
   Activator_Options opts;
@@ -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/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 1a3ee36d37a..2f469b6e3da 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -223,7 +223,7 @@ Activator_Options::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Activator_Options::init_from_registry (void)
+Activator_Options::init_from_registry ()
 {
   this->load_registry_options();
   return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index 6149c8f469d..041d5a17718 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -30,7 +30,6 @@
 class Activator_Export Activator_Options
 {
 public:
-
   enum SERVICE_COMMAND {
     SC_NONE,
     SC_INSTALL,
@@ -97,7 +96,6 @@ private:
   int load_registry_options ();
 
 private:
-
   /// Our extra command line arguments
   ACE_CString cmdline_;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index a2daa136fa6..92a7caac5ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -12,7 +12,7 @@
 #include "orbsvcs/Log_Macros.h"
 #include "tao/PortableServer/Servant_Base.h"
 
-ImR_Adapter::ImR_Adapter (void)
+ImR_Adapter::ImR_Adapter ()
   : default_servant_ (0)
 {
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 75a1cf2ce32..bcb9e1ea344 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -31,7 +31,7 @@ AsyncAccessManager::AsyncAccessManager (UpdateableServerInfo &info,
   this->prev_pid_ = info_->pid;
 }
 
-AsyncAccessManager::~AsyncAccessManager (void)
+AsyncAccessManager::~AsyncAccessManager ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -40,7 +40,7 @@ AsyncAccessManager::~AsyncAccessManager (void)
 }
 
 void
-AsyncAccessManager::started_running (void)
+AsyncAccessManager::started_running ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -86,7 +86,7 @@ AsyncAccessManager::report (const char* operation) const
 }
 
 void
-AsyncAccessManager::update_prev_pid (void)
+AsyncAccessManager::update_prev_pid ()
 {
   this->prev_pid_ = this->info_->pid;
 }
@@ -310,7 +310,7 @@ AsyncAccessManager::notify_waiter (ImR_ResponseHandler *rh)
 }
 
 void
-AsyncAccessManager::notify_waiters (void)
+AsyncAccessManager::notify_waiters ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -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>";
 }
@@ -444,7 +443,7 @@ AsyncAccessManager::activator_replied_start_running (bool success, int pid)
 }
 
 void
-AsyncAccessManager::shutdown_initiated (void)
+AsyncAccessManager::shutdown_initiated ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -461,7 +460,7 @@ AsyncAccessManager::shutdown_initiated (void)
 }
 
 void
-AsyncAccessManager::server_is_shutting_down (void)
+AsyncAccessManager::server_is_shutting_down ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -590,7 +589,7 @@ AsyncAccessManager::notify_child_death (int pid)
 }
 
 void
-AsyncAccessManager::listener_disconnected (void)
+AsyncAccessManager::listener_disconnected ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -706,7 +705,7 @@ AsyncAccessManager::ping_replied (LiveStatus server)
 }
 
 bool
-AsyncAccessManager::send_start_request (void)
+AsyncAccessManager::send_start_request ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -804,7 +803,7 @@ AsyncAccessManager::send_start_request (void)
 }
 
 AsyncAccessManager *
-AsyncAccessManager::_add_ref (void)
+AsyncAccessManager::_add_ref ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
   ++this->refcount_;
@@ -813,7 +812,7 @@ AsyncAccessManager::_add_ref (void)
 }
 
 void
-AsyncAccessManager::_remove_ref (void)
+AsyncAccessManager::_remove_ref ()
 {
   int count = 0;
   {
@@ -836,12 +835,12 @@ ActivatorReceiver::ActivatorReceiver (AsyncAccessManager *aam,
 {
 }
 
-ActivatorReceiver::~ActivatorReceiver (void)
+ActivatorReceiver::~ActivatorReceiver ()
 {
 }
 
 void
-ActivatorReceiver::start_server (void)
+ActivatorReceiver::start_server ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -899,7 +898,7 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder)
 }
 
 void
-ActivatorReceiver::shutdown (void)
+ActivatorReceiver::shutdown ()
 {
 }
 
@@ -947,7 +946,7 @@ AccessLiveListener::AccessLiveListener (const char *server,
 {
 }
 
-AccessLiveListener::~AccessLiveListener (void)
+AccessLiveListener::~AccessLiveListener ()
 {
   if (!this->aam_.is_nil())
   {
@@ -956,7 +955,7 @@ AccessLiveListener::~AccessLiveListener (void)
 }
 
 bool
-AccessLiveListener::start (void)
+AccessLiveListener::start ()
 {
   bool const started = this->per_client_ ?
     this->pinger_.add_per_client_listener (this, srv_ref_.in()) :
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
index dc2d5716bf6..b9e0828d000 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
@@ -54,9 +54,9 @@ class Locator_Export AsyncAccessManager
   AsyncAccessManager (UpdateableServerInfo &info,
                       ImR_Locator_i &locator);
 
-  ~AsyncAccessManager (void);
+  ~AsyncAccessManager ();
 
-  void started_running (void);
+  void started_running ();
 
   bool is_terminating () const;
   bool is_running () const;
@@ -70,26 +70,26 @@ class Locator_Export AsyncAccessManager
   void activator_replied_start_running (bool success, int pid);
   void server_is_running (const char *partial_ior,
                           ImplementationRepository::ServerObject_ptr ref);
-  void server_is_shutting_down (void);
-  void shutdown_initiated (void);
+  void server_is_shutting_down ();
+  void shutdown_initiated ();
   bool notify_child_death (int pid);
   void ping_replied (LiveStatus server);
-  void listener_disconnected (void);
+  void listener_disconnected ();
 
-  AsyncAccessManager *_add_ref (void);
-  void _remove_ref (void);
+  AsyncAccessManager *_add_ref ();
+  void _remove_ref ();
   static const char *status_name (ImplementationRepository::AAM_Status s);
   static bool is_final (ImplementationRepository::AAM_Status s);
-  void update_prev_pid (void);
+  void update_prev_pid ();
 
  private:
   void report (const char* operation) const;
   void final_state (bool active = true);
   void notify_waiter (ImR_ResponseHandler *rh);
-  void notify_waiters (void);
+  void notify_waiters ();
   void status (ImplementationRepository::AAM_Status s);
   void update_status (ImplementationRepository::AAM_Status s);
-  bool send_start_request (void);
+  bool send_start_request ();
 
   UpdateableServerInfo info_;
   bool manual_start_;
@@ -125,12 +125,12 @@ class ActivatorReceiver :
 public:
   ActivatorReceiver (AsyncAccessManager *aam,
                      PortableServer::POA_ptr poa);
-  virtual ~ActivatorReceiver (void);
+  virtual ~ActivatorReceiver ();
 
-  void start_server (void);
+  void start_server ();
   void start_server_excep (Messaging::ExceptionHolder * excep_holder);
 
-  void shutdown (void);
+  void shutdown ();
   void shutdown_excep (Messaging::ExceptionHolder * excep_holder);
 
   void kill_server (CORBA::Boolean);
@@ -155,8 +155,8 @@ class AccessLiveListener : public LiveListener
                       AsyncAccessManager *aam,
                       LiveCheck &pinger);
 
-  virtual ~AccessLiveListener (void);
-  bool start (void);
+  virtual ~AccessLiveListener ();
+  bool start ();
 
   bool status_changed (LiveStatus status);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
index 0934f68f194..3c6db946c54 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
@@ -25,7 +25,7 @@ AsyncListManager::AsyncListManager (const Locator_Repository *repo,
 {
 }
 
-AsyncListManager::~AsyncListManager (void)
+AsyncListManager::~AsyncListManager ()
 {
   if (ImR_Locator_i::debug() > 4)
     {
@@ -36,13 +36,13 @@ AsyncListManager::~AsyncListManager (void)
 }
 
 PortableServer::POA_ptr
-AsyncListManager::poa (void)
+AsyncListManager::poa ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in());
 }
 
 void
-AsyncListManager::init_list (void)
+AsyncListManager::init_list ()
 {
   CORBA::ULong const len =
     static_cast<CORBA::ULong> (this->repo_->servers ().current_size ());
@@ -146,7 +146,7 @@ AsyncListManager::make_iterator (ImplementationRepository::ServerInformationIter
 }
 
 void
-AsyncListManager::final_state (void)
+AsyncListManager::final_state ()
 {
   if (ImR_Locator_i::debug() > 4)
     {
@@ -313,14 +313,14 @@ AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status, int pid)
 }
 
 AsyncListManager *
-AsyncListManager::_add_ref (void)
+AsyncListManager::_add_ref ()
 {
   ++this->refcount_;
   return this;
 }
 
 void
-AsyncListManager::_remove_ref (void)
+AsyncListManager::_remove_ref ()
 {
   int const count = --this->refcount_;
 
@@ -348,12 +348,12 @@ ListLiveListener::ListLiveListener (const char *server,
 {
 }
 
-ListLiveListener::~ListLiveListener (void)
+ListLiveListener::~ListLiveListener ()
 {
 }
 
 bool
-ListLiveListener::start (void)
+ListLiveListener::start ()
 {
   bool const rtn = this->pinger_.add_poll_listener (this);
   this->started_ = true;
@@ -361,13 +361,13 @@ ListLiveListener::start (void)
 }
 
 LiveStatus
-ListLiveListener::status (void)
+ListLiveListener::status ()
 {
   return this->status_;
 }
 
 void
-ListLiveListener::cancel (void)
+ListLiveListener::cancel ()
 {
   this->pinger_.remove_listener (this);
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
index 6fe0271458d..4879ac15547 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
@@ -43,9 +43,9 @@ class AsyncListManager
                     PortableServer::POA_ptr poa,
                     LiveCheck *pinger);
 
-  ~AsyncListManager (void);
+  ~AsyncListManager ();
 
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
   void list (ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh,
              CORBA::ULong count);
 
@@ -55,15 +55,15 @@ class AsyncListManager
   bool evaluate_status (CORBA::ULong index, LiveStatus status, int pid);
   void ping_replied (CORBA::ULong index, LiveStatus status, int pid);
 
-  AsyncListManager *_add_ref (void);
-  void _remove_ref (void);
+  AsyncListManager *_add_ref ();
+  void _remove_ref ();
 
  private:
-  void init_list (void);
+  void init_list ();
   void list_i (CORBA::ULong start, CORBA::ULong count);
   bool make_iterator (ImplementationRepository::ServerInformationIterator_out si,
                       CORBA::ULong start);
-  void final_state (void);
+  void final_state ();
 
   const Locator_Repository *repo_;
   PortableServer::POA_var poa_;
@@ -90,10 +90,10 @@ class ListLiveListener : public LiveListener
                     AsyncListManager *owner,
                     LiveCheck &pinger);
 
-  virtual ~ListLiveListener (void);
-  bool start (void);
-  void cancel (void);
-  LiveStatus status (void);
+  virtual ~ListLiveListener ();
+  bool start ();
+  void cancel ();
+  LiveStatus status ();
   bool status_changed (LiveStatus status);
 
  private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 60976e69dc6..06fb6740309 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -32,7 +32,7 @@ ImR_DSI_Forwarder::ImR_DSI_Forwarder (ImR_Locator_i& imr_impl)
 {
 }
 
-ImR_DSI_Forwarder::~ImR_DSI_Forwarder (void)
+ImR_DSI_Forwarder::~ImR_DSI_Forwarder ()
 {
 }
 
@@ -171,7 +171,7 @@ ImR_DSI_ResponseHandler::ImR_DSI_ResponseHandler (const char *key,
 {
 }
 
-ImR_DSI_ResponseHandler::~ImR_DSI_ResponseHandler (void)
+ImR_DSI_ResponseHandler::~ImR_DSI_ResponseHandler ()
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 23e81669c28..44fd1feb694 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -55,7 +55,7 @@ public:
                         CORBA::ORB_ptr orb,
                         TAO_AMH_DSI_Response_Handler_ptr resp);
 
-  virtual ~ImR_DSI_ResponseHandler (void);
+  virtual ~ImR_DSI_ResponseHandler ();
 
   void send_ior (const char *pior);
   void send_exception (CORBA::Exception *ex);
@@ -85,7 +85,7 @@ class Locator_Export ImR_DSI_Forwarder : public virtual TAO_DynamicImplementatio
 {
 public:
   ImR_DSI_Forwarder (ImR_Locator_i& imr_impl);
-  virtual ~ImR_DSI_Forwarder (void);
+  virtual ~ImR_DSI_Forwarder ();
 
   virtual void _dispatch (TAO_ServerRequest& request,
                           TAO::Portable_Server::Servant_Upcall *context);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 43c20f68948..679908d3e35 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -84,7 +84,7 @@ ACE_NT_SERVICE_DEFINE (service, Activator_NT_Service, IMR_ACTIVATOR_SERVICE_NAME
 #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
-run_service (void)
+run_service ()
 {
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index ab2e06d5c0f..4b281396eb3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -71,7 +71,7 @@ Watchdog::stop()
 }
 #endif /* ACE_WIN32 */
 
-ImR_Activator_i::ImR_Activator_i (void)
+ImR_Activator_i::ImR_Activator_i ()
   : registration_token_(0)
   , debug_(0)
   , notify_imr_ (false)
@@ -279,7 +279,7 @@ ImR_Activator_i::init (Activator_Options& opts)
 }
 
 int
-ImR_Activator_i::fini (void)
+ImR_Activator_i::fini ()
 {
   try
     {
@@ -335,20 +335,20 @@ ImR_Activator_i::fini (void)
 }
 
 int
-ImR_Activator_i::run (void)
+ImR_Activator_i::run ()
 {
   this->orb_->run ();
   return 0;
 }
 
 void
-ImR_Activator_i::shutdown (void)
+ImR_Activator_i::shutdown ()
 {
   this->shutdown (false);
 }
 
 bool
-ImR_Activator_i::in_upcall (void)
+ImR_Activator_i::in_upcall ()
 {
   try
     {
@@ -537,7 +537,7 @@ ImR_Activator_i::start_server(const char* name,
                                  1,
                                  cmdline_buf_len + 1,
                                  this->env_buf_len_, this->max_env_vars_);
-  proc_opts.command_line (ACE_TEXT_CHAR_TO_TCHAR(cmdline));
+  proc_opts.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR(cmdline));
   proc_opts.working_directory (dir);
   // Win32 does not support the CLOSE_ON_EXEC semantics for sockets
   // the way unix does, so in order to avoid having the child process
@@ -564,13 +564,13 @@ ImR_Activator_i::start_server(const char* name,
     {
       CORBA::String_var ior = orb_->object_to_string (locator_.in ());
       proc_opts.setenv (ACE_TEXT ("ImplRepoServiceIOR"),
-                        ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
+                        ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
     }
 
   for (CORBA::ULong i = 0; i < env.length (); ++i)
     {
       proc_opts.setenv (ACE_TEXT_CHAR_TO_TCHAR (env[i].name.in ()),
-                        ACE_TEXT_CHAR_TO_TCHAR (env[i].value.in ()));
+                        ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR (env[i].value.in ()));
     }
 
   pid = this->process_mgr_.spawn (proc_opts, this);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 86d8c7b604c..f3ecb416bd7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -85,7 +85,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac
 public:
   friend class Active_Pid_Setter;
 
-  ImR_Activator_i (void);
+  ImR_Activator_i ();
 
   void start_server (const char* name,
                      const char* cmdline,
@@ -96,18 +96,18 @@ public:
 
   CORBA::Boolean still_alive (CORBA::Long pid);
 
-  void shutdown(void);
+  void shutdown();
 
   /// Initialize the Server state - parsing arguments and waiting.
   int init (Activator_Options& opts);
 
   /// Cleans up any state created by init*.
-  int fini (void);
+  int fini ();
 
   int handle_timeout (const ACE_Time_Value &, const void *tok);
 
   /// Runs the orb.
-  int run (void);
+  int run ();
 
   /// Shutdown the orb.
   void shutdown (bool signaled);
@@ -124,7 +124,7 @@ private:
 
   bool still_running_i (const char *name, pid_t& pid);
 
-  bool in_upcall (void);
+  bool in_upcall ();
 
 private:
   typedef ACE_Unbounded_Set<ACE_CString> UniqueServerList;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 770eba43712..fdcda8a7ddd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -82,7 +82,7 @@ ACE_NT_SERVICE_DEFINE (service, Locator_NT_Service, IMR_LOCATOR_SERVICE_NAME);
 #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
-run_service (void)
+run_service ()
 {
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index d9cf14c4a7d..2e435ddae6f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -29,7 +29,6 @@ static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000);
 
 static PortableServer::POA_ptr
 createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) {
-
   PortableServer::LifespanPolicy_var life =
     root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
@@ -53,7 +52,7 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) {
 
 int ImR_Locator_i::debug_ = 0;
 
-ImR_Locator_i::ImR_Locator_i (void)
+ImR_Locator_i::ImR_Locator_i ()
   : dsi_forwarder_ (*this)
   , ins_locator_ (0)
   , aam_active_ ()
@@ -70,7 +69,7 @@ ImR_Locator_i::ImR_Locator_i (void)
   ins_locator_ = locator;
 }
 
-ImR_Locator_i::~ImR_Locator_i (void)
+ImR_Locator_i::~ImR_Locator_i ()
 {
 }
 
@@ -238,7 +237,7 @@ ImR_Locator_i::init (Options& opts)
 }
 
 int
-ImR_Locator_i::run (void)
+ImR_Locator_i::run ()
 {
   if (debug_ > 0)
     {
@@ -360,7 +359,7 @@ ImR_Locator_i::opts () const
 }
 
 int
-ImR_Locator_i::fini (void)
+ImR_Locator_i::fini ()
 {
   try
     {
@@ -1540,7 +1539,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 }
 
 void
-ImR_Locator_i::auto_start_servers (void)
+ImR_Locator_i::auto_start_servers ()
 {
   if (this->repository_->servers ().current_size () == 0)
     return;
@@ -1630,8 +1629,6 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
                                 this->opts_->ping_external (),
                                 sip->server.in(),
                                 sip->pid);
-
-
     }
   catch (const CORBA::Exception& )
     {
@@ -1660,13 +1657,13 @@ ImR_Locator_i::debug ()
 }
 
 LiveCheck&
-ImR_Locator_i::pinger (void)
+ImR_Locator_i::pinger ()
 {
   return this->pinger_;
 }
 
 PortableServer::POA_ptr
-ImR_Locator_i::root_poa (void)
+ImR_Locator_i::root_poa ()
 {
   return PortableServer::POA::_duplicate (this->root_poa_.in());
 }
@@ -1772,7 +1769,7 @@ SyncListener::~SyncListener ()
 }
 
 bool
-SyncListener::is_alive (void)
+SyncListener::is_alive ()
 {
   this->callback_ = true;
   while (!this->got_it_)
@@ -1810,7 +1807,7 @@ ImR_SyncResponseHandler::ImR_SyncResponseHandler (const char *objkey, CORBA::ORB
 {
 }
 
-ImR_SyncResponseHandler::~ImR_SyncResponseHandler (void)
+ImR_SyncResponseHandler::~ImR_SyncResponseHandler ()
 {
 }
 
@@ -1829,7 +1826,7 @@ ImR_SyncResponseHandler::send_exception (CORBA::Exception *ex)
 }
 
 char *
-ImR_SyncResponseHandler::wait_for_result (void)
+ImR_SyncResponseHandler::wait_for_result ()
 {
   while (this->result_.in() == 0 && this->excep_ == 0)
     {
@@ -1861,7 +1858,7 @@ ImR_Loc_ResponseHandler::ImR_Loc_ResponseHandler
 {
 }
 
-ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler (void)
+ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler ()
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index abc250a2aa1..da3bc7db940 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -38,7 +38,7 @@ class Locator_Export ImR_Locator_i :
 public:
   ImR_Locator_i();
 
-  ~ImR_Locator_i (void);
+  ~ImR_Locator_i ();
 
   /// Initialize the service, creating its own orb, poa, etc.
   int init (Options& opts);
@@ -47,13 +47,13 @@ public:
   int init_with_orb (CORBA::ORB_ptr orb); //, Options& opts);
 
   /// Cleans up any state created by init*.
-  int fini (void);
+  int fini ();
 
   /// Run using the orb reference created during init()
-  int run (void);
+  int run ();
 
   /// Called by the signal handler to notify of shutdown request
-  void signal_shutdown (void);
+  void signal_shutdown ();
 
   /// Shutdown the orb.
   void shutdown (bool wait_for_completion);
@@ -61,7 +61,7 @@ public:
   /// Access the options
   const Options *opts () const;
 
-  static int debug (void);
+  static int debug ();
   // Note : See the IDL for descriptions of the operations.
 
   // Activator->Locator
@@ -160,8 +160,8 @@ public:
 
   // interfaces to aid with collaboration
 
-  LiveCheck &pinger (void);
-  PortableServer::POA_ptr root_poa (void);
+  LiveCheck &pinger ();
+  PortableServer::POA_ptr root_poa ();
   Activator_Info_Ptr get_activator (const ACE_CString& name);
 
   void remove_server_i (const Server_Info_Ptr &si);
@@ -192,7 +192,7 @@ private:
 
   void connect_activator (Activator_Info& info);
 
-  void auto_start_servers (void);
+  void auto_start_servers ();
 
   void connect_server (UpdateableServerInfo& info);
 
@@ -258,7 +258,7 @@ class SyncListener : public LiveListener
 
   virtual ~SyncListener ();
 
-  bool is_alive (void);
+  bool is_alive ();
 
   bool status_changed (LiveStatus status);
 
@@ -281,12 +281,12 @@ class ImR_SyncResponseHandler : public ImR_ResponseHandler
 {
 public:
   ImR_SyncResponseHandler (const char *key, CORBA::ORB_ptr orb);
-  virtual ~ImR_SyncResponseHandler (void);
+  virtual ~ImR_SyncResponseHandler ();
 
   virtual void send_ior (const char *pior);
   virtual void send_exception (CORBA::Exception *ex);
 
-  char *wait_for_result (void);
+  char *wait_for_result ();
 
 private:
   CORBA::String_var result_;
@@ -320,7 +320,7 @@ public:
                            ImplementationRepository::AMH_AdministrationResponseHandler_ptr rh);
   ImR_Loc_ResponseHandler (Loc_Operation_Id opid,
                            ImplementationRepository::AMH_AdministrationExtResponseHandler_ptr rh);
-  virtual ~ImR_Loc_ResponseHandler (void);
+  virtual ~ImR_Loc_ResponseHandler ();
 
   virtual void send_ior (const char *pior);
   virtual void send_exception (CORBA::Exception *ex);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
index cd1ca302346..ef3bc15ab6e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
@@ -12,7 +12,7 @@ ImR_ResponseHandler::ImR_ResponseHandler ()
 {
 }
 
-ImR_ResponseHandler::~ImR_ResponseHandler (void)
+ImR_ResponseHandler::~ImR_ResponseHandler ()
 {
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h
index bc8ea58d0a8..0e327f880f0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h
@@ -26,8 +26,8 @@
 class ImR_ResponseHandler
 {
 public:
-  ImR_ResponseHandler (void);
-  virtual ~ImR_ResponseHandler (void);
+  ImR_ResponseHandler ();
+  virtual ~ImR_ResponseHandler ();
 
   // Dummy implementations used for internal operations
   virtual void send_ior (const char *pior);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index 959adb90b45..d606a97858f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-
 class ImR_AsyncIterator
   : public POA_ImplementationRepository::AMH_ServerInformationIterator
 {
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index a9684eabc99..22be5392ce1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -16,7 +16,7 @@ LiveListener::LiveListener (const char *server)
 {
 }
 
-LiveListener::~LiveListener (void)
+LiveListener::~LiveListener ()
 {
 }
 
@@ -27,7 +27,7 @@ LiveListener::server () const
 }
 
 LiveListener *
-LiveListener::_add_ref (void)
+LiveListener::_add_ref ()
 {
   int const refcount = ++this->refcount_;
   if (ImR_Locator_i::debug () > 5)
@@ -40,7 +40,7 @@ LiveListener::_add_ref (void)
 }
 
 void
-LiveListener::_remove_ref (void)
+LiveListener::_remove_ref ()
 {
   int const count = --this->refcount_;
   if (ImR_Locator_i::debug () > 5)
@@ -102,7 +102,7 @@ LiveEntry::reping_available () const
 }
 
 int
-LiveEntry::next_reping (void)
+LiveEntry::next_reping ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, -1);
   return this->reping_available() ? LiveEntry::reping_msec_[this->repings_++] : -1;
@@ -146,7 +146,7 @@ LiveEntry::LiveEntry (LiveCheck *owner,
     }
 }
 
-LiveEntry::~LiveEntry (void)
+LiveEntry::~LiveEntry ()
 {
   if (this->callback_.in () != 0)
     {
@@ -159,7 +159,7 @@ LiveEntry::~LiveEntry (void)
 }
 
 void
-LiveEntry::release_callback (void)
+LiveEntry::release_callback ()
 {
   this->callback_ = 0;
 }
@@ -195,7 +195,7 @@ LiveEntry::remove_listener (LiveListener *ll)
 }
 
 void
-LiveEntry::reset_status (void)
+LiveEntry::reset_status ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
   if ( this->liveliness_ == LS_ALIVE ||
@@ -238,14 +238,13 @@ LiveEntry::status () const
 }
 
 void
-LiveEntry::update_listeners (void)
+LiveEntry::update_listeners ()
 {
   Listen_Set remove;
   for (Listen_Set::ITERATOR i(this->listeners_);
        !i.done();
        i.advance ())
     {
-
       if ((*i)->status_changed (this->liveliness_))
         {
           remove.insert (*i);
@@ -495,12 +494,12 @@ PingReceiver::PingReceiver (LiveEntry *entry, PortableServer::POA_ptr poa)
 {
 }
 
-PingReceiver::~PingReceiver (void)
+PingReceiver::~PingReceiver ()
 {
 }
 
 void
-PingReceiver::cancel (void)
+PingReceiver::cancel ()
 {
   if (ImR_Locator_i::debug () > 4)
     {
@@ -532,7 +531,7 @@ PingReceiver::cancel (void)
 }
 
 void
-PingReceiver::ping (void)
+PingReceiver::ping ()
 {
   if (this->entry_ != 0)
     {
@@ -633,7 +632,7 @@ LC_TimeoutGuard::LC_TimeoutGuard (LiveCheck *owner, LC_token_type token)
   owner_->enter_handle_timeout ();
 }
 
-LC_TimeoutGuard::~LC_TimeoutGuard (void)
+LC_TimeoutGuard::~LC_TimeoutGuard ()
 {
   owner_->exit_handle_timeout ();
 
@@ -703,7 +702,7 @@ LiveCheck::LiveCheck ()
 {
 }
 
-LiveCheck::~LiveCheck (void)
+LiveCheck::~LiveCheck ()
 {
   for (LiveEntryMap::iterator em (this->entry_map_); !em.done(); em++)
     {
@@ -720,19 +719,19 @@ LiveCheck::~LiveCheck (void)
 }
 
 void
-LiveCheck::enter_handle_timeout (void)
+LiveCheck::enter_handle_timeout ()
 {
   ++this->handle_timeout_busy_;
 }
 
 void
-LiveCheck::exit_handle_timeout (void)
+LiveCheck::exit_handle_timeout ()
 {
   --this->handle_timeout_busy_;
 }
 
 bool
-LiveCheck::in_handle_timeout (void)
+LiveCheck::in_handle_timeout ()
 {
   return this->handle_timeout_busy_ != 0;
 }
@@ -750,7 +749,7 @@ LiveCheck::init (CORBA::ORB_ptr orb,
 }
 
 void
-LiveCheck::shutdown (void)
+LiveCheck::shutdown ()
 {
   this->running_ = false;
   this->reactor()->cancel_timer (this);
@@ -969,7 +968,7 @@ LiveCheck::remove_server (const char *server, int pid)
 }
 
 void
-LiveCheck::remove_deferred_servers (void)
+LiveCheck::remove_deferred_servers ()
 {
   if (!this->removed_entries_.is_empty ())
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
index 610b942a4ed..a61ec955363 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
@@ -76,7 +76,7 @@ class Locator_Export LiveListener
   /// look up a listener entry in the LiveCheck map.
   LiveListener (const char *server);
 
-  virtual ~LiveListener (void);
+  virtual ~LiveListener ();
 
   /// called by the asynch ping receiver when a reply or an exception
   /// is received. Returns true if finished listening
@@ -85,8 +85,8 @@ class Locator_Export LiveListener
   /// Accessor for the server name. Used by the LiveCheck to associate a listener
   const char *server () const;
 
-  LiveListener *_add_ref (void);
-  void _remove_ref (void);
+  LiveListener *_add_ref ();
+  void _remove_ref ();
 
  protected:
   ACE_CString server_;
@@ -116,25 +116,25 @@ class Locator_Export LiveEntry
              bool may_ping,
              ImplementationRepository::ServerObject_ptr ref,
              int pid);
-  ~LiveEntry (void);
+  ~LiveEntry ();
 
-  void release_callback (void);
+  void release_callback ();
   void add_listener (LiveListener *ll);
   void remove_listener (LiveListener *ll);
   LiveStatus status () const;
   void status (LiveStatus l);
-  void reset_status (void);
+  void reset_status ();
 
   /// the current state value as text
   static const char *status_name (LiveStatus s);
 
-  void update_listeners (void);
+  void update_listeners ();
   bool validate_ping (bool &want_reping, ACE_Time_Value &next);
   void do_ping (PortableServer::POA_ptr poa);
   const ACE_Time_Value &next_check () const;
   static void set_reping_limit (int max);
   bool reping_available () const;
-  int next_reping (void);
+  int next_reping ();
   void max_retry_msec (int max);
   const char *server_name () const;
   void set_pid (int pid);
@@ -176,14 +176,14 @@ class Locator_Export PingReceiver :
 {
  public:
   PingReceiver (LiveEntry * entry, PortableServer::POA_ptr poa);
-  virtual ~PingReceiver (void);
+  virtual ~PingReceiver ();
 
   /// Called by the entry if it is no longer interested in the result of
   /// a ping.
-  void cancel (void);
+  void cancel ();
 
   /// Called when an anticipated ping reply is received
-  void ping (void);
+  void ping ();
 
   /// Called when an anticipated ping raises an exception
   void ping_excep (Messaging::ExceptionHolder * excep_holder);
@@ -222,7 +222,7 @@ class Locator_Export LC_TimeoutGuard
 
   /// Releases the flag. If the LiveCheck received any requests for an immediate
   /// or deferred ping during this time, schedule it now.
-  ~LC_TimeoutGuard (void);
+  ~LC_TimeoutGuard ();
 
   /// Returns true if the in handle timeout in the owner was already set.
   bool blocked () const;
@@ -250,11 +250,11 @@ class Locator_Export LiveCheck : public ACE_Event_Handler
   friend class LC_TimeoutGuard;
 
   LiveCheck ();
-  ~LiveCheck (void);
+  ~LiveCheck ();
 
   void init (CORBA::ORB_ptr orb,
              const ACE_Time_Value &interval);
-  void shutdown (void);
+  void shutdown ();
   int handle_timeout (const ACE_Time_Value &current_time,
                       const void *act = 0);
   bool has_server (const char *server);
@@ -275,10 +275,10 @@ class Locator_Export LiveCheck : public ACE_Event_Handler
   const ACE_Time_Value &ping_interval () const;
 
  private:
-  void enter_handle_timeout (void);
-  void exit_handle_timeout (void);
-  bool in_handle_timeout (void);
-  void remove_deferred_servers (void);
+  void enter_handle_timeout ();
+  void exit_handle_timeout ();
+  bool in_handle_timeout ();
+  void remove_deferred_servers ();
 
   typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                   LiveEntry *,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index 4328605dad5..4a5f2e10eb0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -50,7 +50,7 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ImR_Locator_Loader::fini (void)
+ImR_Locator_Loader::fini ()
 {
   ACE_ASSERT(this->runner_.get () != 0);
   try
@@ -76,7 +76,7 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
 }
 
 int
-ImR_Locator_Loader::run(void)
+ImR_Locator_Loader::run()
 {
   try
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index 8bcd258b37f..76f39081061 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -28,7 +28,7 @@ public:
                                            ACE_TCHAR *argv[]);
 
  // Unlike other service objects, we have our own orb.
- int run(void);
+ int run();
 
 private:
   ImR_Locator_i service_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 0ba84a23c44..53ea42e2495 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -57,7 +57,7 @@ Locator_NT_Service::handle_exception (ACE_HANDLE)
  * We do almost the same thing as we do in run_standalone ()
  */
 int
-Locator_NT_Service::svc (void)
+Locator_NT_Service::svc ()
 {
   ImR_Locator_i server;
   Options opts;
@@ -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/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index ae17ac4ad0a..282c8f2324a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -359,7 +359,7 @@ Options::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Options::init_from_registry (void)
+Options::init_from_registry ()
 {
   this->load_registry_options ();
   return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index ce0cb52bef6..7e6856b6680 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -34,7 +34,6 @@ class LiveCheck;
 class Locator_Export Options
 {
 public:
-
   enum SERVICE_COMMAND {
     SC_NONE,
     SC_INSTALL,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 2c41bddea40..29b7d010aaf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -26,7 +26,7 @@ Locator_Repository::~Locator_Repository ()
 }
 
 void
-Locator_Repository::shutdown (void)
+Locator_Repository::shutdown ()
 {
   // default impl - no op
 }
@@ -127,7 +127,7 @@ Locator_Repository::report_ior (PortableServer::POA_ptr )
 }
 
 int
-Locator_Repository::recover_ior (void)
+Locator_Repository::recover_ior ()
 {
   if (this->registered_)
     {
@@ -592,7 +592,6 @@ Locator_Repository::link_peers (Server_Info_Ptr base,
   this->persistent_update (base, true);
 
   return 0;
-
 }
 
 // -------------------------------------------------------------------------------------
@@ -645,7 +644,7 @@ Locator_Repository::remove_activator (const ACE_CString& name)
 }
 
 Locator_Repository::SIMap&
-Locator_Repository::servers (void)
+Locator_Repository::servers ()
 {
   return server_infos_;
 }
@@ -657,7 +656,7 @@ Locator_Repository::servers () const
 }
 
 Locator_Repository::AIMap&
-Locator_Repository::activators (void)
+Locator_Repository::activators ()
 {
   return activator_infos_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index 45dd43ffbff..f32a1f7d1ac 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -59,7 +59,7 @@ public:
 
   virtual ~Locator_Repository();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   int unregister_if_address_reused (const ACE_CString& fqname,
                                     const char* partial_ior,
@@ -113,10 +113,10 @@ public:
   int remove_activator (const ACE_CString& name);
 
   /// Returns the internal hash map containing the server information.
-  SIMap& servers(void);
+  SIMap& servers();
   const SIMap& servers() const;
   /// Returns the internal hash map containing the activator information.
-  AIMap& activators(void);
+  AIMap& activators();
   const AIMap& activators() const;
 
   /// Indicate the persistence mode for the repository
@@ -143,7 +143,7 @@ protected:
   /// perform sync of repo with backing store
   /// defaults to no-op, only shared backing stores
   /// need to sync
-  virtual int sync_load (void);
+  virtual int sync_load ();
 
   /// perform server persistent update
   virtual int persistent_update (const Server_Info_Ptr& info, bool add) = 0;
@@ -155,7 +155,7 @@ protected:
   virtual int persistent_remove (const ACE_CString& name, bool activator) = 0;
 
   /// recover the ImR Locator's IOR from the persisted file
-  virtual int recover_ior (void);
+  virtual int recover_ior ();
 
   int setup_multicast (ACE_Reactor* reactor, const char* imr_ior);
   void teardown_multicast ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp
index aeb716fbab3..e14f60fd7f4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp
@@ -83,7 +83,7 @@ Replicator::~Replicator()
 }
 
 void
-Replicator::init_orb (void)
+Replicator::init_orb ()
 {
   int argc = 6;
   ACE_TCHAR *argv[8];
@@ -119,19 +119,19 @@ Replicator::init_orb (void)
 }
 
 char *
-Replicator::ior (void)
+Replicator::ior ()
 {
   return this->orb_->object_to_string (this->me_.in ());
 }
 
 bool
-Replicator::peer_available (void)
+Replicator::peer_available ()
 {
   return !CORBA::is_nil (this->peer_.in ());
 }
 
 void
-Replicator::stop (void)
+Replicator::stop ()
 {
   if (this->reactor_ == 0)
     {
@@ -141,7 +141,7 @@ Replicator::stop (void)
 }
 
 int
-Replicator::svc (void)
+Replicator::svc ()
 {
   if (this->reactor_ == 0)
     {
@@ -325,7 +325,6 @@ Replicator::send_entity (ImplementationRepository::UpdateInfo &info)
 int
 Replicator::send_registration (char *&imr_ior)
 {
-
   if (this->debug_ > 1)
     {
       ORBSVCS_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.h b/TAO/orbsvcs/ImplRepo_Service/Replicator.h
index b08775cb800..905dec77683 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Replicator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.h
@@ -77,22 +77,22 @@ public:
 
   Replicator (Shared_Backing_Store &repo, const Options& opts);
 
-  virtual ~Replicator(void);
+  virtual ~Replicator();
 
   virtual int svc ();
   virtual int handle_exception (ACE_HANDLE );
 
-  void stop (void);
+  void stop ();
   void send_access_state (const char *name, ImplementationRepository::AAM_Status state);
   void send_entity (ImplementationRepository::UpdateInfo &info);
 
-  void init_orb (void);
+  void init_orb ();
 
   bool init_peer (const ACE_CString &filename );
   int send_registration (char *&ior );
 
-  bool peer_available (void);
-  char * ior (void);
+  bool peer_available ();
+  char * ior ();
 
 private:
   Replica_var me_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 254fbf91d31..08713c61c5d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -1,6 +1,6 @@
 #include "Server_Info.h"
 
-Server_Info::Server_Info (void)
+Server_Info::Server_Info ()
 {
   this->clear ();
 }
@@ -99,7 +99,7 @@ Server_Info::Server_Info (const ACE_CString& serverId,
 }
 
 Server_Info *
-Server_Info::active_info (void)
+Server_Info::active_info ()
 {
   return this->alt_info_.null() ? this : this->alt_info_.get();
 }
@@ -152,7 +152,7 @@ Server_Info::is_running () const
 }
 
 bool
-Server_Info::start_allowed (void)
+Server_Info::start_allowed ()
 {
   Server_Info *active = this->active_info ();
   bool allowed = active->start_count_ < active->start_limit_;
@@ -277,7 +277,7 @@ Server_Info::createImRServerInfo () const
 }
 
 void
-Server_Info::clear (void)
+Server_Info::clear ()
 {
   server_id = "";
   poa_name = "";
@@ -301,7 +301,7 @@ Server_Info::clear (void)
 }
 
 void
-Server_Info::reset_runtime (void)
+Server_Info::reset_runtime ()
 {
   this->partial_ior = "";
   Server_Info *startup = this->active_info ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index 069b8764293..5132dfa1447 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -28,7 +28,7 @@ typedef ACE_Strong_Bound_Ptr<Server_Info, ACE_Null_Mutex> Server_Info_Ptr;
 */
 struct Server_Info
 {
-  Server_Info (void);
+  Server_Info ();
   Server_Info (const Server_Info & other);
 
   Server_Info (const ACE_CString& fqname,
@@ -49,13 +49,13 @@ struct Server_Info
 
   Server_Info & operator= (const Server_Info& other);
 
-  void clear (void);
+  void clear ();
 
   /// Convert to the corba type
   void setImRInfo (ImplementationRepository::ServerInformation* info) const;
   ImplementationRepository::ServerInformation* createImRServerInfo() const;
 
-  void reset_runtime (void);
+  void reset_runtime ();
 
   bool is_server (const char *name) const;
   bool has_peer (const char *name) const;
@@ -63,7 +63,7 @@ struct Server_Info
   ImplementationRepository::ActivationMode mode () const;
 
   bool is_running () const;
-  bool start_allowed (void);
+  bool start_allowed ();
   void started (bool success);
 
   // transform the supplied limit to always be at least 1
@@ -74,7 +74,7 @@ struct Server_Info
                     const char *sior,
                     ImplementationRepository::ServerObject_ptr svrobj);
 
-  Server_Info *active_info (void);
+  Server_Info *active_info ();
   const Server_Info *active_info () const;
 
   const char * ping_id () const;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index 8f06171529d..29b71f9529a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -23,7 +23,7 @@ namespace {
   class Lockable_File
   {
   public:
-    Lockable_File (void)
+    Lockable_File ()
       : file_lock_ (),
         file_ (0),
         flags_ (0),
@@ -46,12 +46,12 @@ namespace {
       init_fl(file, flags, unlink_in_destructor);
     }
 
-    ~Lockable_File (void)
+    ~Lockable_File ()
     {
       release ();
     }
 
-    void release (void)
+    void release ()
     {
       if (this->file_ != 0)
         {
@@ -61,7 +61,7 @@ namespace {
       this->locked_ = false;
     }
 
-    FILE* get_file (void)
+    FILE* get_file ()
     {
       lock ();
 
@@ -103,7 +103,7 @@ namespace {
 #endif
     }
 
-    void close_file (void)
+    void close_file ()
     {
       if (this->file_ == 0)
         return;
@@ -120,7 +120,7 @@ namespace {
 #endif
     }
 
-    void lock (void)
+    void lock ()
     {
 #if !defined (ACE_WIN32)
       if (this->locked_)
@@ -248,7 +248,7 @@ Shared_Backing_Store::~Shared_Backing_Store()
 }
 
 void
-Shared_Backing_Store::shutdown (void)
+Shared_Backing_Store::shutdown ()
 {
   this->replicator_.stop ();
   this->replicator_.wait ();
@@ -536,7 +536,7 @@ Shared_Backing_Store::repo_mode() const
 }
 
 int
-Shared_Backing_Store::connect_replicas (void)
+Shared_Backing_Store::connect_replicas ()
 {
   ACE_CString replica_ior_file = this->replica_ior_filename (true);
   bool was_running = this->replicator_.init_peer (replica_ior_file);
@@ -895,7 +895,6 @@ Shared_Backing_Store::locator_service_ior (const char* peer_ior) const
   char* const combined_ior =
     this->orb_->object_to_string(locator_service.in ());
   return combined_ior;
-
 }
 
 void
@@ -1028,7 +1027,7 @@ Shared_Backing_Store::Update_Handler::handle_exception (ACE_HANDLE)
 }
 
 void
-Shared_Backing_Store::process_updates (void)
+Shared_Backing_Store::process_updates ()
 {
   //  ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->sync_lock_);
   this->notified_ = false;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
index f4c6ecc082e..4b75bac1916 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
@@ -67,7 +67,7 @@ public:
 
   virtual ~Shared_Backing_Store();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// indicate the persistence mode for the repository
   virtual const ACE_TCHAR* repo_mode() const;
@@ -109,7 +109,7 @@ public:
   void gen_ior (char*& ft_imr_ior);
   void updates_available (const ImplementationRepository::UpdateInfoSeq& info,
                           bool missed);
-  void process_updates (void);
+  void process_updates ();
 
 protected:
   /// perform shared backing store specific initialization
@@ -136,7 +136,7 @@ protected:
   /// this ImR Locator's IOR
   char* locator_service_ior(const char* peer_ior) const;
 
-  int connect_replicas (void);
+  int connect_replicas ();
 
 private:
   /// map management helper functions
@@ -288,7 +288,6 @@ private:
     Update_Handler (Shared_Backing_Store *owner) : owner_ (owner) {}
     int handle_exception (ACE_HANDLE);
   } update_handler_;
-
 };
 
 #endif /* SHARED_BACKING_STORE_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
index daf9eb94551..11c23c8db80 100644
--- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
+++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
@@ -44,10 +44,10 @@ public:
   UpdateableServerInfo(UpdateableServerInfo& other );
 
   /// Destructor (updates repo if needed)
-  ~UpdateableServerInfo(void);
+  ~UpdateableServerInfo();
 
   /// Explicitly update repo if needed
-  void update_repo(void);
+  void update_repo();
 
   /// Update remote access state
   void notify_remote_access (ImplementationRepository::AAM_Status state);
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
index 8a327299054..a7da1bb2082 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
@@ -44,7 +44,7 @@ public:
                      CORBA::ORB_ptr orb,
                      bool suppress_erase = false);
 
-  virtual ~XML_Backing_Store (void);
+  virtual ~XML_Backing_Store ();
 
   /// indicate the XML filename as the persistence mode for the repository
   virtual const ACE_TCHAR* repo_mode () const;
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index c3019685522..2a55ef99a9a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -12,7 +12,7 @@
 #include "ace/os_include/os_netdb.h"
 #include "ace/OS_NS_unistd.h"
 
-TAO_IMR_i::TAO_IMR_i (void)
+TAO_IMR_i::TAO_IMR_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -22,7 +22,7 @@ TAO_IMR_i::TAO_IMR_i (void)
   // Nothing
 }
 
-TAO_IMR_i::~TAO_IMR_i (void)
+TAO_IMR_i::~TAO_IMR_i ()
 {
 }
 
@@ -92,7 +92,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv)
 // Go through and figure out which operation we should do.
 
 int
-TAO_IMR_i::parse_args (void)
+TAO_IMR_i::parse_args ()
 {
   // Make sure one command was given
   if (this->argc_ < 2)
@@ -121,7 +121,7 @@ TAO_IMR_i::parse_args (void)
 // Print out information about all operations.
 
 void
-TAO_IMR_i::print_usage (void)
+TAO_IMR_i::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n"
     "  where [options] are ORB options\n"
@@ -263,7 +263,7 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
   ORBSVCS_DEBUG ((LM_DEBUG, "\n"));
 }
 
-TAO_IMR_Op_List::TAO_IMR_Op_List (void)
+TAO_IMR_Op_List::TAO_IMR_Op_List ()
 : verbose_server_information_ (0)
 , list_only_active_servers_ (0)
 , how_many_ (0)
@@ -287,7 +287,7 @@ TAO_IMR_Op_Register::TAO_IMR_Op_Register (bool is_add)
 }
 
 void
-TAO_IMR_Op_Activate::print_usage (void)
+TAO_IMR_Op_Activate::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
                   "Starts a server using its registered Activator.\n\n"
@@ -334,7 +334,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Autostart::print_usage (void)
+TAO_IMR_Op_Autostart::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n"
     "  where [options] are ORB options\n"
@@ -366,7 +366,7 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_IOR::print_usage (void)
+TAO_IMR_Op_IOR::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n"
     "the InterOperable Naming Service.  Please see the documentation for\n"
@@ -423,7 +423,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Kill::print_usage (void)
+TAO_IMR_Op_Kill::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
                   "Sends a signal to the designated process\n\n"
@@ -478,7 +478,7 @@ TAO_IMR_Op_Kill::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Link::print_usage (void)
+TAO_IMR_Op_Link::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Links multiple POAs to a single executable\n"
     "\n"
@@ -548,7 +548,7 @@ TAO_IMR_Op_Link::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_List::print_usage (void)
+TAO_IMR_Op_List::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n"
     "\n"
@@ -608,7 +608,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Remove::print_usage (void)
+TAO_IMR_Op_Remove::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Removes a server entry\n"
     "\n"
@@ -662,7 +662,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
 }
 
 void
-TAO_IMR_Op_Shutdown::print_usage (void)
+TAO_IMR_Op_Shutdown::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
                   "Shuts down a server\n\n"
@@ -714,7 +714,7 @@ TAO_IMR_Op_ShutdownRepo::TAO_IMR_Op_ShutdownRepo()
 }
 
 void
-TAO_IMR_Op_ShutdownRepo::print_usage (void)
+TAO_IMR_Op_ShutdownRepo::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR, "Shuts down the ImR\n"
     "\n"
@@ -775,7 +775,7 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt)
 }
 
 void
-TAO_IMR_Op_Register::print_usage (void)
+TAO_IMR_Op_Register::print_usage ()
 {
   ORBSVCS_ERROR ((LM_ERROR,
     "Adds/Updates a server entry\n\n"
@@ -876,7 +876,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv)
 
 
 int
-TAO_IMR_Op_Activate::run (void)
+TAO_IMR_Op_Activate::run ()
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
   try
@@ -927,7 +927,7 @@ TAO_IMR_Op_Activate::run (void)
 }
 
 int
-TAO_IMR_Op_Autostart::run (void)
+TAO_IMR_Op_Autostart::run ()
 {
   ACE_ASSERT(! CORBA::is_nil (imr_));
 
@@ -967,7 +967,7 @@ TAO_IMR_Op_Autostart::run (void)
 }
 
 int
-TAO_IMR_Op_IOR::run (void)
+TAO_IMR_Op_IOR::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1055,7 +1055,7 @@ TAO_IMR_Op_IOR::run (void)
 }
 
 int
-TAO_IMR_Op_Kill::run (void)
+TAO_IMR_Op_Kill::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1104,7 +1104,7 @@ TAO_IMR_Op_Kill::run (void)
 }
 
 int
-TAO_IMR_Op_Link::run (void)
+TAO_IMR_Op_Link::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1148,7 +1148,7 @@ TAO_IMR_Op_Link::run (void)
 
 
 int
-TAO_IMR_Op_List::run (void)
+TAO_IMR_Op_List::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1220,7 +1220,7 @@ TAO_IMR_Op_List::run (void)
 }
 
 int
-TAO_IMR_Op_Remove::run (void)
+TAO_IMR_Op_Remove::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1274,7 +1274,7 @@ TAO_IMR_Op_Remove::run (void)
 }
 
 int
-TAO_IMR_Op_Shutdown::run (void)
+TAO_IMR_Op_Shutdown::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
@@ -1318,7 +1318,7 @@ TAO_IMR_Op_Shutdown::run (void)
 }
 
 int
-TAO_IMR_Op_ShutdownRepo::run (void)
+TAO_IMR_Op_ShutdownRepo::run ()
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
 
@@ -1343,7 +1343,7 @@ TAO_IMR_Op_ShutdownRepo::run (void)
 }
 
 int
-TAO_IMR_Op_Register::run (void)
+TAO_IMR_Op_Register::run ()
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
index acdcc910380..f24b40bdb06 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
@@ -30,23 +30,22 @@ class TAO_IMR_Op;
 class TAO_IMR_i
 {
 public:
-
   // = Constructor and destructor.
-  TAO_IMR_i (void);
-  ~TAO_IMR_i (void);
+  TAO_IMR_i ();
+  ~TAO_IMR_i ();
 
   /// Execute client code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
 
 private:
   /// Print out information about all operations.
-  void print_usage (void);
+  void print_usage ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -90,19 +89,19 @@ public:
   static TAO_IMR_Op *make_op (const ACE_TCHAR *op_name);
 
   /// Destructor.
-  virtual ~TAO_IMR_Op (void);
+  virtual ~TAO_IMR_Op ();
 
   /// Parse arguments.
   virtual int parse (int argc, ACE_TCHAR **argv) = 0;
 
   /// Do the work.
-  virtual int run (void) = 0;
+  virtual int run () = 0;
 
   /// Sets the implrepo locator pointer
   void set_imr (ImplementationRepository::Administration_ptr imr);
 
 protected:
-  TAO_IMR_Op (void) : imr_ (0), quiet_ (false) {}
+  TAO_IMR_Op () : imr_ (0), quiet_ (false) {}
 
   // = Helper methods
 
@@ -126,11 +125,11 @@ class TAO_IMR_Op_Activate : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
@@ -148,11 +147,11 @@ class TAO_IMR_Op_Autostart : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 };
 
 
@@ -168,11 +167,11 @@ class TAO_IMR_Op_IOR : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
@@ -193,11 +192,11 @@ class TAO_IMR_Op_Kill : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
   int signum_;
@@ -215,11 +214,11 @@ class TAO_IMR_Op_Link : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
 
@@ -227,7 +226,6 @@ protected:
 };
 
 
-
 /**
  * @class TAO_IMR_Op_List
  *
@@ -239,14 +237,14 @@ protected:
 class TAO_IMR_Op_List : public TAO_IMR_Op
 {
 public:
-  TAO_IMR_Op_List (void);
+  TAO_IMR_Op_List ();
 
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
@@ -280,11 +278,11 @@ class TAO_IMR_Op_Remove : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
   bool force_;
@@ -303,11 +301,11 @@ class TAO_IMR_Op_Shutdown : public TAO_IMR_Op
 {
 public:
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
   /// Prints a message about the usage
-  void print_usage (void);
+  void print_usage ();
 
   ACE_CString server_name_;
 };
@@ -320,10 +318,10 @@ class TAO_IMR_Op_ShutdownRepo : public TAO_IMR_Op
 public:
   TAO_IMR_Op_ShutdownRepo();
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
-  void print_usage (void);
+  void print_usage ();
 
   bool activators_;
 };
@@ -342,10 +340,9 @@ public:
   TAO_IMR_Op_Register(bool is_add);
 
   virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
+  virtual int run ();
 
 protected:
-
   /// Enables pre-registration checks
   bool is_add_;
 
@@ -353,7 +350,7 @@ protected:
   void addenv (ACE_TCHAR *opt);
 
   /// Prints a message about the usage.
-  void print_usage (void);
+  void print_usage ();
 
   /// POA server name.
   ACE_CString server_name_;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index ecc9e69a0f2..65c02ac3e62 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -14,7 +14,6 @@
 #include "ace/OS_NS_string.h"
 
 
-
 Criteria_Evaluator::Criteria_Evaluator (const CosLifeCycle::Criteria &criteria)
 : criteria_ (criteria)
 {
@@ -25,7 +24,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 }
 
 const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (void)
+Criteria_Evaluator::getInitialization ()
 {
   const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0;
 
@@ -42,7 +41,7 @@ Criteria_Evaluator::getInitialization (void)
 }
 
 char *
-Criteria_Evaluator::getFilter (void)
+Criteria_Evaluator::getFilter ()
 {
   const char* string;
   CORBA::Any value;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index be0dd75e3f5..0a58031a210 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -22,18 +22,18 @@ class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator
 {
 public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
-  ~Criteria_Evaluator (void);
+  ~Criteria_Evaluator ();
 
-  const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (void);
+  const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization ();
 
-  char * getFilter (void);
+  char * getFilter ();
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (void)
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation ()
     {
       return 0;
     }
 
-  char * getPreferences (void)
+  char * getPreferences ()
     {
       return 0;
     }
@@ -50,4 +50,3 @@ private:
 
 
 
-
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/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 2f23dbe7de1..0bd674008d4 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -16,12 +16,12 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-Life_Cycle_Service_Server::Life_Cycle_Service_Server (void)
+Life_Cycle_Service_Server::Life_Cycle_Service_Server ()
 :   debug_level_ (1)
 {
 }
 
-Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
+Life_Cycle_Service_Server::~Life_Cycle_Service_Server ()
 {
   try
     {
@@ -126,7 +126,7 @@ Life_Cycle_Service_Server::init (int argc,
 
 
 int
-Life_Cycle_Service_Server::run (void)
+Life_Cycle_Service_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -159,7 +159,7 @@ Life_Cycle_Service_Server::parse_args (int argc,
         ORBSVCS_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     argv[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ORBSVCS_DEBUG ((LM_DEBUG,
                     ACE_TEXT("usage:  %s")
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index d85b29f5249..8255eb62173 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -29,20 +29,19 @@
  */
 class Life_Cycle_Service_Server
 {
-
 public:
   /// Default constructor
-  Life_Cycle_Service_Server (void);
+  Life_Cycle_Service_Server ();
 
   /// Destructor
-  ~Life_Cycle_Service_Server (void);
+  ~Life_Cycle_Service_Server ();
 
   /// Initialize the Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Parse the passed parameters.
   u_int parse_args (int argc,
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 358ca85d90c..68746b24775 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -25,7 +25,7 @@ Life_Cycle_Service_i::Life_Cycle_Service_i (int debug_level)
 }
 
 // Destructor.
-Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
+Life_Cycle_Service_i::~Life_Cycle_Service_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index b81dbb945b7..5ed3bbd2edf 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -24,10 +24,9 @@
  */
 class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service
 {
-
 public:
   Life_Cycle_Service_i (int debug_level = 1);
-  ~Life_Cycle_Service_i (void);
+  ~Life_Cycle_Service_i ();
 
   /// Returns true if the Generic Factory is able to forward a request
   /// for creating an object described by the <factory_key>.
@@ -62,5 +61,3 @@ private:
 
 
 
-
-
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
index b205c0b392d..73e57c89fa8 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
@@ -32,7 +32,6 @@
 class TAO_LB_Monitor_Signal_Handler : public TAO_LB_Signal_Handler
 {
 public:
-
   /// Constructor.
   TAO_LB_Monitor_Signal_Handler (
     CORBA::ORB_ptr orb,
@@ -41,19 +40,16 @@ public:
     const PortableGroup::Location & location);
 
 protected:
-
   /// Template method that initiates the cleanup process.
   virtual int perform_cleanup (int signum);
 
 private:
-
   /// Reference to the LoadManager with which the LoadMonitor is
   /// registered.
   CosLoadBalancing::LoadManager_var load_manager_;
 
   /// Reference to the location the LoadMonitor resides at.
   const PortableGroup::Location & location_;
-
 };
 
 
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index be03640c14d..16b2419b728 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -19,7 +19,7 @@ TAO_LB_Signal_Handler::TAO_LB_Signal_Handler (CORBA::ORB_ptr orb,
 }
 
 int
-TAO_LB_Signal_Handler::svc (void)
+TAO_LB_Signal_Handler::svc ()
 {
   // This method is only invoked when performing synchronous signal
   // handling.
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index d8094afeb0c..ef83acee478 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-Basic_Logging_Service::Basic_Logging_Service (void)
+Basic_Logging_Service::Basic_Logging_Service ()
   : service_name_ ("BasicLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -16,7 +16,7 @@ Basic_Logging_Service::Basic_Logging_Service (void)
   // No-Op.
 }
 
-Basic_Logging_Service::~Basic_Logging_Service (void)
+Basic_Logging_Service::~Basic_Logging_Service ()
 {
   // No-Op.
 }
@@ -159,7 +159,7 @@ Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Basic_Logging_Service::resolve_naming_service (void)
+Basic_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -173,7 +173,7 @@ Basic_Logging_Service::resolve_naming_service (void)
 }
 
 int
-Basic_Logging_Service::run (void)
+Basic_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -190,7 +190,7 @@ Basic_Logging_Service::run (void)
 }
 
 int
-Basic_Logging_Service::svc (void)
+Basic_Logging_Service::svc ()
 {
   try
     {
@@ -205,7 +205,7 @@ Basic_Logging_Service::svc (void)
 }
 
 void
-Basic_Logging_Service::shutdown (void)
+Basic_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index baa266ec49f..554ba9e1e97 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -29,21 +29,21 @@ class Basic_Logging_Service
   //   Implementation of the Telecom Log Service
 
 public:
-  Basic_Logging_Service (void);
+  Basic_Logging_Service ();
   // Constructor.
 
-  virtual ~Basic_Logging_Service (void);
+  virtual ~Basic_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (void);
+  int run ();
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -54,7 +54,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR *argv []);
   // Parses the command line arguments.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
index c94e0e6e3bc..bab74b14b3d 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "BasicLogFactory" .
 
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 3a12a0d0a5d..e0bbec59fdf 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-Event_Logging_Service::Event_Logging_Service (void)
+Event_Logging_Service::Event_Logging_Service ()
   : service_name_ ("EventLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -17,7 +17,7 @@ Event_Logging_Service::Event_Logging_Service (void)
   // No-Op.
 }
 
-Event_Logging_Service::~Event_Logging_Service (void)
+Event_Logging_Service::~Event_Logging_Service ()
 {
   // No-Op.
 }
@@ -163,7 +163,7 @@ Event_Logging_Service::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Event_Logging_Service::resolve_naming_service (void)
+Event_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -177,7 +177,7 @@ Event_Logging_Service::resolve_naming_service (void)
 }
 
 int
-Event_Logging_Service::run (void)
+Event_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -194,7 +194,7 @@ Event_Logging_Service::run (void)
 }
 
 int
-Event_Logging_Service::svc (void)
+Event_Logging_Service::svc ()
 {
   try
     {
@@ -209,7 +209,7 @@ Event_Logging_Service::svc (void)
 }
 
 void
-Event_Logging_Service::shutdown (void)
+Event_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index 59b245511bb..6d669a5e97d 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -30,21 +30,21 @@ class Event_Logging_Service
   //   Implementation of the Telecom Log Service
 
 public:
-  Event_Logging_Service (void);
+  Event_Logging_Service ();
   // Constructor.
 
-  virtual ~Event_Logging_Service (void);
+  virtual ~Event_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (void);
+  int run ();
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -55,7 +55,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR *argv []);
   // Parses the command line arguments.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
index dc8c4c9ab93..48461592ca0 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "EventLogFactory" .
 
@@ -11,6 +9,5 @@ To run the Event Logging Service:
 2. execute the Event_Logging_Service
    at $TAO_ROOT/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service
 
-
 The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsEventLogAdmin.idl
 see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 09df44ccbbf..f8e8e963fe5 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-Notify_Logging_Service::Notify_Logging_Service (void)
+Notify_Logging_Service::Notify_Logging_Service ()
   : service_name_ (NOTIFY_KEY),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -17,7 +17,7 @@ Notify_Logging_Service::Notify_Logging_Service (void)
   // No-Op.
 }
 
-Notify_Logging_Service::~Notify_Logging_Service (void)
+Notify_Logging_Service::~Notify_Logging_Service ()
 {
   // No-Op.
 }
@@ -185,7 +185,7 @@ Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Notify_Logging_Service::resolve_naming_service (void)
+Notify_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -199,7 +199,7 @@ Notify_Logging_Service::resolve_naming_service (void)
 }
 
 int
-Notify_Logging_Service::run (void)
+Notify_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -216,7 +216,7 @@ Notify_Logging_Service::run (void)
 }
 
 int
-Notify_Logging_Service::svc (void)
+Notify_Logging_Service::svc ()
 {
   try
     {
@@ -231,7 +231,7 @@ Notify_Logging_Service::svc (void)
 }
 
 void
-Notify_Logging_Service::shutdown (void)
+Notify_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index ae5dfaecfee..edcf537a82b 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -34,21 +34,21 @@ class Notify_Logging_Service
   //   Implementation of the Telecom Log Service
 
  public:
-  Notify_Logging_Service (void);
+  Notify_Logging_Service ();
   // Constructor.
 
-  virtual ~Notify_Logging_Service (void);
+  virtual ~Notify_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (void);
+  int run ();
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Service.
   // Returns 0 on success, -1 on error.
 
@@ -59,7 +59,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
index 4c51dde6743..63354001c67 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "NotifyLogFactory" .
 
@@ -11,6 +9,5 @@ To run the Notify Logging Service:
 2. execute the Notify_Logging_Service
    at $TAO_ROOT/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service
 
-
 The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl
 see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
diff --git a/TAO/orbsvcs/Logging_Service/README b/TAO/orbsvcs/Logging_Service/README
index 755974f732b..0131feaa447 100644
--- a/TAO/orbsvcs/Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/README
@@ -1,5 +1,3 @@
-
-
                         Telecom Log Service
                         -------------------
 
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
index 3f4e7722fd5..af717a02e95 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "RTEventLogFactory" .
 
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index c2c6b65e1de..29afb015fdd 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-RTEvent_Logging_Service::RTEvent_Logging_Service (void)
+RTEvent_Logging_Service::RTEvent_Logging_Service ()
   : service_name_ ("RTEventLogFactory"),
     ior_file_name_ (0),
     pid_file_name_ (0),
@@ -15,7 +15,7 @@ RTEvent_Logging_Service::RTEvent_Logging_Service (void)
   // No-Op.
 }
 
-RTEvent_Logging_Service::~RTEvent_Logging_Service (void)
+RTEvent_Logging_Service::~RTEvent_Logging_Service ()
 {
   // No-Op.
 }
@@ -169,7 +169,7 @@ RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[])
 }
 
 void
-RTEvent_Logging_Service::resolve_naming_service (void)
+RTEvent_Logging_Service::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -183,7 +183,7 @@ RTEvent_Logging_Service::resolve_naming_service (void)
 }
 
 int
-RTEvent_Logging_Service::run (void)
+RTEvent_Logging_Service::run ()
 {
   if (this->nthreads_ > 0)
     {
@@ -200,7 +200,7 @@ RTEvent_Logging_Service::run (void)
 }
 
 int
-RTEvent_Logging_Service::svc (void)
+RTEvent_Logging_Service::svc ()
 {
   try
     {
@@ -215,7 +215,7 @@ RTEvent_Logging_Service::svc (void)
 }
 
 void
-RTEvent_Logging_Service::shutdown (void)
+RTEvent_Logging_Service::shutdown ()
 {
   if (this->bind_to_naming_service_)
     {
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index daefddca2c0..c8f37af5973 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -28,20 +28,20 @@ class RTEvent_Logging_Service
   //   Implementation of the Telecom Log Service
 
 public:
-  RTEvent_Logging_Service (void);
+  RTEvent_Logging_Service ();
   // Constructor.
 
-  virtual ~RTEvent_Logging_Service (void);
+  virtual ~RTEvent_Logging_Service ();
   // Destructor.
 
   int init (int argc, ACE_TCHAR* argv[]);
   // Initializes the Telecom Log Service.
 
-  int run (void);
+  int run ();
     // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (void);
+  void shutdown ();
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,7 +52,7 @@ protected:
   int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line args
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index fe908ddb630..7cf4bbb1583 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -43,15 +43,15 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc,
                    ACE_TCHAR *argv[]);
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
 private:
   ACE_TCHAR progname[128];
@@ -70,7 +70,7 @@ private:
 
 typedef ACE_Singleton<Options, ACE_Mutex> OPTIONS;
 
-Options::Options (void)
+Options::Options ()
   : opt_setargs (0),
     opt_args (0),
     opt_install (0),
@@ -86,13 +86,13 @@ Options::Options (void)
   ACE::init ();
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE::fini ();
 }
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   ORBSVCS_DEBUG ((LM_INFO,
               ACE_TEXT("Usage: %s")
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 1887780411e..1a5e27cd68d 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -26,7 +26,7 @@ AutoFinalizer::~AutoFinalizer ()
 }
 
 
-TAO_NT_Naming_Service::TAO_NT_Naming_Service (void)
+TAO_NT_Naming_Service::TAO_NT_Naming_Service ()
   : argc_ (0),
     argc_save_ (0),
     argv_ (0),
@@ -34,7 +34,7 @@ TAO_NT_Naming_Service::TAO_NT_Naming_Service (void)
 {
 }
 
-TAO_NT_Naming_Service::~TAO_NT_Naming_Service (void)
+TAO_NT_Naming_Service::~TAO_NT_Naming_Service ()
 {
   if (argv_save_)
     {
@@ -181,7 +181,6 @@ TAO_NT_Naming_Service::arg_manip (char *args, DWORD arglen, bool query)
     }
 
   RegCloseKey (hkey);
-
 }
 
 int
@@ -243,7 +242,7 @@ TAO_NT_Naming_Service::init (int argc,
 }
 
 int
-TAO_NT_Naming_Service::svc (void)
+TAO_NT_Naming_Service::svc ()
 {
   TAO_Naming_Service naming_service;
 
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index cfdfb3e55fe..c90b1ccc4ac 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -33,8 +33,8 @@ class TAO_NT_Naming_Service : public ACE_NT_Service
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
-  TAO_NT_Naming_Service (void);
-  virtual ~TAO_NT_Naming_Service (void);
+  TAO_NT_Naming_Service ();
+  virtual ~TAO_NT_Naming_Service ();
 
   /// We override <handle_control> because it handles stop requests
   /// privately.
@@ -71,7 +71,6 @@ private:
 
   friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>;
   friend class AutoFinalizer;
-
 };
 
 /**
@@ -81,7 +80,6 @@ private:
   */
 class AutoFinalizer
 {
-
 public:
     AutoFinalizer (TAO_NT_Naming_Service &service);
     ~AutoFinalizer ();
@@ -91,7 +89,6 @@ private:
 };
 
 
-
 typedef ACE_Singleton<TAO_NT_Naming_Service, TAO_NT_Naming_Service::MUTEX> SERVICE;
 
 #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index ece6aeb0e1c..bbda4aa95c8 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -8,7 +8,7 @@
 #include "ace/Task.h"
 
 // Default Constructor.
-TAO_Naming_Service::TAO_Naming_Service (void)
+TAO_Naming_Service::TAO_Naming_Service ()
   : time_ (0),
     num_threads_ (1)
 {
@@ -49,7 +49,6 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[])
 
       if (result == -1)
         return result;
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -123,7 +122,7 @@ public:
       time_(t)
   {}
 
-  int svc (void)
+  int svc ()
   {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -147,7 +146,7 @@ private:
 };
 
 int
-TAO_Naming_Service::run (void)
+TAO_Naming_Service::run ()
 {
   ORB_Runner runner (this->orb_.in(), time_);
   if (this->num_threads_ == 1)
@@ -169,7 +168,7 @@ TAO_Naming_Service::run (void)
 }
 
 void
-TAO_Naming_Service::shutdown (void)
+TAO_Naming_Service::shutdown ()
 {
   if (!CORBA::is_nil (orb_.in ()))
     {
@@ -178,7 +177,7 @@ TAO_Naming_Service::shutdown (void)
 }
 
 int
-TAO_Naming_Service::fini (void)
+TAO_Naming_Service::fini ()
 {
   this->my_naming_server_.fini();
 
@@ -199,6 +198,6 @@ TAO_Naming_Service::fini (void)
 }
 
 // Destructor.
-TAO_Naming_Service::~TAO_Naming_Service (void)
+TAO_Naming_Service::~TAO_Naming_Service ()
 {
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index dfcf77754ce..858145e7a6f 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -33,7 +33,7 @@ class TAO_Naming_Service
 {
 public:
   /// Default Constructor.
-  TAO_Naming_Service (void);
+  TAO_Naming_Service ();
 
   /// Constructor taking the command-line arguments.
   TAO_Naming_Service (int argc, ACE_TCHAR* argv[]);
@@ -45,16 +45,15 @@ public:
   virtual int fini ();
 
   /// Run the TAO_Naming_Service.
-  virtual int run (void);
+  virtual int run ();
 
   /// Shut down the TAO_Naming_Service; you must still call fini().
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Destructor.
-  virtual ~TAO_Naming_Service (void);
+  virtual ~TAO_Naming_Service ();
 
 protected:
-
   /// Parse the command line arguments to find
   /// the timeout period.
   int parse_args (int &argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 54391be46d0..3dafb41d56a 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -49,14 +49,14 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc, ACE_TCHAR *argv[]);
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
 private:
   ACE_TCHAR progname[128];
@@ -75,7 +75,7 @@ private:
 
 typedef ACE_Singleton<Options, ACE_Mutex> OPTIONS;
 
-Options::Options (void)
+Options::Options ()
   : opt_setargs (0),
     opt_args (0),
     opt_install (0),
@@ -91,13 +91,13 @@ Options::Options (void)
   ACE::init ();
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE::fini ();
 }
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   ORBSVCS_DEBUG ((LM_INFO,
               ACE_TEXT ("Usage: %s")
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index a561076517f..3e1b4adbd72 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -14,7 +14,7 @@
 #define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT ("TaoNotifyServiceOptions")
 #define TAO_SERVICE_PARAM_COUNT ACE_TEXT ("TaoServiceParameterCount")
 
-TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
+TAO_NT_Notify_Service::TAO_NT_Notify_Service ()
   : argc_ (0),
     argc_save_ (0),
     argv_ (0),
@@ -22,7 +22,7 @@ TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
 {
 }
 
-TAO_NT_Notify_Service::~TAO_NT_Notify_Service (void)
+TAO_NT_Notify_Service::~TAO_NT_Notify_Service ()
 {
   if (argv_save_)
     {
@@ -149,7 +149,6 @@ TAO_NT_Notify_Service::arg_manip (char *args, DWORD arglen, bool query)
     }
 
   RegCloseKey (hkey);
-
 }
 
 int
@@ -239,7 +238,7 @@ TAO_NT_Notify_Service::init (int argc,
 }
 
 int
-TAO_NT_Notify_Service::svc (void)
+TAO_NT_Notify_Service::svc ()
 {
   TAO_Notify_Service_Driver notify_service;
 
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 1548b5606ec..f99ef755182 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -34,8 +34,8 @@ class TAO_NT_Notify_Service : public ACE_NT_Service
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
-  TAO_NT_Notify_Service (void);
-  virtual ~TAO_NT_Notify_Service (void);
+  TAO_NT_Notify_Service ();
+  virtual ~TAO_NT_Notify_Service ();
 
   /// We override <handle_control> because it handles stop requests
   /// privately.
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 6a0394be9aa..14b5d40e773 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,6 +1,6 @@
 #include "orbsvcs/Log_Macros.h"
 #include "Notify_Service.h"
-#include "orbsvcs/orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Properties.h"
 
 // Must include this file to get a static initializer
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index b3f2afec4ac..03fb45de211 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -12,8 +12,8 @@
 
 #if defined (TAO_HAS_NOTIFICATION_MONITOR_CONTROL) && defined (TAO_AS_STATIC_LIBS)
 // for static builds, be sure the library is included
-#include "orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h"
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h"
+#include "orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h"
+#include "orbsvcs/Notify/MonitorControl/MonitorManager.h"
 #endif
 
 #if defined (TAO_EXPLICIT_NEGOTIATE_CODESETS)
@@ -31,7 +31,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Logging_Strategy.h"
 
-TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
+TAO_Notify_Service_Driver::TAO_Notify_Service_Driver ()
 : notify_service_ (0)
 , bootstrap_ (false)
 , use_name_svc_ (true)
@@ -47,7 +47,7 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
 {
 }
 
-TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
+TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver ()
 {
 }
 
@@ -335,7 +335,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Notify_Service_Driver::resolve_naming_service (void)
+TAO_Notify_Service_Driver::resolve_naming_service ()
 {
   try
     {
@@ -366,7 +366,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void)
 }
 
 int
-TAO_Notify_Service_Driver::run (void)
+TAO_Notify_Service_Driver::run ()
 {
   if (TAO_debug_level > 0 )
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -388,7 +388,7 @@ TAO_Notify_Service_Driver::run (void)
 }
 
 int
-TAO_Notify_Service_Driver::fini (void)
+TAO_Notify_Service_Driver::fini ()
 {
   /// Release all the _vars as the ORB about to go away.
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -689,7 +689,7 @@ LoggingWorker::start ()
 }
 
 int
-LoggingWorker::svc (void)
+LoggingWorker::svc ()
 {
   if (TAO_debug_level > 0)
     {
@@ -719,7 +719,7 @@ LoggingWorker::end ()
     }
 }
 
-Worker::Worker (void)
+Worker::Worker ()
 {
 }
 
@@ -730,7 +730,7 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
 #if 0
   // ACE_Thread::getprio() fails on systems that do not support thread
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 486fdbd1e3f..bcc90d11e45 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -57,7 +57,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// ctor
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -82,10 +82,10 @@ friend class LoggingWorker;
 
 public:
   /// Constructor.
-  TAO_Notify_Service_Driver (void);
+  TAO_Notify_Service_Driver ();
 
   /// Destructor.
-  virtual ~TAO_Notify_Service_Driver (void);
+  virtual ~TAO_Notify_Service_Driver ();
 
   /// Initializes the Service.
   /// Returns 0 on success, -1 on error.
@@ -93,7 +93,7 @@ public:
 
   /// run the Service.
   /// Returns 0 on success, -1 on error.
-  int run (void);
+  int run ();
 
   /// Shutdown the Service.
   /// Returns 0 on success, -1 on error.
@@ -112,7 +112,7 @@ protected:
   TAO_Notify_Service* notify_service_;
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv []);
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 2e28b7b03d0..685dffebae2 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
-project(TAO_Notify_Service) : orbsvcslib, orbsvcs_output, install, valuetype, orbsvcsexe, install, notification_serv, naming, iortable, messaging_optional, svc_utils, notify_monitor_control {
+project(TAO_Notify_Service) : orbsvcslib, orbsvcs_output, install, valuetype, install, notification_serv, naming, iortable, messaging_optional, svc_utils, notify_monitor_control {
   sharedname   = TAO_Notify_Service
   dynamicflags += TAO_NOTIFY_SERVICE_BUILD_DLL
   specific {
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 90e27bb45ef..b268cab6d8d 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
-TAO_Scheduling_Service::TAO_Scheduling_Service (void)
+TAO_Scheduling_Service::TAO_Scheduling_Service ()
   : scheduler_impl_ (0),
     service_name_ ("ScheduleService"),
     scheduler_type_ (CONFIG)
@@ -25,7 +25,7 @@ TAO_Scheduling_Service::TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[])
   this->init (argc, argv);
 }
 
-TAO_Scheduling_Service::~TAO_Scheduling_Service (void)
+TAO_Scheduling_Service::~TAO_Scheduling_Service ()
 {
 }
 
@@ -143,7 +143,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 // Runs the TAO_Scheduling_Service.
 
 int
-TAO_Scheduling_Service::run (void)
+TAO_Scheduling_Service::run ()
 {
   // Run the ORB manager.
   return this->orb_manager_.run ();
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index 69c5f56df75..0b19983505f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -37,7 +37,7 @@ class TAO_Scheduling_Service
 {
 public:
   /// Default Constructor.
-  TAO_Scheduling_Service (void);
+  TAO_Scheduling_Service ();
 
   /// Constructor taking the command-line arguments.
   TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[]);
@@ -46,10 +46,10 @@ public:
   int init (int argc, ACE_TCHAR* argv[]);
 
   /// Run the TAO_Scheduling_Service.
-  int run (void);
+  int run ();
 
   /// Destructor.
-  ~TAO_Scheduling_Service (void);
+  ~TAO_Scheduling_Service ();
 
 private:
   typedef ACE_Config_Scheduler CONFIG_SCHED_TYPE;
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 2c4f4a1f46b..48ed6b7a58c 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/os_include/os_netdb.h"
 
 // Constructor.
-Clerk_i::Clerk_i (void)
+Clerk_i::Clerk_i ()
   : ior_output_file_ (0),
     timer_value_ (3),
     timer_value_usecs_ (0),
@@ -21,7 +21,7 @@ Clerk_i::Clerk_i (void)
 }
 
 // Destructor.
-Clerk_i::~Clerk_i (void)
+Clerk_i::~Clerk_i ()
 {
 }
 
@@ -138,7 +138,7 @@ Clerk_i::parse_args (int argc,
        break;
 
       case '?':  // display help for use of the server.
-        /* FALLTHRU */
+        ACE_FALLTHROUGH;
       default:
         ORBSVCS_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)")
@@ -161,7 +161,7 @@ Clerk_i::parse_args (int argc,
 // The iterator returned from this is used to get the next n IORs.
 
 int
-Clerk_i::get_first_IOR (void)
+Clerk_i::get_first_IOR ()
 {
   try
     {
@@ -221,7 +221,7 @@ Clerk_i::get_first_IOR (void)
                        server_context) != 0)
         ORBSVCS_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs ")),
-                          -1);;
+                          -1);
     }
   catch (const CORBA::Exception& ex)
     {
@@ -248,7 +248,6 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
         {
           while (iter->next_one (binding.out ()))
             {
-
               ORBSVCS_DEBUG ((LM_DEBUG,
                           ACE_TEXT("Getting IOR of the server: %C\n\n"),
                           binding->binding_name[0].id.in ()));
@@ -291,11 +290,10 @@ Clerk_i::init_naming_service ()
 // Create an instance of the clerk with appropriate parameters.
 
 int
-Clerk_i::create_clerk (void)
+Clerk_i::create_clerk ()
 {
   try
     {
-
       // Create a new clerk object. Pass it the timer value, the set
       // of server IORs and the no. of servers.
       ACE_NEW_RETURN (this->time_service_clerk_impl_,
@@ -342,7 +340,7 @@ Clerk_i::create_clerk (void)
 // Clerk:<hostname>.
 
 int
-Clerk_i::register_clerk (void)
+Clerk_i::register_clerk ()
 {
   try
     {
@@ -378,7 +376,6 @@ Clerk_i::register_clerk (void)
 
       this->naming_client_->rebind (clerk_name,
                                      this->time_service_clerk_.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -440,7 +437,6 @@ Clerk_i::init (int argc,
           // first IOR.
           if (this->get_first_IOR () != 0)
             return -1;
-
         }
 
       // Create an instance of the Clerk.
@@ -469,7 +465,7 @@ Clerk_i::init (int argc,
 }
 
 int
-Clerk_i::run (void)
+Clerk_i::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index a811aff45c7..24bab371fbf 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -30,7 +30,6 @@
 class Clerk_i
 {
 public:
-
   enum {
     // Pre-allocate slots for this many servers. The capacity grows on
     // demand.
@@ -38,10 +37,10 @@ public:
   };
 
   /// Constructor.
-  Clerk_i (void);
+  Clerk_i ();
 
   /// Destructor.
-  ~Clerk_i (void);
+  ~Clerk_i ();
 
   /// Set of available Time servers.
   typedef ACE_Array_Base<CosTime::TimeService_var> IORS;
@@ -51,14 +50,13 @@ public:
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 private:
   /// Insert a server in the internal data structure (servers_).
   void insert_server (CosTime::TimeService_ptr server);
 
 private:
-
   /// Read the server IORs from a file instead of using a naming
   /// service.
   int read_ior (const ACE_TCHAR* filename);
@@ -78,18 +76,18 @@ private:
   int init_naming_service ();
 
   /// Create an instance of the clerk to use.
-  int create_clerk (void);
+  int create_clerk ();
 
   /// Bind the clerk in the appropriate context in the Naming Service.
-  int register_clerk (void);
+  int register_clerk ();
 
   /// Initialise the Interface Repository and register the clerk
   /// implementation with it.
-  int init_IR (void);
+  int init_IR ();
 
   /// Get the reference to the server naming context and the first
   /// server IOR.
-  int get_first_IOR (void);
+  int get_first_IOR ();
 
   /// Iterate over the given server context to get the rest of the
   /// server IORs.
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index ef6c3b7aa7e..c93028b2db6 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -9,13 +9,13 @@
 #include "ace/os_include/os_netdb.h"
 
 // Constructor.
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : ior_output_file_ (0)
 {
 }
 
 // Destructor.
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
 }
 
@@ -72,11 +72,10 @@ Server_i::init_naming_service ()
 // Print the IOR of the registered server on the console and in a file.
 
 int
-Server_i::create_server (void)
+Server_i::create_server ()
 {
   try
     {
-
       // Create a new server object.
       ACE_NEW_RETURN (this->time_service_server_impl_,
                       TAO_Time_Service_Server,
@@ -134,7 +133,7 @@ Server_i::create_server (void)
 // 'Server:<hostname>'.
 
 int
-Server_i::register_server (void)
+Server_i::register_server ()
 {
   try
     {
@@ -229,7 +228,6 @@ Server_i::init (int argc,
 
       // Register the server object with the Naming Service.
       this->register_server ();
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -244,7 +242,7 @@ Server_i::init (int argc,
 // Run the event loop for ORB.
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   int retval = this->orb_manager_.run ();
 
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index a2d898301fb..5a967d63148 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -31,33 +31,32 @@ class Server_i
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Destructor.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialize the Server state.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Initialises the name client.
   int init_naming_service ();
 
   /// Create the time server object.
-  int create_server (void);
+  int create_server ();
 
   /// Register the time server object with the Naming Service.
-  int register_server (void);
+  int register_server ();
 
   /// Parse the commandline arguments.
   int parse_args (int argc,
                   ACE_TCHAR* argv[]);
 
 private:
-
   /// My orb.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index dcd98386e8e..b5b4906cfc8 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -3,7 +3,6 @@
 #include "ace/OS_main.h"
 
 
-
 // This is the main driver program for the Time Service clerk.
 
 int
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index 5adc3578fb1..3b3b460b7f4 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -3,7 +3,6 @@
 #include "ace/OS_main.h"
 
 
-
 // This is the main driver program for the Time Service server.
 
 int
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 718240449ca..b75597b0c57 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -2,23 +2,14 @@
 #include "CosEventChannelFactory_i.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
-TAO_CosEventChannelFactory_i::TAO_CosEventChannelFactory_i (void)
+TAO_CosEventChannelFactory_i::TAO_CosEventChannelFactory_i ()
   :poa_ (PortableServer::POA::_nil ()),
    naming_ (CosNaming::NamingContext::_nil ())
 {
 }
 
-TAO_CosEventChannelFactory_i::~TAO_CosEventChannelFactory_i (void)
-{
-#if 0
-  ACE_DEBUG ((LM_DEBUG,
-              "in TAO_CosEventChannelFactory_i dtor"));
-#endif
-  // No-Op.
-}
-
 int
 TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
                                     const char* child_poa_name,
@@ -90,7 +81,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
                         TAO_CEC_EventChannel (attr, 0, 0),
                         CORBA::NO_MEMORY ());
 
-      auto_ptr <TAO_CEC_EventChannel> ec (impl);
+      std::unique_ptr <TAO_CEC_EventChannel> ec (impl);
 
       impl->activate ();
 
@@ -153,10 +144,8 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
 void
 TAO_CosEventChannelFactory_i::destroy
-(
- const char * channel_id,
- CORBA::Boolean unbind_from_naming_service
- )
+  (const char * channel_id,
+   CORBA::Boolean unbind_from_naming_service)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -204,10 +193,7 @@ TAO_CosEventChannelFactory_i::destroy
 }
 
 CosEventChannelAdmin::EventChannel_ptr
-TAO_CosEventChannelFactory_i::find
-(
- const char * channel_id
- )
+TAO_CosEventChannelFactory_i::find(const char * channel_id)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -232,10 +218,7 @@ TAO_CosEventChannelFactory_i::find
 }
 
 char*
-TAO_CosEventChannelFactory_i::find_channel_id
-(
- CosEventChannelAdmin::EventChannel_ptr channel
- )
+TAO_CosEventChannelFactory_i::find_channel_id(CosEventChannelAdmin::EventChannel_ptr channel)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -254,4 +237,3 @@ TAO_CosEventChannelFactory_i::find_channel_id
 
   return str_return._retn ();
 }
-
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index 33acba29395..f600e51dd3f 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -26,12 +26,12 @@
 class TAO_CosEventChannelFactory_i :
   public virtual POA_CosEventChannelFactory::ChannelFactory
 {
- public:
+public:
   /// Constructor.
-  TAO_CosEventChannelFactory_i (void);
+  TAO_CosEventChannelFactory_i ();
 
   /// Destructor.
-  ~TAO_CosEventChannelFactory_i (void);
+  ~TAO_CosEventChannelFactory_i () = default;
 
   /**
    * This method creates a child poa with <poa> as the
@@ -57,30 +57,16 @@ class TAO_CosEventChannelFactory_i :
             CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ());
 
   // = CosEventChannelFactory::ChannelFactory methods.
-  virtual CosEventChannelAdmin::EventChannel_ptr create
-    (
-     const char * channel_id,
-     CORBA::Boolean store_in_naming_service
-     );
-
-  virtual void destroy
-    (
-     const char * channel_id,
-     CORBA::Boolean unbind_from_naming_service
-     );
-
-  virtual CosEventChannelAdmin::EventChannel_ptr find
-    (
-     const char * channel_id
-     );
-
-  virtual char * find_channel_id
-    (
-     CosEventChannelAdmin::EventChannel_ptr channel
-     );
- protected:
-
-  /// The Poa with which we activate all the Event Channels.
+  virtual CosEventChannelAdmin::EventChannel_ptr create (const char * channel_id,
+                                                         CORBA::Boolean store_in_naming_service);
+
+  virtual void destroy (const char * channel_id, CORBA::Boolean unbind_from_naming_service);
+
+  virtual CosEventChannelAdmin::EventChannel_ptr find (const char * channel_id);
+
+  virtual char * find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel);
+protected:
+  /// The POA with which we activate all the Event Channels.
   PortableServer::POA_var poa_;
 
   /// The naming context to use.
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 8d725db9608..0cbcf2c4d0f 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -13,26 +13,26 @@ class FactoryClient
 
 public:
   // Initialization and termination methods
-  FactoryClient (void);
+  FactoryClient ();
   // constructor.
 
-  virtual ~FactoryClient (void);
+  virtual ~FactoryClient ();
   // destructor.
 
   void init_ORB (int argc, ACE_TCHAR *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Try to get hold of a running naming service.
 
-  void resolve_factory (void);
+  void resolve_factory ();
   // Try to resolve the factory from the Naming service.
 
   CosEventChannelFactory::ChannelFactory_ptr
-  create_factory (void);
+  create_factory ();
   // Create a local Factory and also set the <factory_>.
 
-  virtual void run_test (void);
+  virtual void run_test ();
   // Runs a couple of tests to check if the factory behaves correctly.
 
 protected:
@@ -67,14 +67,14 @@ protected:
   // flag to indicate if the naming service should be used.
 };
 
-FactoryClient::FactoryClient (void)
+FactoryClient::FactoryClient ()
   :factory_name_ ("CosEC_Factory"),
    use_naming_service (0)
 {
   // No-Op.
 }
 
-FactoryClient::~FactoryClient (void)
+FactoryClient::~FactoryClient ()
 {
   // No-Op.
 }
@@ -86,7 +86,7 @@ FactoryClient::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-FactoryClient::resolve_naming_service (void)
+FactoryClient::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -102,7 +102,7 @@ FactoryClient::resolve_naming_service (void)
 }
 
 void
-FactoryClient::resolve_factory (void)
+FactoryClient::resolve_factory ()
 {
   ACE_ASSERT (this->use_naming_service == 1);
 
@@ -118,7 +118,7 @@ FactoryClient::resolve_factory (void)
 }
 
 CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (void)
+FactoryClient::create_factory ()
 {
   throw CORBA::UNKNOWN ();
 }
@@ -223,7 +223,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel)
  */
 
 void
-FactoryClient::run_test (void)
+FactoryClient::run_test ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index fcee32c9c77..e5793987ef2 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -8,12 +8,6 @@ FactoryDriver::FactoryDriver (const ACE_TCHAR* name)
    child_poa_name_ ("CosEC_ChildPOA"),
    factory_servant_ (0)
 {
-  //No-Op.
-}
-
-FactoryDriver::~FactoryDriver (void)
-{
-  //No-Op.
 }
 
 int
@@ -137,7 +131,7 @@ FactoryDriver::start (int argc, ACE_TCHAR *argv [])
 }
 
 int
-FactoryDriver::stop (void)
+FactoryDriver::stop ()
 {
   orb_->shutdown ();
   return 0;
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
index 942070c7dd5..e4ab7c4b0db 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
@@ -38,13 +38,13 @@ class FactoryDriver
   FactoryDriver (const ACE_TCHAR* factory = ACE_TEXT("CosEC_Factory"));
 
   /// Destructor.
-  ~FactoryDriver (void);
+  ~FactoryDriver () = default;
 
   /// Start the driver.
   int start (int argc, ACE_TCHAR *argv []);
 
-  ///Stop the driver.
-  int stop (void);
+  /// Stop the driver.
+  int stop ();
 
  protected:
   /// Parse the command-line arguments and set options.
@@ -70,6 +70,5 @@ class FactoryDriver
 
   /// Use a naming client.
   TAO_Naming_Client naming_client_;
-
 };
 #endif /*  TAO_FACTORYDRIVER_H */
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/README b/TAO/orbsvcs/examples/CosEC/Factory/README
index 85215015cda..8a528a026d4 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/README
+++ b/TAO/orbsvcs/examples/CosEC/Factory/README
@@ -1,4 +1,3 @@
-
                         CosEventChannelFactory
         ======================================================
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 7c9e7e02414..9a189b121f7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Get_Opt.h"
 
-RtEC_Based_CosEC::RtEC_Based_CosEC (void)
+RtEC_Based_CosEC::RtEC_Based_CosEC ()
   : service_name (ACE_TEXT("CosEventService")),
     rt_service_name (ACE_TEXT("EventService")),
     remote_rtec_ (0)
@@ -10,7 +10,7 @@ RtEC_Based_CosEC::RtEC_Based_CosEC (void)
   // No-Op.
 }
 
-RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
+RtEC_Based_CosEC::~RtEC_Based_CosEC ()
 {
   // No-Op.
 }
@@ -132,7 +132,7 @@ RtEC_Based_CosEC::startup (int argc, ACE_TCHAR *argv[])
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-RtEC_Based_CosEC::create_rtec (void)
+RtEC_Based_CosEC::create_rtec ()
 {
   // see if the user wants a local RtEC..
   if (this->remote_rtec_ == 0)
@@ -142,7 +142,7 @@ RtEC_Based_CosEC::create_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::activate_rtec (void)
+RtEC_Based_CosEC::activate_rtec ()
 {
   // see if the user wants to use a local RtEC..
   if (this->remote_rtec_ == 0)
@@ -162,7 +162,7 @@ RtEC_Based_CosEC::activate_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::deactivate_rtec (void)
+RtEC_Based_CosEC::deactivate_rtec ()
 {
   // Check if the local rtec is to be deactivated.
   if (this->remote_rtec_ == 0)
@@ -172,7 +172,7 @@ RtEC_Based_CosEC::deactivate_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::locate_rtec (void)
+RtEC_Based_CosEC::locate_rtec ()
 {
   CosNaming::Name ref_name (1);
   ref_name.length (1);
@@ -187,7 +187,7 @@ RtEC_Based_CosEC::locate_rtec (void)
 }
 
 void
-RtEC_Based_CosEC::resolve_naming_service (void)
+RtEC_Based_CosEC::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -201,7 +201,7 @@ RtEC_Based_CosEC::resolve_naming_service (void)
 }
 
 int
-RtEC_Based_CosEC::run (void)
+RtEC_Based_CosEC::run ()
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__));
   try
@@ -217,7 +217,7 @@ RtEC_Based_CosEC::run (void)
 }
 
 void
-RtEC_Based_CosEC::shutdown (void)
+RtEC_Based_CosEC::shutdown ()
 {
   // Deactivate.
   this->deactivate ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index b0317154a24..874bf090220 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -32,10 +32,10 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
 {
  public:
   /// Constructor.
-  RtEC_Based_CosEC (void);
+  RtEC_Based_CosEC ();
 
   /// Destructor.
-  virtual ~RtEC_Based_CosEC (void);
+  virtual ~RtEC_Based_CosEC ();
 
   /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv []);
@@ -46,32 +46,32 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
 
   /// run the COS Event Service.
   /// Returns 0 on success, -1 on error.
-  int run (void);
+  int run ();
 
   /// Shutdown the COS Event Service.
   /// Returns 0 on success, -1 on error.
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   // = Methods from CosEC_ServantBase
   /// Create a local rtec.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (void);
+  create_rtec ();
 
   /// Activates the rtec.
-  virtual void activate_rtec (void);
+  virtual void activate_rtec ();
 
   /// Deactivates the rtec.
-  virtual void deactivate_rtec (void);
+  virtual void deactivate_rtec ();
 
   /// initialize the ORB.
   void init_ORB (int& argc, ACE_TCHAR *argv []);
 
   /// Resolve the naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Locate a rtec.
-  void locate_rtec (void);
+  void locate_rtec ();
 
   // = Data members
   /// The name we use to register with the Naming Service.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index 6dbebc8de06..fa54c53ca57 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -1,16 +1,10 @@
 #include "ConsumerAdmin_i.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
-TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i (void)
+TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i ()
   : qos_ (),
     rtec_consumeradmin_ (RtecEventChannelAdmin::ConsumerAdmin::_nil ())
 {
-  // No-Op.
-}
-
-TAO_CosEC_ConsumerAdmin_i::~TAO_CosEC_ConsumerAdmin_i (void)
-{
-  // No-Op.
 }
 
 int
@@ -24,7 +18,7 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier ()
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -39,11 +33,9 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
                                                  rtecproxypushsupplier.in ()),
                   proxysupplier_nil);
 
-  auto_ptr<TAO_CosEC_ProxyPushSupplier_i>
-    auto_proxysupplier (proxypushsupplier);
+  std::unique_ptr<TAO_CosEC_ProxyPushSupplier_i> auto_proxysupplier (proxypushsupplier);
 
-  CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj =
-    auto_proxysupplier.get ()->_this ();
+  CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj = auto_proxysupplier.get ()->_this ();
 
    // give the ownership to the POA.
   auto_proxysupplier.get ()->_remove_ref ();
@@ -53,7 +45,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier ()
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index d94835c339e..623b6fb2567 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -31,21 +31,21 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i :
   //   RtecEventChannelAdmin::ConsumerAdmin.
 public:
   /// Constructor.
-  TAO_CosEC_ConsumerAdmin_i (void);
+  TAO_CosEC_ConsumerAdmin_i ();
 
   /// Destructor.
-  ~TAO_CosEC_ConsumerAdmin_i (void);
+  ~TAO_CosEC_ConsumerAdmin_i () = default;
 
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   /// Returns a new ProxyPushSupplier_ptr.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(void);
+    obtain_push_supplier();
 
   /// Returns a new ProxyPullSupplier_ptr.
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(void);
+    obtain_pull_supplier();
 
 private:
   /// The ConsumerQOS specified by the user of this class.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 4e7356da398..b95e8c9fcce 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -4,9 +4,9 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "EventChannel_i.h"
 #include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
+#include <memory>
 
-CosEC_ServantBase::CosEC_ServantBase (void)
+CosEC_ServantBase::CosEC_ServantBase ()
   :poa_ (PortableServer::POA::_nil ()),
    rtec_servant_ (0),
    cosec_servant_ (0),
@@ -16,15 +16,6 @@ CosEC_ServantBase::CosEC_ServantBase (void)
    eventSourceIds_ (0),
    source_type_pairs_ (0)
 {
-  // No-Op.
-}
-
-CosEC_ServantBase::~CosEC_ServantBase (void)
-{
-  // No-Op.
-#if 0
-  ACE_DEBUG ((LM_DEBUG, "in cosec servant base %d\n", this));
-#endif
 }
 
 void
@@ -41,10 +32,10 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
   this->thispoa_ = PortableServer::POA::_duplicate (thispoa);
   this->poa_ = PortableServer::POA::_duplicate (poa);
 
-  auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
+  std::unique_ptr<POA_RtecEventChannelAdmin::EventChannel>
     auto_rtec_servant_ (this->create_rtec ());
 
-  auto_ptr<TAO_CosEC_EventChannel_i>
+  std::unique_ptr<TAO_CosEC_EventChannel_i>
     auto_cosec_servant_ (this->create_cosec ());
 
   // if all the servants were allocated then set the class pointers.
@@ -53,7 +44,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
 }
 
 int
-CosEC_ServantBase::activate (void)
+CosEC_ServantBase::activate ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
@@ -111,7 +102,7 @@ CosEC_ServantBase::activate (const char* servant_id)
 }
 
 void
-CosEC_ServantBase::activate_rtec (void)
+CosEC_ServantBase::activate_rtec ()
 {
   // Activate the Rtec
   PortableServer::ObjectId_var oid =
@@ -127,7 +118,7 @@ CosEC_ServantBase::activate_rtec (void)
 }
 
 int
-CosEC_ServantBase::activate_cosec (void)
+CosEC_ServantBase::activate_cosec ()
 {
  // Initialize the CosEC servant.
   RtecBase::handle_t supp_handle = 0;
@@ -169,7 +160,7 @@ CosEC_ServantBase::activate_cosec (void)
 }
 
 void
-CosEC_ServantBase::deactivate (void)
+CosEC_ServantBase::deactivate ()
 {
   // Deactivate all those we control...
   this->deactivate_rtec ();
@@ -185,7 +176,7 @@ CosEC_ServantBase::deactivate (void)
 }
 
 void
-CosEC_ServantBase::deactivate_rtec (void)
+CosEC_ServantBase::deactivate_rtec ()
 {
   // Deactivate the rtec.
   PortableServer::ObjectId_var oid =
@@ -196,7 +187,7 @@ CosEC_ServantBase::deactivate_rtec (void)
 }
 
 void
-CosEC_ServantBase::deactivate_cosec (void)
+CosEC_ServantBase::deactivate_cosec ()
 {
   // Deactivate the cosec.
   PortableServer::ObjectId_var oid =
@@ -207,19 +198,19 @@ CosEC_ServantBase::deactivate_cosec (void)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (void)
+CosEC_ServantBase::for_consumers ()
 {
   return this->cosec_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (void)
+CosEC_ServantBase::for_suppliers ()
 {
   return this->cosec_->for_suppliers ();
 }
 
 void
-CosEC_ServantBase::destroy (void)
+CosEC_ServantBase::destroy ()
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
@@ -228,7 +219,7 @@ CosEC_ServantBase::destroy (void)
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (void)
+CosEC_ServantBase::create_rtec ()
 {
   // Create the RtEC servant.
   TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
@@ -242,7 +233,7 @@ CosEC_ServantBase::create_rtec (void)
 }
 
 TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (void)
+CosEC_ServantBase::create_cosec ()
 {
   // Create the CosEC servant.
   TAO_CosEC_EventChannel_i* _cosec_servant;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index 4438de78581..0faed4b7f51 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -34,10 +34,10 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
   //   Clients can derive from this class and create servants.
  public:
   /// Constructor.
-  CosEC_ServantBase (void);
+  CosEC_ServantBase ();
 
   /// Destructor.
-  virtual ~CosEC_ServantBase (void);
+  virtual ~CosEC_ServantBase () = default;
 
   /**
    * This method creates a local scheduler, rtec and cosec.
@@ -52,45 +52,45 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
                      ACE_TCHAR *source_type_pairs);
 
   /// Activates the CosEC with <thispoa_> and friends with the <poa_>
-  int activate (void);
+  int activate ();
 
   /// If the servant_id is not nil then it is used to supply the object id
   /// for <this> servant.
   int activate (const char* servant_id);
 
   /// Deactivates the CosEC and friends with the POA.
-  void deactivate (void);
+  void deactivate ();
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
   /// Destroys this Event Channel object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
  protected:
   // = RtEC creation, activation and deactivation methods.
   /// Create a local rtec.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (void);
+  create_rtec ();
 
   /// Activates the rtec.
-  virtual void activate_rtec (void);
+  virtual void activate_rtec ();
 
   /// Deactivates the rtec.
-  virtual void deactivate_rtec (void);
+  virtual void deactivate_rtec ();
 
   // = CosEC creation, activation and deactivation methods.
   /// Create a local cosec.
   TAO_CosEC_EventChannel_i*
-  create_cosec (void);
+  create_cosec ();
 
   /// Activates the cosec.
-  int activate_cosec (void);
+  int activate_cosec ();
 
   /// Deactivates the cosec.
-  void deactivate_cosec (void);
+  void deactivate_cosec ();
 
   /// Initialize the SupplierQOS Factory.
   void init_SupplierQOS (RtecBase::handle_t supp_handle,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index fac4613996d..a9bd639f1c1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -1,18 +1,12 @@
 #include "EventChannel_i.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
-TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i (void)
+TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i ()
   : consumer_admin_ (0),
     supplier_admin_ (0),
     consumeradmin_ (CosEventChannelAdmin::ConsumerAdmin::_nil ()),
     supplieradmin_ (CosEventChannelAdmin::SupplierAdmin::_nil ())
 {
-  // No-Op.
-}
-
-TAO_CosEC_EventChannel_i::~TAO_CosEC_EventChannel_i (void)
-{
-  //No-Op.
 }
 
 int
@@ -26,14 +20,14 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
                   TAO_CosEC_ConsumerAdmin_i (),
                   -1);
 
-  auto_ptr <TAO_CosEC_ConsumerAdmin_i> auto_consumer_ (consumer_);
+  std::unique_ptr <TAO_CosEC_ConsumerAdmin_i> auto_consumer_ (consumer_);
 
   TAO_CosEC_SupplierAdmin_i *supplier_;
   ACE_NEW_RETURN (supplier_,
                   TAO_CosEC_SupplierAdmin_i (),
                   -1);
 
-  auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
+  std::unique_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
     rtec->for_consumers ();
@@ -68,25 +62,23 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CosEC_EventChannel_i::for_consumers (void)
+TAO_CosEC_EventChannel_i::for_consumers ()
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object.
-  return
-    CosEventChannelAdmin::ConsumerAdmin::_duplicate (this->consumeradmin_.in());
+  return CosEventChannelAdmin::ConsumerAdmin::_duplicate (this->consumeradmin_.in());
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CosEC_EventChannel_i::for_suppliers (void)
+TAO_CosEC_EventChannel_i::for_suppliers ()
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object, same here..
-  return
-    CosEventChannelAdmin::SupplierAdmin::_duplicate (this->supplieradmin_.in ());
+  return CosEventChannelAdmin::SupplierAdmin::_duplicate (this->supplieradmin_.in ());
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (void)
+TAO_CosEC_EventChannel_i::destroy ()
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
@@ -101,8 +93,7 @@ TAO_CosEC_EventChannel_i::destroy (void)
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (void)
+TAO_CosEC_EventChannel_i::shutdown ()
 {
   this->destroy ();
 }
-
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index 28cd1d26251..f6924763a89 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -36,10 +36,10 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_EventChannel_i :
   //
 public:
   /// Constructor.
-  TAO_CosEC_EventChannel_i (void);
+  TAO_CosEC_EventChannel_i ();
 
   /// Destructor.
-  ~TAO_CosEC_EventChannel_i (void);
+  ~TAO_CosEC_EventChannel_i () = default;
 
   /// Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   /// -1 on error, 0 on success.
@@ -49,17 +49,17 @@ public:
 
   /// The for_consumers method will return the same ConsumerAdmin_ptr
   /// everytime its called.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
   /// The for_suppliers method will return the same SupplierAdmin_ptr
   /// everytime its called.
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
   /// Destroys this Event Channel object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// destroys this Event Channel object and <delete>s this object.
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// ConsumerAdmin servant object.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index a97f3de4c2d..5c70464417d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/CosEventCommS.h"
 #include "ProxyPushConsumer_i.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
@@ -25,10 +25,10 @@ public:
   TAO_CosEC_PushSupplierWrapper (CosEventComm::PushSupplier_ptr supplier);
   // Constructor.
 
-  ~TAO_CosEC_PushSupplierWrapper (void);
+  ~TAO_CosEC_PushSupplierWrapper () = default;
   // Destructor.
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // Disconnects the push supplier.
 
 private:
@@ -50,16 +50,10 @@ TAO_CosEC_PushSupplierWrapper::TAO_CosEC_PushSupplierWrapper
 (CosEventComm::PushSupplier_ptr supplier)
   : supplier_ (CosEventComm::PushSupplier::_duplicate (supplier))
 {
-  // No-Op.
-}
-
-TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
-{
-  // No-Op.
 }
 
 void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier ()
 {
   this->supplier_->disconnect_push_supplier ();
 
@@ -82,12 +76,10 @@ TAO_CosEC_ProxyPushConsumer_i::TAO_CosEC_ProxyPushConsumer_i (const RtecEventCha
     proxypushconsumer_ (RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (proxypushconsumer)),
     wrapper_ (0)
 {
-  // No-Op.
 }
 
-TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
+TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i ()
 {
-  // No-Op.
 }
 
 void
@@ -127,7 +119,7 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data)
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer ()
 {
   this->proxypushconsumer_->disconnect_push_consumer ();
 
@@ -153,8 +145,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
                     TAO_CosEC_PushSupplierWrapper (push_supplier),
                     CORBA::NO_MEMORY ());
 
-  auto_ptr <TAO_CosEC_PushSupplierWrapper>
-    auto_wrapper (wrapper);
+  std::unique_ptr <TAO_CosEC_PushSupplierWrapper> auto_wrapper (wrapper);
 
   RtecEventComm::PushSupplier_ptr rtecpushsupplier
     = auto_wrapper.get ()->_this ();
@@ -170,7 +161,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
 }
 
 int
-TAO_CosEC_ProxyPushConsumer_i::connected (void)
+TAO_CosEC_ProxyPushConsumer_i::connected ()
 {
   return this->wrapper_ == 0 ? 0 : 1;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index 73b04c479e5..17149cf23ed 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -44,13 +44,13 @@ public:
                                  RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer);
 
   /// Destructor.
-  ~TAO_CosEC_ProxyPushConsumer_i (void);
+  ~TAO_CosEC_ProxyPushConsumer_i ();
 
   /// Suppliers call this method to pass data to connected consumers.
   virtual void push (const CORBA::Any &data);
 
   /// Disconnects the supplier from the event communication.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Connects a push supplier.
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier);
@@ -58,7 +58,7 @@ public:
 private:
   /// Returns 0 if a push_supplier is already connected to this
   /// ProxyPushConsumer, otherwise it returns a 1.
-  int connected (void);
+  int connected ();
 
   /// The SupplierQOS specified by the user of this class.
   const RtecEventChannelAdmin::SupplierQOS &qos_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 10672a7a5a2..2ec39fed7a6 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/CosEventCommS.h"
 #include "orbsvcs/RtecEventCommS.h"
 #include "ProxyPushSupplier_i.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
@@ -25,13 +25,13 @@ public:
   TAO_CosEC_PushConsumerWrapper (CosEventComm::PushConsumer_ptr consumer);
   // Constructor.
 
-  ~TAO_CosEC_PushConsumerWrapper (void);
+  ~TAO_CosEC_PushConsumerWrapper () = default;
   // Destructor.
 
-  virtual void push (const RtecEventComm::EventSet & data);
+  void push (const RtecEventComm::EventSet & data) override;
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (void);
+  void disconnect_push_consumer () override;
   // Disconnects the consumer from the event channel.
 
 private:
@@ -47,12 +47,6 @@ TAO_CosEC_PushConsumerWrapper::TAO_CosEC_PushConsumerWrapper
 (CosEventComm::PushConsumer_ptr consumer)
   : consumer_ (CosEventComm::PushConsumer::_duplicate (consumer))
 {
-  // No-Op.
-}
-
-TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
-{
-  // No-Op.
 }
 
 void
@@ -74,7 +68,7 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set)
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer ()
 {
   // Deactivate the supplier proxy.
   this->consumer_->disconnect_push_consumer ();
@@ -98,16 +92,10 @@ TAO_CosEC_ProxyPushSupplier_i::TAO_CosEC_ProxyPushSupplier_i
     pps_ (RtecEventChannelAdmin::ProxyPushSupplier::_duplicate (pps)),
     wrapper_ (0)
 {
-  // No-Op.
-}
-
-TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
-{
-  // No-Op.
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier ()
 {
   this->pps_->disconnect_push_supplier ();
 
@@ -138,7 +126,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
                     TAO_CosEC_PushConsumerWrapper (push_consumer),
                     CORBA::NO_MEMORY ());
 
-  auto_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper);
+  std::unique_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper);
 
   // @@ This code is not exception safe.
   RtecEventComm::PushConsumer_ptr  rtecpushconsumer =
@@ -154,7 +142,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
 }
 
 int
-TAO_CosEC_ProxyPushSupplier_i::connected (void)
+TAO_CosEC_ProxyPushSupplier_i::connected ()
 {
   return this->wrapper_ == 0 ? 0 : 1;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index fbadf4ef673..1f711ec2a26 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -37,10 +37,10 @@ public:
                                  RtecEventChannelAdmin::ProxyPushSupplier_ptr pps);
 
   /// Destructor.
-  ~TAO_CosEC_ProxyPushSupplier_i (void);
+  ~TAO_CosEC_ProxyPushSupplier_i () = default;
 
   /// Ends the event communication and disposes this object.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Connects the <push_consumer> to the Event Channel.
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer);
@@ -48,7 +48,7 @@ public:
 private:
   /// Returns 0 if a push_consumer is already connected to this
   /// ProxyPushSupplier, otherwise it returns a 1.
-  int connected (void);
+  int connected ();
 
   /// The ConsumerQOS specified by the user of this class.
   const RtecEventChannelAdmin::ConsumerQOS &qos_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index ba277070aa2..54b80aa496f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -1,16 +1,10 @@
 #include "SupplierAdmin_i.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
-TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i (void)
+TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i ()
   : qos_ (),
     rtec_supplieradmin_ (RtecEventChannelAdmin::SupplierAdmin::_nil ())
 {
-  // No-Op.
-}
-
-TAO_CosEC_SupplierAdmin_i::~TAO_CosEC_SupplierAdmin_i (void)
-{
-  // No-Op.
 }
 
 int
@@ -24,7 +18,7 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer ()
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -38,7 +32,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
                   TAO_CosEC_ProxyPushConsumer_i (this->qos_,
                                                  rtecproxypushconsumer.in ()),
                   proxyconsumer_nil);
-  auto_ptr <TAO_CosEC_ProxyPushConsumer_i>
+  std::unique_ptr <TAO_CosEC_ProxyPushConsumer_i>
     auto_proxyconsumer (proxypushconsumer);
 
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj =
@@ -52,9 +46,8 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer ()
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
 }
-
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index d3981ec6f38..79bffa8634e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -30,10 +30,10 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_SupplierAdmin_i :
   //   TAO's RtecEventChannelAdmin::SupplierAdmin.
 public:
   /// Constructor.
-  TAO_CosEC_SupplierAdmin_i (void);
+  TAO_CosEC_SupplierAdmin_i ();
 
   /// Destructor.
-  ~TAO_CosEC_SupplierAdmin_i (void);
+  ~TAO_CosEC_SupplierAdmin_i () = default;
 
   /// Initializes the SupplierAdmin.  Returns 0 on success, -1 on
   /// error.
@@ -41,12 +41,10 @@ public:
             RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin);
 
   /// Returns a new ProxyPushConsumer_ptr.
-  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (void);
+  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ();
 
   /// Returns a new ProxyPullConsumer_ptr.
-  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer(void);
+  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer();
 
 private:
   /// The SupplierQOS specified by the user of this class.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 959aa21e667..0a45c2d7aa4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -29,12 +29,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Basic::Basic (void)
+Basic::Basic ()
 {
   // No-Op.
 }
 
-Basic::~Basic (void)
+Basic::~Basic ()
 {
   // No-Op.
 }
@@ -69,7 +69,7 @@ Basic::init_ORB  (int argc, ACE_TCHAR *argv [])
 }
 
 void
-Basic::init_CosEC (void)
+Basic::init_CosEC ()
 {
   CosEC_ServantBase *ec = 0;
 
@@ -97,7 +97,7 @@ Basic::init_CosEC (void)
 }
 
 void
-Basic::run (void)
+Basic::run ()
 {
   // Create an Any type to pass to the Cos EC.
   CORBA::Any any;
@@ -124,7 +124,7 @@ Basic::run (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->supplier_.close ();
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index 996a8b8c513..dea78bf07da 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -29,10 +29,10 @@ class Basic
 {
 public:
   /// Constructor.
-  Basic (void);
+  Basic ();
 
   /// Destructor.
-  ~Basic (void);
+  ~Basic ();
 
   /// Starts up an ORB and the CosEC.
   /// Returns 0 on success, -1 on error.
@@ -40,10 +40,10 @@ public:
 
   /// Connects a consumer and a supplier to the CosEC and sends 1 event
   /// across.
-  void run (void);
+  void run ();
 
   /// Closes down the CosEC.
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// initializes the ORB.
@@ -52,7 +52,7 @@ private:
 
   /// initializes the COS EC.
   /// Returns 0 on success, -1 on error.
-  void init_CosEC (void);
+  void init_CosEC ();
 
   /// The ORB that we use.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 435888329b5..1b296892916 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -13,7 +13,7 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
 }
 
 void
-Consumer::close (void)
+Consumer::close ()
 {
   this->disconnect ();
 
@@ -22,7 +22,7 @@ Consumer::close (void)
 }
 
 void
-Consumer::connect (void)
+Consumer::connect ()
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -37,7 +37,7 @@ Consumer::connect (void)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -59,7 +59,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index 44a3c05f4a4..f859e513cc5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -29,27 +29,26 @@
  */
 class Consumer : public POA_CosEventComm::PushConsumer
 {
-
 public:
   /// This method connects the consumer to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
              CORBA::ORB_ptr orb);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
   /// Connect the Consumer to the EventChannel.
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the supplier, but do not forget about it or close
   /// it.
-  void disconnect (void);
+  void disconnect ();
 
   /// push the event to the consumer.
   virtual void push (const CORBA::Any &data);
 
   /// disconnect the consumer from the EC.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// The orb that we as using.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 0a5b0f9bb35..404425e3277 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -10,7 +10,7 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 }
 
 void
-Supplier::close (void)
+Supplier::close ()
 {
   this->disconnect ();
 
@@ -19,7 +19,7 @@ Supplier::close (void)
 }
 
 void
-Supplier::connect (void)
+Supplier::connect ()
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
@@ -33,7 +33,7 @@ Supplier::connect (void)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
@@ -52,7 +52,7 @@ Supplier::send_event (const CORBA::Any & data)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
   // Deactivate this object.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 0a99793afa0..1bbd4b93308 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -34,18 +34,18 @@ public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the EC, but do not forget about it or close it.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   void send_event (const CORBA::Any &data);
 
   /// The POA_CosEventComm::PushSupplier method.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   /// We talk to the EC using this proxy.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index c0f1633dd9e..f296fa5f1e9 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -50,7 +50,7 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 }
 
 void
-Consumer::close (void)
+Consumer::close ()
 {
   this->disconnect ();
 
@@ -59,7 +59,7 @@ Consumer::close (void)
 }
 
 void
-Consumer::connect (void)
+Consumer::connect ()
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -74,7 +74,7 @@ Consumer::connect (void)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -113,7 +113,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // Deactivate this object.
 
@@ -127,7 +127,7 @@ Consumer::disconnect_push_consumer (void)
 }
 
 int
-Consumer::init_Consumer (void)
+Consumer::init_Consumer ()
 {
   try
    {
@@ -137,7 +137,7 @@ Consumer::init_Consumer (void)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception in Consumer::connect (void)\n");
+      ex._tao_print_exception ("Exception in Consumer::connect ()\n");
       return -1;
     }
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index 3d35dbae5e8..69fa5a4e84a 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -30,33 +30,32 @@
  */
 class Consumer : public POA_CosEventComm::PushConsumer, public Multiple
 {
-
 public:
   // = Initializatiopn and termination methods.
   /// Constructor.
   Consumer ();
 
   /// Initialize the Consumer.
-  int init_Consumer (void);
+  int init_Consumer ();
 
   /// This method connects the consumer to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
   /// Connect the Consumer to the EventChannel.
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the supplier, but do not forget about it or close
   /// it.
-  void disconnect (void);
+  void disconnect ();
 
   /// push the event to the consumer.
   virtual void push (const CORBA::Any &data);
 
   /// disconnect the consumer from the EC.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = CosEC_Multiple methods.
   /// Parse the command line options.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index bf465408a0e..979b3b52344 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -1,6 +1,6 @@
 #include "Multiple.h"
 
-Multiple::Multiple (void)
+Multiple::Multiple ()
   : cos_ec_ (CosEventChannelAdmin::EventChannel::_nil ()),
     service_name_ (ACE_TEXT ("CosEventService")),
     orb_ (CORBA::ORB::_nil ())
@@ -9,7 +9,7 @@ Multiple::Multiple (void)
 }
 
 
-Multiple::~Multiple (void)
+Multiple::~Multiple ()
 {
   // No-Op.
 }
@@ -67,7 +67,7 @@ Multiple::init_ORB  (int argc, ACE_TCHAR *argv [])
 }
 
 int
-Multiple::init_CosEC (void)
+Multiple::init_CosEC ()
 {
   try
     {
@@ -102,7 +102,7 @@ Multiple::init_CosEC (void)
 }
 
 int
-Multiple::runORB (void)
+Multiple::runORB ()
 {
   try
     {
@@ -117,7 +117,7 @@ Multiple::runORB (void)
 }
 
 void
-Multiple::shutdown (void)
+Multiple::shutdown ()
 {
   if (!this->orb_->_nil ())
     this->orb_->shutdown ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index 233c0abd0e1..5f3f24a25b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -30,20 +30,20 @@ class Multiple
   //   via the Cos Event Service.
  public:
   /// Constructor.
-  Multiple (void);
+  Multiple ();
 
   /// Destructor.
-  virtual ~Multiple (void);
+  virtual ~Multiple ();
 
   /// Calls parse_args, Starts up an ORB, gets hold of the Event Service.
   /// Returns 0 on success, -1 on error.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Calls the ORB's <run> method.
-  int runORB (void);
+  int runORB ();
 
   /// Closes down the ORB and exits.
-  void shutdown (void);
+  void shutdown ();
 
  protected:
   /// Parse the command line arguments.
@@ -62,7 +62,7 @@ class Multiple
 
   /// initializes the COS EC.
   /// Returns 0 on success, -1 on error.
-  int init_CosEC (void);
+  int init_CosEC ();
 
   /// The ORB that we use.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 66dd5961a01..934564a51f1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -49,7 +49,7 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 }
 
 void
-Supplier::close (void)
+Supplier::close ()
 {
   this->disconnect ();
 
@@ -58,7 +58,7 @@ Supplier::close (void)
 }
 
 void
-Supplier::connect (void)
+Supplier::connect ()
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
@@ -72,7 +72,7 @@ Supplier::connect (void)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
@@ -91,7 +91,7 @@ Supplier::send_event (const CORBA::Any & data)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
   // Deactivate this object.
 
@@ -105,7 +105,7 @@ Supplier::disconnect_push_supplier (void)
 }
 
 void
-Supplier::run (void)
+Supplier::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index f737bd6ce0f..d20e5dc00cb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -38,21 +38,21 @@ public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
 
   /// Disconnect from the EC.
-  void close (void);
+  void close ();
 
-  void connect (void);
+  void connect ();
 
   /// Disconnect from the EC, but do not forget about it or close it.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   void send_event (const CORBA::Any &data);
 
   /// The POA_CosEventComm::PushSupplier method.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Sends the events to the EC.
-  void run (void);
+  void run ();
 
   // = Multiple methods.
   /// Parses the command line arguments.
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 42242a6b8db..a3b3097121a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -122,7 +122,7 @@ Consumer::push (const CORBA::Any &)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 68d6eef38d8..687e07bd847 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -28,7 +28,7 @@ class Consumer : public POA_CosEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -37,7 +37,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const CORBA::Any &event);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index b23bcc5216e..72f499c2398 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -121,7 +121,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 897ef6acbd7..fc32ef54529 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -28,7 +28,7 @@ class Supplier : public POA_CosEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -36,7 +36,7 @@ public:
   // = The CosEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
 };
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index d7d41e6a634..355a325c1b0 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // ORB initialization...
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index d9c931e8164..15775983533 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -8,7 +8,7 @@ Country_i::Country_i (CORBA::ORB_ptr orb) :
 }
 
 // Implementation skeleton destructor
-Country_i::~Country_i (void)
+Country_i::~Country_i ()
 {
 }
 
@@ -22,7 +22,7 @@ void Country_i::update_population (const char * country,
 }
 
 CORBA::Object_ptr
-Country_i::get_typed_consumer (void)
+Country_i::get_typed_consumer ()
 
 {
   //Add your implementation here
@@ -42,7 +42,7 @@ Country_i::push (const CORBA::Any & /* data */)
 }
 
 void
-Country_i::disconnect_push_consumer (void)
+Country_i::disconnect_push_consumer ()
 
 {
   //Add your implementation here
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index 8a06018ff12..a52b2201d63 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -16,16 +16,16 @@ public:
   Country_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Country_i (void);
+  virtual ~Country_i ();
 
   virtual void update_population (const char * country,
                                   CORBA::Long population);
 
-  virtual CORBA::Object_ptr get_typed_consumer (void);
+  virtual CORBA::Object_ptr get_typed_consumer ();
 
   virtual void push (const CORBA::Any & data);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index 4a6b0e23017..ef01d16308b 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -3,11 +3,9 @@
 #include "CountryC.h"
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // ORB initialization boiler plate...
@@ -69,4 +67,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 }
 
 
-
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
index 6582df0c2d7..165f126b4f7 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
@@ -11,7 +11,6 @@ class ORB_Initializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void
   pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index f2fbc5e6f7f..94cfb90c9ad 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)
   {
@@ -466,7 +465,7 @@ namespace
 
 
 char*
-ReplicaController::name (void)
+ReplicaController::name ()
 {
   return CORBA::string_dup ("ReplicaController");
 }
@@ -484,7 +483,7 @@ ReplicaController::send_other (
 }
 
 void
-ReplicaController::destroy (void)
+ReplicaController::destroy ()
 {
 }
 
@@ -492,7 +491,6 @@ void
 ReplicaController::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr)
 {
-
 }
 
 void
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index 5aa00ad9d8d..1d6b81b6ac7 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -74,7 +74,6 @@ private:
   resolve_poa (PortableInterceptor::AdapterName const& name);
 
 private:
-
   class RecordId
   {
   public:
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index 051e09989a5..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"));
@@ -127,7 +126,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         object = iorm->merge_iors (iors);
 
 
-
         FT::TagFTGroupTaggedComponent ft_tag_component;
 
         // Property values
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
index 5e200d12f7b..93e4428250e 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
@@ -8,7 +8,7 @@ Manager_i::Manager_i (long retryCount)
 {
 }
 
-Manager_i::~Manager_i (void)
+Manager_i::~Manager_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
index b1824922771..934de961ae0 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
@@ -14,7 +14,7 @@ class  Manager_i
 public:
   Manager_i (long retryCount);
 
-  virtual ~Manager_i (void);
+  virtual ~Manager_i ();
 
   virtual CORBA::Long registerServer ();
 
@@ -23,7 +23,6 @@ public:
   virtual CORBA::Long endRetry ();
 
 private:
-
   long server_instance_;
   long retry_count_;
   long retry_attempt_;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
index d57009c00f7..2beba55339b 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
@@ -10,7 +10,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, long instance)
 {
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
index e81bf681048..ebeaf377152 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
@@ -14,7 +14,7 @@ class  Messenger_i
 public:
   Messenger_i (CORBA::ORB_ptr orb, long instance);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual
   CORBA::Long send_message (
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 28543b33482..e9e5ff59a93 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -134,7 +134,6 @@ void TestClient::run()
   this->wait();
 
   ACE_DEBUG((LM_DEBUG, "* Client ended.\n"));
-
 }
 
 // Read in the stringified object references into an array
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 995ef08cb47..147fb42f0e8 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -37,7 +37,6 @@ public:
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-
     ACE_Service_Config config;
     config.open (argc, argv);
 
@@ -70,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 048c040e03b..6fcabe26717 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -59,7 +59,7 @@ public:
   }
 };
 
-DynServer_Loader::DynServer_Loader(void)
+DynServer_Loader::DynServer_Loader()
 {
 }
 
@@ -67,7 +67,6 @@ int
 DynServer_Loader::init (int argc, ACE_TCHAR* argv[])
 {
   try {
-
     orb_ = ORB_init(argc, argv, "DynServer");
 
     Object_var obj = orb_->resolve_initial_references("RootPOA");
@@ -110,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()");
   }
@@ -118,11 +116,10 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-DynServer_Loader::fini (void)
+DynServer_Loader::fini ()
 {
   ACE_ASSERT(runner_.get() != 0);
   try {
-
     ACE_DEBUG((LM_DEBUG, "dynserver: shutting down.\n"));
 
     runner_->end();
@@ -134,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/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index 031f401980d..6591ba81d09 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -15,7 +15,7 @@ class DynServer_Export DynServer
 {
   int n_;
 public:
-  DynServer(void);
+  DynServer();
   virtual ~DynServer();
   virtual CORBA::Long get();
 };
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 985e5be1557..6fe2b8a3ed5 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -23,7 +23,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-
       ORB_var orb = ORB_init (argc, argv);
 
       Object_var obj = orb->resolve_initial_references ("Test");
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index e890ce2cc25..93a0105808b 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -15,12 +15,12 @@ using namespace PortableServer;
 class test_i : public virtual POA_test {
   int n_;
 public:
-  test_i (void) : n_(0)
+  test_i () : n_(0)
   {
   }
-  virtual ~test_i (void) {
+  virtual ~test_i () {
   }
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_));
     return n_;
@@ -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/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index fcbfaa73162..5d82cab4250 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/CosLoadBalancingC.h"
 #include "tao/ORB_Constants.h"
 
-ORBInitializer::ORBInitializer (void)
+ORBInitializer::ORBInitializer ()
   : load_alert_ (),
     interceptor_ (0)
 {
@@ -22,7 +22,6 @@ void
 ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   ACE_NEW_THROW_EX (this->interceptor_,
                     ServerRequestInterceptor,
                     CORBA::NO_MEMORY (
@@ -53,7 +52,7 @@ ORBInitializer::post_init (
 
 
 TAO_LB_LoadAlert &
-ORBInitializer::load_alert (void)
+ORBInitializer::load_alert ()
 {
   return this->load_alert_;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 041ddf9fbd8..e004a72cedb 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -21,12 +21,12 @@ RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
   this->location_[0].kind = CORBA::string_dup ("UUID");
 }
 
-RPS_Monitor::~RPS_Monitor (void)
+RPS_Monitor::~RPS_Monitor ()
 {
 }
 
 CosLoadBalancing::Location *
-RPS_Monitor::the_location (void)
+RPS_Monitor::the_location ()
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -41,7 +41,7 @@ RPS_Monitor::the_location (void)
 }
 
 CosLoadBalancing::LoadList *
-RPS_Monitor::loads (void)
+RPS_Monitor::loads ()
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index 009117f7ac1..a51f978e878 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -33,7 +33,6 @@ class RPS_Monitor
   : public virtual POA_CosLoadBalancing::LoadMonitor
 {
 public:
-
   /// Constructor
   RPS_Monitor (ServerRequestInterceptor * interceptor);
 
@@ -43,7 +42,6 @@ public:
    * Methods required by the CosLoadBalancing::LoadMonitor interface.
    */
   //@{
-
   /// Return the location at which the LoadMonitor resides.
   /**
    * The returned "Location" is a sequence of length 1.
@@ -62,16 +60,14 @@ public:
   //@}
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~RPS_Monitor (void);
+  ~RPS_Monitor ();
 
 private:
-
   /// The name of the location at which this LoadMonitor resides.
   CosLoadBalancing::Location location_;
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 2af202455c5..05012b1fb74 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -1,22 +1,22 @@
 #include "ServerRequestInterceptor.h"
 
-ServerRequestInterceptor::ServerRequestInterceptor (void)
+ServerRequestInterceptor::ServerRequestInterceptor ()
   : request_count_ (0)
 {
 }
 
-ServerRequestInterceptor::~ServerRequestInterceptor (void)
+ServerRequestInterceptor::~ServerRequestInterceptor ()
 {
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
@@ -52,7 +52,7 @@ ServerRequestInterceptor::send_other (
 }
 
 CORBA::Long
-ServerRequestInterceptor::request_count (void)
+ServerRequestInterceptor::request_count ()
 {
   const CORBA::Long r = this->request_count_.value ();
   this->request_count_ = 0;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 94e2e8b6403..70e212dfda8 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -48,7 +48,7 @@ class ServerRequestInterceptor
 {
 public:
   /// Constructor.
-  ServerRequestInterceptor (void);
+  ServerRequestInterceptor ();
 
   /**
    * @name Methods Required by the ServerRequestInterceptor
@@ -58,9 +58,9 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -78,7 +78,7 @@ public:
       PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
-  CORBA::Long request_count (void);
+  CORBA::Long request_count ();
 
 protected:
   /// Destructor.
@@ -86,7 +86,7 @@ protected:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  ~ServerRequestInterceptor (void);
+  ~ServerRequestInterceptor ();
 
 private:
   /// The number of requests that have arrived on the server.
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index d5b9fcb84b9..b224ca9342a 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -23,7 +23,7 @@ StockFactory::get_stock (const char *symbol)
 }
 
 void
-StockFactory::shutdown (void)
+StockFactory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 17f030929c9..7cdf0431a68 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -13,7 +13,7 @@ public:
 
   Test::Stock_ptr get_stock (const char *symbol);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 4902f70300f..6c2c98331c1 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -9,8 +9,7 @@
 #define QUERY_LANG "TCL"
 
 
-
-TLS_Client::TLS_Client (void)
+TLS_Client::TLS_Client ()
 {
   // No-Op.
 }
@@ -36,7 +35,7 @@ TLS_Client::init_ORB (int argc,
 }
 
 void
-TLS_Client::resolve_naming_service (void)
+TLS_Client::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -50,7 +49,7 @@ TLS_Client::resolve_naming_service (void)
 }
 
 void
-TLS_Client::resolve_TLS_Basic_factory (void)
+TLS_Client::resolve_TLS_Basic_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -64,7 +63,7 @@ TLS_Client::resolve_TLS_Basic_factory (void)
 }
 
 void
-TLS_Client::run_tests (void)
+TLS_Client::run_tests ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->basic_log_factory_.in ()));
 
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index 729b414a5a1..054366ebebc 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -23,23 +23,23 @@ class TLS_Client
   // = DESCRIPTION
   //   This client demonstates how to use the log service.
  public:
-  TLS_Client (void);
+  TLS_Client ();
   ~TLS_Client ();
 
   void init (int argc, ACE_TCHAR *argv []);
   // Init the Client.
 
-  void run_tests (void);
+  void run_tests ();
   // Run the tests..
 
  protected:
   void init_ORB (int argc, ACE_TCHAR *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
   // Try to get hold of a running naming service.
 
-  void resolve_TLS_Basic_factory (void);
+  void resolve_TLS_Basic_factory ();
   // Try to resolve the TLS factory from the Naming service.
 
   // = Data Members
@@ -53,6 +53,5 @@ class TLS_Client
   // The basic log factory from the Log Service.
 
 
-
 };
 #endif /* TLS_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index bc3aa1ea8ea..5e639f2bec2 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -15,7 +15,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -90,17 +90,15 @@ Consumer::run (int argc, ACE_TCHAR* argv[])
 void
 Consumer::push (const CORBA::Any &)
 {
-
   this->event_count_ ++;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Consumer (%P|%t): %d log generated events received\n",
                   this->event_count_));
-
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 1117e907a81..1453e5331c9 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -31,7 +31,7 @@ class Consumer : public POA_CosEventComm::PushConsumer
   //   This class is a consumer of log generated events.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -41,11 +41,10 @@ public:
 
   virtual void push (const CORBA::Any &event);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
-
   // = Data Members
   CORBA::ULong event_count_;
   // Keep track of the number of events received.
@@ -62,7 +61,6 @@ private:
 
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_;
   // The proxy that we are connected to.
-
 };
 
 #endif /* EVENT_CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 80d40ebf367..7b09a500702 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -165,7 +165,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 
       // Destroy the POA
       poa->destroy (1, 0);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -176,7 +175,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index 4296b533ac7..e1639955cd7 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -30,7 +30,7 @@ class Supplier : public POA_CosEventComm::PushSupplier
   //   This class is a supplier of events.
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -38,11 +38,10 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The skeleton methods.
 
 private:
-
   // = Data Members
   CORBA::ORB_var orb_;
   // The ORB that we use.
@@ -55,7 +54,6 @@ private:
 
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_;
   // The proxy that we are connected to.
-
 };
 
 #endif /* EVENT_SUPPLIER_H */
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 72636dce089..d3353b80412 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &event)
 
 void
 Consumer::disconnect_push_consumer
-   (void)
+   ()
 {
   this->proxy_supplier_->
     disconnect_push_supplier();
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 4357cc56362..36e09083f14 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -34,7 +34,7 @@ class Consumer
   //   This class is a consumer of log generated events.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -71,8 +71,6 @@ private:
   DsNotifyLogAdmin::NotifyLogFactory_var notify_log_factory_;
 
   CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
-
-
 };
 
 #endif /* NOTIFY_CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 7040112fe63..15ab44f8224 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -22,13 +22,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
 Supplier::~Supplier ()
 {
-
 }
 
 int
@@ -41,7 +40,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
         CORBA::ORB_init (argc, argv);
 
 
-
       CORBA::Object_var naming_obj =
       this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
@@ -221,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)
     {
@@ -232,7 +229,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 
-Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  (void)
+Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  ()
 {
 }
 
@@ -261,7 +258,7 @@ Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (void)
+Filter_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -287,7 +284,7 @@ Filter_StructuredPushSupplier::send_event
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (void)
+   ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index f2557c33a17..438ee6784ad 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -34,7 +34,7 @@ class Supplier
   //   This class is a supplier of events.
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   ~Supplier ();
@@ -44,7 +44,6 @@ public:
   // Run the test
 
 private:
-
   // = Data Members
   CORBA::ORB_var orb_;
   // The ORB that we use.
@@ -72,14 +71,14 @@ class Filter_StructuredPushSupplier
   //   Supplier for the filter example.
   //
  public:
-  Filter_StructuredPushSupplier (void);
+  Filter_StructuredPushSupplier ();
   // Constructor.
 
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the supplier.
 
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 19e3a04b718..f1384c7fd4e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -137,7 +137,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index acaba8da10d..a49c0dae275 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -32,7 +32,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer
   //   It simply registers for one event type.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -41,7 +41,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
@@ -60,7 +60,6 @@ private:
 
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_;
   // The proxy that we are connected to.
-
 };
 
 #endif /* RTEVENT_CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index b7e4f09ed25..8800ef9a19e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -17,12 +17,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Supplier supplier;
 
   return supplier.run (argc, argv);
-
 }
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -93,7 +92,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 
 
 
-
       // create a log..
 
       ACE_DEBUG ((LM_DEBUG,
@@ -212,8 +210,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 
      // Destroy the POA
      poa->destroy (1, 0);
-
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -224,7 +220,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 426e5225dca..4b48fd774a2 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -31,7 +31,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier
   //   It simply publishes one event type.
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   int run (int argc, ACE_TCHAR* argv[]);
@@ -39,11 +39,10 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The skeleton methods.
 
 private:
-
   // = Data Members
   CosNaming::NamingContext_var naming_context_;
   // Handle to the name service.
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 627d28c99e1..315227f0860 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -173,7 +173,7 @@ private:
 
 
   virtual void
-  disconnect_structured_push_consumer (void)
+  disconnect_structured_push_consumer ()
   {
     // We don't care.
   }
@@ -190,7 +190,6 @@ private:
 
   ProxyID supplier_id_;
   StructuredProxyPushSupplier_var supplier_;
-
 };
 
 int
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 7055c096e6f..93d46418516 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -238,7 +238,7 @@ push_structured_event (StructuredEvent const& e)
 
 
 void
-Gate::disconnect_structured_push_consumer (void)
+Gate::disconnect_structured_push_consumer ()
 {
   // We don't care.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index 8444f2f6a12..049662855bd 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -58,7 +58,7 @@ private:
 
 
   virtual void
-  disconnect_structured_push_consumer (void);
+  disconnect_structured_push_consumer ();
 
 private:
   ACE_thread_t thread_;
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index ea341893d7b..4150d641a7c 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -13,7 +13,7 @@
 
 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0;
 
-FilterClient::FilterClient (void)
+FilterClient::FilterClient ()
   :done_ (0)
 {
   g_result_count = 0;
@@ -47,7 +47,7 @@ FilterClient::init (int argc, ACE_TCHAR *argv [])
 }
 
 void
-FilterClient::run (void)
+FilterClient::run ()
 {
   send_events ();
 
@@ -60,7 +60,7 @@ FilterClient::run (void)
 }
 
 void
-FilterClient::done (void)
+FilterClient::done ()
 {
   this->done_ = 1;
 }
@@ -89,7 +89,7 @@ FilterClient::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-FilterClient::resolve_naming_service (void)
+FilterClient::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -103,7 +103,7 @@ FilterClient::resolve_naming_service (void)
 }
 
 void
-FilterClient::resolve_Notify_factory (void)
+FilterClient::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -117,7 +117,7 @@ FilterClient::resolve_Notify_factory (void)
 }
 
 void
-FilterClient::create_EC (void)
+FilterClient::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -129,7 +129,7 @@ FilterClient::create_EC (void)
 }
 
 void
-FilterClient::create_supplieradmin (void)
+FilterClient::create_supplieradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
@@ -161,7 +161,7 @@ FilterClient::create_supplieradmin (void)
 }
 
 void
-FilterClient:: create_consumeradmin (void)
+FilterClient:: create_consumeradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
@@ -196,7 +196,7 @@ FilterClient:: create_consumeradmin (void)
 }
 
 void
-FilterClient::create_consumers (void)
+FilterClient::create_consumers ()
 {
   // startup the first consumer.
   ACE_NEW_THROW_EX (consumer_1,
@@ -214,7 +214,7 @@ FilterClient::create_consumers (void)
 }
 
 void
-FilterClient::create_suppliers (void)
+FilterClient::create_suppliers ()
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
@@ -232,7 +232,7 @@ FilterClient::create_suppliers (void)
 }
 
 void
-FilterClient::send_events (void)
+FilterClient::send_events ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -294,7 +294,7 @@ Filter_StructuredPushConsumer::Filter_StructuredPushConsumer (FilterClient* filt
 {
 }
 
-Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
+Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer ()
 {
 }
 
@@ -321,7 +321,7 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr
 }
 
 void
-Filter_StructuredPushConsumer::disconnect (void)
+Filter_StructuredPushConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier();
@@ -360,7 +360,7 @@ Filter_StructuredPushConsumer::push_structured_event
 
 void
 Filter_StructuredPushConsumer::disconnect_structured_push_consumer
-   (void)
+   ()
 {
   // No-Op.
 }
@@ -398,7 +398,7 @@ Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (void)
+Filter_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -428,7 +428,7 @@ Filter_StructuredPushSupplier::send_event
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (void)
+   ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index 35637d29aa8..09e4f29ec9f 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -31,10 +31,9 @@ class Filter_StructuredPushSupplier;
  */
 class FilterClient
 {
-
  public:
   /// Constructor
-  FilterClient (void);
+  FilterClient ();
 
   /// Destructor
   ~FilterClient ();
@@ -43,38 +42,38 @@ class FilterClient
   void init (int argc, ACE_TCHAR *argv []);
 
   /// Run the demo.
-  void run (void);
+  void run ();
 
   /// Consumer calls done, We're done.
-  void done (void);
+  void done ();
 
  protected:
   /// Initializes the ORB.
   void init_ORB (int argc, ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   /// Create an EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// Create the Supplier Admin.
-  void create_supplieradmin(void);
+  void create_supplieradmin();
 
   /// Create the Consumer Admin.
-  void create_consumeradmin (void);
+  void create_consumeradmin ();
 
   /// Create and initialize the consumers.
-  void create_consumers (void);
+  void create_consumers ();
 
   /// create and initialize the suppliers.
-  void create_suppliers (void);
+  void create_suppliers ();
 
   /// send the events.
-  void send_events (void);
+  void send_events ();
 
   // = Data Members
   /// Reference to the root poa.
@@ -143,7 +142,7 @@ class Filter_StructuredPushConsumer
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the supplier.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
 protected:
   // = Data members
@@ -162,7 +161,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~Filter_StructuredPushConsumer (void);
+  virtual ~Filter_StructuredPushConsumer ();
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -196,7 +195,7 @@ class Filter_StructuredPushSupplier
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 275d6fa001b..bd3d67a94b7 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -5,7 +5,7 @@ TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& or
 {
 }
 
-TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer (void)
+TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer ()
 {
 }
 
@@ -20,19 +20,19 @@ TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelA
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer::_default_POA (void)
+TAO_Notify_Lanes_Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_Lanes_Consumer::run (void)
+TAO_Notify_Lanes_Consumer::run ()
 {
   // Nothing to do.
 }
 
 void
-TAO_Notify_Lanes_Consumer::connect (void)
+TAO_Notify_Lanes_Consumer::connect ()
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
@@ -63,7 +63,7 @@ TAO_Notify_Lanes_Consumer::connect (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer::disconnect (void)
+TAO_Notify_Lanes_Consumer::disconnect ()
 {
   this->proxy_supplier_->disconnect_structured_push_supplier();
 }
@@ -120,7 +120,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
 }
 
 void
-TAO_Notify_Lanes_Consumer::deactivate (void)
+TAO_Notify_Lanes_Consumer::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -130,7 +130,7 @@ TAO_Notify_Lanes_Consumer::deactivate (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void)
+TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index 6945eb99a24..df77a378564 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -33,7 +33,7 @@ public:
   void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type);
 
   /// Run
-  void run (void);
+  void run ();
 
 protected:
   // = Data members
@@ -58,20 +58,20 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~TAO_Notify_Lanes_Consumer (void);
+  virtual ~TAO_Notify_Lanes_Consumer ();
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Connect the Consumer to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   // = NotifyPublish method
   virtual void offer_change (
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 285db7c8a01..e2139f642c0 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -9,7 +9,6 @@
 #include "ace/OS_NS_errno.h"
 
 
-
 TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
   , lane_priority_ (0)
@@ -53,7 +52,7 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_Lanes_Consumer_Client::initialize (void)
+TAO_Notify_Lanes_Consumer_Client::initialize ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n"
               , this->lane_priority_, this->event_type_.c_str ()));
@@ -99,7 +98,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
+TAO_Notify_Lanes_Consumer_Client::create_rt_poa ()
 {
   PortableServer::POA_var rt_poa;
 
@@ -161,13 +160,13 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer_Client::run (void)
+TAO_Notify_Lanes_Consumer_Client::run ()
 {
   this->consumer_->run ();
 }
 
 int
-TAO_Notify_Lanes_Consumer_Client::svc (void)
+TAO_Notify_Lanes_Consumer_Client::svc ()
 {
   try
     {
@@ -181,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/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
index 8ca203d982c..2d22ab6f102 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
@@ -34,10 +34,10 @@ public:
   ~TAO_Notify_Lanes_Consumer_Client ();
 
   /// Init
-  void initialize (void);
+  void initialize ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -47,7 +47,7 @@ public:
 
 protected:
   /// Create an RT POA with a single lane at the specified RT Priority.
-  PortableServer::POA_ptr create_rt_poa (void);
+  PortableServer::POA_ptr create_rt_poa ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 687fa6053ea..84e33b4c6aa 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -1,8 +1,7 @@
 #include "ORB_Objects.h"
 
 
-
-TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
+TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects ()
 {
 }
 
@@ -36,7 +35,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (void)
+TAO_Notify_ORB_Objects::notify_factory ()
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index c40609915fa..132f3bd1c23 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -24,7 +24,7 @@ class TAO_Notify_ORB_Objects
 {
 public:
   /// Constructor
-  TAO_Notify_ORB_Objects (void);
+  TAO_Notify_ORB_Objects ();
 
   /// Destructor
   ~TAO_Notify_ORB_Objects ();
@@ -33,7 +33,7 @@ public:
   void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory ();
 
   ///= Public Data
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index d27314e6c6b..0806cfadc71 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -1,7 +1,6 @@
 #include "ORB_Run_Task.h"
 
 
-
 TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
 {
@@ -12,7 +11,7 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 }
 
 int
-TAO_Notify_ORB_Run_Task::svc (void)
+TAO_Notify_ORB_Run_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 3651c9fd1ef..c5f549bc370 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -1,7 +1,6 @@
 #include "Supplier.h"
 
 
-
 #include "tao/ORB_Core.h"
 
 TAO_Notify_Lanes_Supplier::TAO_Notify_Lanes_Supplier  (TAO_Notify_ORB_Objects& orb_objects)
@@ -28,7 +27,7 @@ TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin
 }
 
 void
-TAO_Notify_Lanes_Supplier::run (void)
+TAO_Notify_Lanes_Supplier::run ()
 {
   // The Priority at which we send the first event to the first consumer.
   RTCORBA::Priority priority = 1;
@@ -93,7 +92,7 @@ TAO_Notify_Lanes_Supplier::run (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier::connect (void)
+TAO_Notify_Lanes_Supplier::connect ()
 {
   // Activate the supplier object.
   CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
@@ -116,7 +115,7 @@ TAO_Notify_Lanes_Supplier::connect (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier::disconnect (void)
+TAO_Notify_Lanes_Supplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -124,7 +123,7 @@ TAO_Notify_Lanes_Supplier::disconnect (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier::deactivate (void)
+TAO_Notify_Lanes_Supplier::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -156,7 +155,7 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e
 }
 
 void
-TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void)
+TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index 1f4dceb6a0b..bf0746c0b80 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -32,20 +32,20 @@ public:
   void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count);
 
   /// Run
-  void run (void);
+  void run ();
 
 protected:
   // = Protected Methods
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
@@ -59,7 +59,7 @@ protected:
         const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
   /// = Data members
 
   /// ORB Objects.
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 32865fcd20c..c823ef82e81 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -10,7 +10,6 @@
 #include "ace/OS_NS_errno.h"
 
 
-
 TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
     ,supplier_ (0)
@@ -59,7 +58,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::initialize (void)
+TAO_Notify_Lanes_Supplier_Client::initialize ()
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager ();
@@ -84,7 +83,7 @@ TAO_Notify_Lanes_Supplier_Client::initialize (void)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_Lanes_Supplier_Client::create_ec (void)
+TAO_Notify_Lanes_Supplier_Client::create_ec ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -145,7 +144,7 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::run (void)
+TAO_Notify_Lanes_Supplier_Client::run ()
 {
   /// First, signal that the supplier is ready.
   this->write_ior ();
@@ -154,7 +153,7 @@ TAO_Notify_Lanes_Supplier_Client::run (void)
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::write_ior (void)
+TAO_Notify_Lanes_Supplier_Client::write_ior ()
 {
   CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
 
@@ -174,7 +173,7 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (void)
 }
 
 int
-TAO_Notify_Lanes_Supplier_Client::svc (void)
+TAO_Notify_Lanes_Supplier_Client::svc ()
 {
   try
     {
@@ -187,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/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
index c10aa42d931..229ce52a686 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
@@ -31,10 +31,10 @@ public:
   ~TAO_Notify_Lanes_Supplier_Client ();
 
   /// Init
-  void initialize (void);
+  void initialize ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -44,10 +44,10 @@ public:
 
 protected:
   /// Create an EC
-  CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
+  CosNotifyChannelAdmin::EventChannel_ptr create_ec ();
 
   /// Write ior to file.
-  void write_ior (void);
+  void write_ior ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a6f96cbe249..1d749a9ada6 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -16,7 +16,7 @@
 
 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; // we wait for 4 events.
 
-Subscribe::Subscribe (void)
+Subscribe::Subscribe ()
   : done_ (0)
 {
   // No-Op.
@@ -42,7 +42,7 @@ Subscribe::init (int argc, ACE_TCHAR *argv [])
 }
 
 void
-Subscribe::run (void)
+Subscribe::run ()
 {
   this->send_events ();
 
@@ -55,7 +55,7 @@ Subscribe::run (void)
 }
 
 void
-Subscribe::done (void)
+Subscribe::done ()
 {
   this->done_ = 1;
 }
@@ -84,7 +84,7 @@ Subscribe::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-Subscribe::resolve_naming_service (void)
+Subscribe::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -98,7 +98,7 @@ Subscribe::resolve_naming_service (void)
 }
 
 void
-Subscribe::resolve_Notify_factory (void)
+Subscribe::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -112,7 +112,7 @@ Subscribe::resolve_Notify_factory (void)
 }
 
 void
-Subscribe::create_EC (void)
+Subscribe::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -124,7 +124,7 @@ Subscribe::create_EC (void)
 }
 
 void
-Subscribe::create_supplieradmin (void)
+Subscribe::create_supplieradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -135,7 +135,7 @@ Subscribe::create_supplieradmin (void)
 }
 
 void
-Subscribe:: create_consumeradmin (void)
+Subscribe:: create_consumeradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -146,7 +146,7 @@ Subscribe:: create_consumeradmin (void)
 }
 
 void
-Subscribe::create_consumers (void)
+Subscribe::create_consumers ()
 {
   consumer_1_ = new Subscribe_StructuredPushConsumer (this);
   consumer_1_->connect (this->consumer_admin_.in ());
@@ -156,7 +156,7 @@ Subscribe::create_consumers (void)
 }
 
 void
-Subscribe::create_suppliers (void)
+Subscribe::create_suppliers ()
 {
   supplier_1_ = new Subscribe_StructuredPushSupplier ();
   supplier_1_->connect (this->supplier_admin_.in ());
@@ -166,7 +166,7 @@ Subscribe::create_suppliers (void)
 }
 
 void
-Subscribe::send_events (void)
+Subscribe::send_events ()
 {
   // Setup the CA to receive event_type : "domain_A", "Type_a"
   CosNotification::EventTypeSeq added(1);
@@ -288,7 +288,7 @@ Subscribe_StructuredPushConsumer::connect
 }
 
 void
-Subscribe_StructuredPushConsumer::disconnect (void)
+Subscribe_StructuredPushConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier();
@@ -329,25 +329,24 @@ Subscribe_StructuredPushConsumer::push_structured_event
 
   if (++g_result_count == EVENT_COUNT)
     subscribe_->done ();
-
 }
 
 void
 Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
-   (void)
+   ()
 {
   // No-Op.
 }
 
 CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr
-Subscribe_StructuredPushConsumer::get_proxy_supplier (void)
+Subscribe_StructuredPushConsumer::get_proxy_supplier ()
 {
   return proxy_supplier_.in ();
 }
 
 /*****************************************************************/
 
-Subscribe_StructuredPushSupplier::Subscribe_StructuredPushSupplier (void)
+Subscribe_StructuredPushSupplier::Subscribe_StructuredPushSupplier ()
 {
 }
 
@@ -377,7 +376,7 @@ Subscribe_StructuredPushSupplier::connect
 }
 
 void
-Subscribe_StructuredPushSupplier::disconnect (void)
+Subscribe_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -403,7 +402,7 @@ Subscribe_StructuredPushSupplier::send_event
 
 void
 Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
-   (void)
+   ()
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index e6294322038..fd6466c78ca 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -30,45 +30,45 @@ class Subscribe_StructuredPushSupplier;
 class Subscribe
 {
 public:
-  Subscribe (void);
+  Subscribe ();
   ~Subscribe ();
 
   /// Init the Client.
   void init (int argc, ACE_TCHAR *argv []);
 
   /// Run the demo.
-  void run (void);
+  void run ();
 
   /// Called when all events we are waiting for have occurred.
-  void done (void);
+  void done ();
 
  protected:
   /// Initializes the ORB.
   void init_ORB (int argc, ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   /// Create an EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// Create the Supplier Admin.
-  void create_supplieradmin(void);
+  void create_supplieradmin();
 
   /// Create the Consumer Admin.
-  void create_consumeradmin (void);
+  void create_consumeradmin ();
 
   /// Create and initialize the consumers.
-  void create_consumers (void);
+  void create_consumers ();
 
   /// create and initialize the suppliers.
-  void create_suppliers (void);
+  void create_suppliers ();
 
   /// send the events.
-  void send_events (void);
+  void send_events ();
 
   // = Data Members
   /// Reference to the root poa.
@@ -130,10 +130,10 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the supplier.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
   /// Accessor for the Proxy that we're connected to.
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
+  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier ();
 
   // public data member for evaluating the results of subscription.
   CosNotification::EventTypeSeq expected_subscription_;
@@ -150,7 +150,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~Subscribe_StructuredPushConsumer (void);
+  virtual ~Subscribe_StructuredPushConsumer ();
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -177,14 +177,14 @@ class Subscribe_StructuredPushSupplier
   //
 public:
   /// Constructor.
-  Subscribe_StructuredPushSupplier (void);
+  Subscribe_StructuredPushSupplier ();
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 93d29935e5e..ab02d46ca9f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -18,7 +18,7 @@ TAO_Notify_ThreadPool_Consumer::TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_O
 {
 }
 
-TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer (void)
+TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer ()
 {
 }
 
@@ -38,19 +38,19 @@ TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyCha
 }
 
 PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer::_default_POA (void)
+TAO_Notify_ThreadPool_Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::run (void)
+TAO_Notify_ThreadPool_Consumer::run ()
 {
   // Nothing to do.
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::connect (void)
+TAO_Notify_ThreadPool_Consumer::connect ()
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
@@ -111,7 +111,7 @@ TAO_Notify_ThreadPool_Consumer::connect (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::disconnect (void)
+TAO_Notify_ThreadPool_Consumer::disconnect ()
 {
   this->proxy_supplier_->disconnect_structured_push_supplier();
 }
@@ -158,7 +158,7 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
+TAO_Notify_ThreadPool_Consumer::dump_throughput ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
@@ -171,7 +171,7 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::deactivate (void)
+TAO_Notify_ThreadPool_Consumer::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -181,7 +181,7 @@ TAO_Notify_ThreadPool_Consumer::deactivate (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void)
+TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index 131c4b81deb..673e4faf480 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -34,28 +34,28 @@ public:
   void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay);
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Print the consumer throughput
-  void dump_throughput (void);
+  void dump_throughput ();
 
 protected:
   // = Methods
   /// Destructor
-  virtual ~TAO_Notify_ThreadPool_Consumer (void);
+  virtual ~TAO_Notify_ThreadPool_Consumer ();
 
   /// Connect the Consumer to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   // = NotifyPublish method
   virtual void offer_change (
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index d34251bb9b7..850a331191b 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -9,7 +9,6 @@
 #include "ace/OS_NS_errno.h"
 
 
-
 TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
   , consumer_ (0)
@@ -61,7 +60,7 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::_init (void)
+TAO_Notify_ThreadPool_Consumer_Client::_init ()
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager ();
@@ -104,7 +103,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (void)
 }
 
 PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
+TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa ()
 {
   PortableServer::POA_var rt_poa;
 
@@ -159,19 +158,19 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::run (void)
+TAO_Notify_ThreadPool_Consumer_Client::run ()
 {
   this->consumer_->run ();
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::dump_stats (void)
+TAO_Notify_ThreadPool_Consumer_Client::dump_stats ()
 {
   this->consumer_->dump_throughput ();
 }
 
 int
-TAO_Notify_ThreadPool_Consumer_Client::svc (void)
+TAO_Notify_ThreadPool_Consumer_Client::svc ()
 {
   try
     {
@@ -185,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/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
index 492ca513a76..f5dc2ff31db 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
@@ -32,10 +32,10 @@ public:
   ~TAO_Notify_ThreadPool_Consumer_Client ();
 
   /// Init
-  void _init (void);
+  void _init ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -44,11 +44,11 @@ public:
   virtual int svc ();
 
   /// Dump stats.
-  void dump_stats (void);
+  void dump_stats ();
 
 protected:
   /// Create an RT POA with a single threadpool.
-  PortableServer::POA_ptr create_rt_poa (void);
+  PortableServer::POA_ptr create_rt_poa ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 687fa6053ea..84e33b4c6aa 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -1,8 +1,7 @@
 #include "ORB_Objects.h"
 
 
-
-TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
+TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects ()
 {
 }
 
@@ -36,7 +35,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (void)
+TAO_Notify_ORB_Objects::notify_factory ()
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index 4c501ec1f3f..ca94c2e8937 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -23,7 +23,7 @@ class TAO_Notify_ORB_Objects
 {
 public:
   /// Constructor
-  TAO_Notify_ORB_Objects (void);
+  TAO_Notify_ORB_Objects ();
 
   /// Destructor
   ~TAO_Notify_ORB_Objects ();
@@ -32,7 +32,7 @@ public:
   void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory ();
 
   ///= Public Data
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index d27314e6c6b..0806cfadc71 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -1,7 +1,6 @@
 #include "ORB_Run_Task.h"
 
 
-
 TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
 {
@@ -12,7 +11,7 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 }
 
 int
-TAO_Notify_ORB_Run_Task::svc (void)
+TAO_Notify_ORB_Run_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index af8bf93d61b..ec24428c2df 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -1,7 +1,6 @@
 #include "Supplier.h"
 
 
-
 #include "tao/ORB_Core.h"
 
 TAO_Notify_ThreadPool_Supplier::TAO_Notify_ThreadPool_Supplier  (TAO_Notify_ORB_Objects& orb_objects)
@@ -33,7 +32,7 @@ TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var&
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::run (void)
+TAO_Notify_ThreadPool_Supplier::run ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
@@ -69,7 +68,7 @@ TAO_Notify_ThreadPool_Supplier::run (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::connect (void)
+TAO_Notify_ThreadPool_Supplier::connect ()
 {
   // Activate the supplier object.
   CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
@@ -117,7 +116,7 @@ TAO_Notify_ThreadPool_Supplier::connect (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::disconnect (void)
+TAO_Notify_ThreadPool_Supplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -125,7 +124,7 @@ TAO_Notify_ThreadPool_Supplier::disconnect (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::deactivate (void)
+TAO_Notify_ThreadPool_Supplier::deactivate ()
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
@@ -166,7 +165,7 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void)
+TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier ()
 {
   this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 06bb8d8502c..5b263d76ae1 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -34,20 +34,20 @@ public:
              int proxy_consumer_thread_count);
 
   /// Run
-  void run (void);
+  void run ();
 
 protected:
   // = Protected Methods
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
-  void connect (void);
+  void connect ();
 
   /// Disconnect the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Deactivate.
-  void deactivate (void);
+  void deactivate ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
@@ -61,7 +61,7 @@ protected:
         const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
   /// = Data members
 
   /// ORB Objects.
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 8fe87a8af5e..2bccc8f164c 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -76,7 +76,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::_init (void)
+TAO_Notify_ThreadPool_Supplier_Client::_init ()
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager ();
@@ -101,7 +101,7 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (void)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
+TAO_Notify_ThreadPool_Supplier_Client::create_ec ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -141,7 +141,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::run (void)
+TAO_Notify_ThreadPool_Supplier_Client::run ()
 {
   /// First, signal that the supplier is ready.
   this->write_ior ();
@@ -150,7 +150,7 @@ TAO_Notify_ThreadPool_Supplier_Client::run (void)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
+TAO_Notify_ThreadPool_Supplier_Client::write_ior ()
 {
   CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
 
@@ -170,7 +170,7 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
 }
 
 int
-TAO_Notify_ThreadPool_Supplier_Client::svc (void)
+TAO_Notify_ThreadPool_Supplier_Client::svc ()
 {
   try
     {
@@ -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/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
index a8124b09e5c..d94d8462b3f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
@@ -30,10 +30,10 @@ public:
   ~TAO_Notify_ThreadPool_Supplier_Client ();
 
   /// Init
-  void _init (void);
+  void _init ();
 
   /// Run
-  void run (void);
+  void run ();
 
   /// Parse Args
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -43,10 +43,10 @@ public:
 
 protected:
   /// Create an EC
-  CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
+  CosNotifyChannelAdmin::EventChannel_ptr create_ec ();
 
   /// Write ior to file.
-  void write_ior (void);
+  void write_ior ();
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index d313390481f..69ddc038a5d 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -11,7 +11,7 @@ Gateway_ObjRef_Factory (
 }
 
 ::CORBA::ValueBase *
-Gateway_ObjRef_Factory::_copy_value (void)
+Gateway_ObjRef_Factory::_copy_value ()
 {
   Gateway_ObjRef_Factory *ret_val= 0;
   ACE_NEW_THROW_EX (
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index 3a3889856df..8f62819a96a 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -14,12 +14,11 @@ class Gateway_ObjRef_Factory
     public virtual OBV_ORT::ObjectReferenceFactory
 {
 public:
-
   Gateway_ObjRef_Factory (
     Gateway::Object_Factory_ptr gateway_object_factory,
     PortableInterceptor::ObjectReferenceFactory *old_factory);
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h
index 081dee4ed14..b375ea65a25 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h
@@ -34,7 +34,6 @@ public:
       PortableServer::POA_ptr poa);
 
  private:
-
   CORBA::ORB_ptr orb_;
 
   PortableServer::Current_ptr poa_current_;
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index 80aaf03d774..fce4a82e0df 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -21,7 +21,6 @@
 class Object_Factory_i : public virtual POA_Gateway::Object_Factory
 {
  public:
-
   /// Constructor
   Object_Factory_i (CORBA::ORB_ptr orb,
                     PortableServer::POA_ptr gateway_poa);
@@ -31,7 +30,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory
                    CORBA::Object_ptr gatewayed_object);
 
  private:
-
   CORBA::ORB_ptr orb_;
   PortableServer::POA_ptr gateway_poa_;
 };
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 49a2906ce81..b4c59369154 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -7,20 +7,20 @@ Server_IORInterceptor (Gateway::Object_Factory_ptr factory)
 {
 }
 
-Server_IORInterceptor::~Server_IORInterceptor (void)
+Server_IORInterceptor::~Server_IORInterceptor ()
 {
   CORBA::release (this->gateway_object_factory_);
 }
 
 
 char *
-Server_IORInterceptor::name (void)
+Server_IORInterceptor::name ()
 {
   return CORBA::string_dup ("Server_IORInterceptor");
 }
 
 void
-Server_IORInterceptor::destroy (void)
+Server_IORInterceptor::destroy ()
 {
   CORBA::release (this->gateway_object_factory_);
   this->gateway_object_factory_ = Gateway::Object_Factory::_nil ();
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 47774c8921e..d36f2c0a3ed 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -22,7 +22,6 @@ class Server_IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   Server_IORInterceptor (Gateway::Object_Factory_ptr gateway_object_factory);
 
   /**
@@ -34,10 +33,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -57,13 +56,10 @@ public:
   //@}
 
 protected:
-
-  ~Server_IORInterceptor (void);
+  ~Server_IORInterceptor ();
 
 private:
-
   Gateway::Object_Factory_ptr gateway_object_factory_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index 1832257174a..e5b4d270230 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -20,7 +20,6 @@ class Server_IORInterceptor_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
  public:
-
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
@@ -28,7 +27,6 @@ class Server_IORInterceptor_ORBInitializer
   /// The post-initialization hook.
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index 730542b0aa4..b3bfb5c2d5f 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -21,14 +21,12 @@
 class sum_server_i : public virtual POA_ORT::sum_server
 {
  public:
-
   /// Constructor
   sum_server_i ();
 
   /// add variables method
   CORBA::Long add_variables (CORBA::Long a,
                              CORBA::Long b);
-
 };
 
 #endif /* SUM_SERVER_I_H */
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 305d0d1fdf6..810c5adae15 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -21,7 +21,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -142,7 +142,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index afa68222030..b64b43bee56 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -27,7 +27,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -36,7 +36,7 @@ public:
 
   // The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index 46beee50311..e4dfe0a4bd2 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC::EC (void)
+EC::EC ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
index b9f326327bc..5648f124f3a 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
@@ -25,7 +25,7 @@ class EC
 {
 public:
   /// Constructor
-  EC (void);
+  EC ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 1e5908baf66..c36aafa4ee1 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -20,7 +20,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Gateway::Gateway (void)
+Gateway::Gateway ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
index 8e203359789..52944979ec5 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
@@ -24,7 +24,7 @@ class Gateway
 {
 public:
   /// Constructor
-  Gateway (void);
+  Gateway ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index 71007b6620f..bda7a4bfbdf 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -22,7 +22,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -137,7 +137,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index b20a42d89b0..0b71d3a186d 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -26,7 +26,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -34,7 +34,7 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 6affe0ce442..a126ffcde82 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -1,8 +1,7 @@
 #include "Consumer.h"
 
 
-
-Consumer::Consumer (void)
+Consumer::Consumer ()
 {
 }
 
@@ -21,7 +20,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index eca442d1128..f11eb11cf76 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -34,13 +34,13 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 };
 
 #endif /* CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index d5294b91bec..5032ec9520a 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -20,7 +20,6 @@
 #include "ace/Thread.h"
 
 
-
 namespace
 {
   int config_run = 0;
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index a08693a781d..451f7ccfe93 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -4,7 +4,6 @@
 #include "orbsvcs/RtecEventCommC.h"
 
 
-
 Supplier::Supplier (RtecEventComm::EventSourceID id,
                     const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy)
 :id_ (id),
@@ -13,7 +12,7 @@ Supplier::Supplier (RtecEventComm::EventSourceID id,
 }
 
 void
-Supplier::timeout_occurred (void)
+Supplier::timeout_occurred ()
 {
   RtecEventComm::EventSet event (1);
   if (id_ == 1)
@@ -35,7 +34,7 @@ Supplier::timeout_occurred (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
@@ -59,7 +58,7 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Timeout_Consumer::disconnect_push_consumer (void)
+Timeout_Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 521175465fb..1a34a69e981 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -41,9 +41,9 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
-  void timeout_occurred (void);
+  void timeout_occurred ();
 
 private:
   RtecEventComm::EventSourceID id_;
@@ -69,7 +69,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   Supplier *supplier_impl_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 0fca147dffc..241296a0526 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -36,7 +36,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   try
     {
@@ -79,7 +79,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index a48d9c507ce..8e9bdcfa1b8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -30,19 +30,19 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Connect to the Event Channel
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 819a6caf61a..bfd1976c7bb 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -30,7 +30,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   // Disconnect from the EC
   try
@@ -49,7 +49,7 @@ Supplier::disconnect (void)
 }
 
 void
-Supplier::perform_push (void)
+Supplier::perform_push ()
 {
   try
     {
@@ -69,7 +69,7 @@ Supplier::perform_push (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 242d7385234..795a05aab74 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -31,21 +31,21 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event
-  void perform_push (void);
+  void perform_push ();
 
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 4554ad6baff..b342a399e8e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -1,6 +1,6 @@
 #include "Consumer.h"
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
 {
 }
 
@@ -19,7 +19,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index eca442d1128..f11eb11cf76 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -34,13 +34,13 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 };
 
 #endif /* CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 09820b9d704..3afa9f99684 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -15,7 +15,6 @@
 #include "ace/OS_NS_unistd.h"
 
 
-
 int config_run = 0;
 
 int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 3a97402ca8e..98a01e57a22 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -1,11 +1,11 @@
 #include "Supplier.h"
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index 278934efb6d..a689ef39bb7 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -34,12 +34,12 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index 02db0dc75ae..127158fa995 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -13,7 +13,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -126,7 +126,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 71f9300fb16..dc91368f8ea 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -29,7 +29,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer
 {
 public:
   /// Constructor
-  Consumer (void);
+  Consumer ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -38,7 +38,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 9c7b5324b23..08e8e17ce41 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -116,7 +116,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index a1e9d944303..53fc07c7145 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -29,7 +29,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  Supplier (void);
+  Supplier ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
@@ -37,7 +37,7 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
 };
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 50bb40a03a0..ff983ba8c70 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -8,9 +8,8 @@ static int authorize_1 = 1;
 static int authorize_2 = 1;
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (void)
+SLevel1_Server_i::authorize_level1 ()
 {
-
   /// Get a reference to the SecurityCurrent object.
   CORBA::Object_var obj =
     orb->resolve_initial_references ("SecurityCurrent");
@@ -102,7 +101,7 @@ SLevel1_Server_i::authorize_level1 (void)
 
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level2 (void)
+SLevel1_Server_i::authorize_level2 ()
 {
   /// If the owner of this invocation is authorized to invoke this
   /// method, return 0 else return 1.
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index e5c1b8615fd..e43d145381c 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -20,13 +20,12 @@ class SLevel1_Server_i : public POA_SLevel1_Server
   SLevel1_Server_i ();
 
   ///
-  CORBA::Boolean authorize_level1 (void);
+  CORBA::Boolean authorize_level1 ();
 
-  CORBA::Boolean authorize_level2 (void);
+  CORBA::Boolean authorize_level2 ();
 
   static int authorized_1;
   static int authorized_2;
-
 };
 
 #endif /* TAO_SLEVEL1_TEST_I_H */
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 66f5acd3b42..5e292c26972 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -1,7 +1,6 @@
 #include "SLevel1_TestC.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
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/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index ab977303ded..68a578d17cc 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -3,7 +3,6 @@
 #include "testC.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 9b9f82aab2c..326958271d9 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -4,7 +4,6 @@
 #include "ace/OS_NS_unistd.h"
 
 
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 8f06732eb5c..db443ce5227 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 void
 Simple_Server_i::send_line (const char *line)
 {
@@ -13,7 +12,7 @@ Simple_Server_i::send_line (const char *line)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index fb2e86350c9..3391e218fca 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   void send_line (const char *line);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index baafac90542..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,9 +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 ()))
@@ -1006,7 +1002,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       FlowEndPoint_Map_Entry *a_feps_entry, *b_feps_entry;
       try
         {
-
           for (;a_feps_iterator.next (a_feps_entry) != 0;
                a_feps_iterator.advance ())
             {
@@ -1393,7 +1388,6 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
   Peer_Info *info;
   try
     {
-
       for (this->peer_list_iterator_.first ();
            (info = this->peer_list_iterator_.next ()) != 0;
            this->peer_list_iterator_.advance ())
@@ -1480,7 +1474,6 @@ TAO_Base_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &)
 CORBA::Boolean
 TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &)
 {
-
   while (!this->is_protocol_object_set ())
     TAO_AV_CORE::instance ()->orb ()->perform_work ();
   return 1;
@@ -1763,7 +1756,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec)
 
   if (flow_spec.length () > 0)
     {
-
       for (u_int i=0;i<flow_spec.length ();i++)
         {
           TAO_AV_FlowSpecSetItor end = this->forward_flow_spec_set.end ();
@@ -2004,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 ();
-
               }
           }
       }
@@ -2131,7 +2122,6 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
             ORBSVCS_ERROR_RETURN ((LM_ERROR,
                                "Modifying QoS Failed\n"),
                               -1);
-
         }
     }
   return 0;
@@ -2152,7 +2142,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
     return 0;
 
   return 1;
-
 }
 
 // Sets the list of protocols this streamendpoint can understand.
@@ -2537,7 +2526,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                 }
               else
                 {
-
                   switch (forward_entry->direction ())
                     {
                     case TAO_FlowSpec_Entry::TAO_AV_DIR_IN:
@@ -2608,9 +2596,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep
                                        const AVStreams::flowSpec & /* theSpec */)
 
 {
-
   throw AVStreams::notSupported ();
-
 }
 
 TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A ()
@@ -3303,7 +3289,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj)
 CORBA::Object_ptr
 TAO_MMDevice::get_fdev (const char *flow_name)
 {
-
   ACE_CString fdev_name_key (flow_name);
   AVStreams::FDev_var fdev_entry;
   if (this->fdev_map_.find (fdev_name_key, fdev_entry) == 0)
@@ -3572,7 +3557,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 {
   try
     {
-
       AVStreams::FlowProducer_ptr flow_producer =
         AVStreams::FlowProducer::_duplicate (producer);
       AVStreams::FlowConsumer_ptr flow_consumer =
@@ -3786,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);
@@ -3922,7 +3905,6 @@ TAO_FlowEndPoint::destroy ()
 AVStreams::StreamEndPoint_ptr
 TAO_FlowEndPoint::related_sep ()
 {
-
   return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ());
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index c9005430917..3ae3c6adc8e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -51,17 +51,14 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E
 typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex>  Flow_Handler_Map_Iterator;
 
 
-
 class TAO_AV_Export AV_Null_MediaCtrl
   : public virtual POA_Null_MediaCtrl
 {
 public:
-  AV_Null_MediaCtrl (void);
+  AV_Null_MediaCtrl ();
 
 protected:
-
-  virtual ~AV_Null_MediaCtrl (void);
-
+  virtual ~AV_Null_MediaCtrl ();
 };
 
 /**
@@ -73,10 +70,9 @@ class TAO_AV_Export TAO_Basic_StreamCtrl
   : public virtual POA_AVStreams::Basic_StreamCtrl,
     public virtual TAO_PropertySet
 {
-
 public:
   /// Default Constructor
-  TAO_Basic_StreamCtrl (void);
+  TAO_Basic_StreamCtrl ();
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
@@ -117,9 +113,8 @@ public:
                                     CORBA::Object_ptr flow_connection);
 
 protected:
-
   /// Destructor.
-  virtual ~TAO_Basic_StreamCtrl (void);
+  virtual ~TAO_Basic_StreamCtrl ();
 
 
   /// The Virtual Devices for this stream
@@ -156,7 +151,7 @@ class TAO_AV_Export MMDevice_Map_Hash_Key
 {
 public:
   /// default constructor.
-  MMDevice_Map_Hash_Key (void);
+  MMDevice_Map_Hash_Key ();
 
   /// constructor.
   MMDevice_Map_Hash_Key (AVStreams::MMDevice_ptr mmdevice);
@@ -165,7 +160,7 @@ public:
   MMDevice_Map_Hash_Key (const MMDevice_Map_Hash_Key&);
 
   /// destructor.
-  ~MMDevice_Map_Hash_Key (void);
+  ~MMDevice_Map_Hash_Key ();
 
   /// operator== needed by  ACE_Hash_Map_Manager.
   bool operator == (const MMDevice_Map_Hash_Key &hash_key) const;
@@ -192,14 +187,12 @@ class TAO_AV_Export TAO_StreamCtrl
   : public virtual POA_AVStreams::StreamCtrl,
     public virtual TAO_Basic_StreamCtrl
 {
-
 public:
-
   /// Default Constructor
-  TAO_StreamCtrl (void);
+  TAO_StreamCtrl ();
 
   /// virtual destructor.
-  virtual ~TAO_StreamCtrl (void);
+  virtual ~TAO_StreamCtrl ();
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
@@ -246,7 +239,7 @@ public:
                              const AVStreams::flowSpec &the_spec);
 
   /// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-  virtual void unbind (void);
+  virtual void unbind ();
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
                                                 AVStreams::StreamEndPoint_out sep);
@@ -257,7 +250,6 @@ public:
                                      const AVStreams::flowSpec &the_spec);
 
 protected:
-
   struct MMDevice_Map_Entry
   {
     AVStreams::StreamEndPoint_var sep_;
@@ -282,7 +274,6 @@ class TAO_AV_Export TAO_MCastConfigIf
     public virtual TAO_PropertySet
 {
 public:
-
   enum Peer_Interface {VDEV = 0, FLOWENDPOINT=1};
   struct Peer_Info
   {
@@ -294,10 +285,10 @@ public:
   };
 
   /// Default constructor.
-  TAO_MCastConfigIf (void);
+  TAO_MCastConfigIf ();
 
   /// Dtor
-  ~TAO_MCastConfigIf (void);
+  ~TAO_MCastConfigIf ();
 
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
@@ -336,7 +327,7 @@ class TAO_AV_Export TAO_AV_QoS
 {
 public:
   /// constructor.
-  TAO_AV_QoS (void);
+  TAO_AV_QoS ();
 
   /// constructor taking a stream qos parameter.
   TAO_AV_QoS (AVStreams::streamQoS &stream_qos);
@@ -380,17 +371,16 @@ class TAO_AV_Flow_Handler;
 class TAO_AV_Export TAO_Base_StreamEndPoint
   :public virtual TAO_PropertySet
 {
-
   // @@Naga: Rename this class to TAO_Base_EndPoint since both stream and flowendpoints derive from it.
 public:
-  TAO_Base_StreamEndPoint (void);
-  virtual ~TAO_Base_StreamEndPoint (void);
+  TAO_Base_StreamEndPoint ();
+  virtual ~TAO_Base_StreamEndPoint ();
 
   /// called when streamendpoint is instantiated
-  virtual int handle_open (void);
+  virtual int handle_open ();
 
   /// called when streamendpoint is being destructed
-  virtual int handle_close (void);
+  virtual int handle_close ();
 
   /// Application needs to define this
   virtual int handle_stop (const AVStreams::flowSpec &the_spec);
@@ -425,13 +415,12 @@ public:
   virtual void set_control_flow_handler (const char *flowname,
                                          TAO_AV_Flow_Handler *handler);
 
-  TAO_AV_QoS &qos (void);
+  TAO_AV_QoS &qos ();
 
-  void protocol_object_set (void);
-  int is_protocol_object_set (void);
+  void protocol_object_set ();
+  int is_protocol_object_set ();
 
 protected:
-
   TAO_AV_QoS qos_;
   Flow_Handler_Map flow_handler_map_;
   Flow_Handler_Map control_flow_handler_map_;
@@ -453,10 +442,9 @@ class TAO_AV_Export TAO_StreamEndPoint
   : public virtual POA_AVStreams::StreamEndPoint,
     public virtual TAO_Base_StreamEndPoint
 {
-
 public:
   /// Constructor
-  TAO_StreamEndPoint (void);
+  TAO_StreamEndPoint ();
 
    /// Stop the stream. Empty the_spec means, for all the flows
   virtual void stop (const AVStreams::flowSpec &the_spec);
@@ -517,7 +505,7 @@ public:
   virtual void set_source_id (CORBA::Long source_id);
 
   /// Destructor
-  virtual ~TAO_StreamEndPoint (void);
+  virtual ~TAO_StreamEndPoint ();
 
   CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                AVStreams::flowSpec &the_spec);
@@ -579,10 +567,9 @@ class TAO_AV_Export TAO_StreamEndPoint_A :
   public virtual POA_AVStreams::StreamEndPoint_A,
   public virtual TAO_StreamEndPoint
 {
-
 public:
   /// Constructor
-  TAO_StreamEndPoint_A (void);
+  TAO_StreamEndPoint_A ();
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
@@ -598,8 +585,7 @@ public:
                                 const AVStreams::flowSpec &theSpec);
 
   /// Destructor
-  virtual ~TAO_StreamEndPoint_A (void);
-
+  virtual ~TAO_StreamEndPoint_A ();
 };
 
 // For backward compatibility.
@@ -618,14 +604,14 @@ class TAO_AV_Export TAO_StreamEndPoint_B :
   //     The "B" side of a streamendpoint
 public:
   /// Constructor
-  TAO_StreamEndPoint_B (void);
+  TAO_StreamEndPoint_B ();
 
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                        AVStreams::flowSpec &the_spec);
 
   /// Destructor
-  virtual ~TAO_StreamEndPoint_B (void);
+  virtual ~TAO_StreamEndPoint_B ();
 };
 
 /**
@@ -637,10 +623,9 @@ class TAO_AV_Export TAO_VDev
   :public virtual TAO_PropertySet,
    public virtual POA_AVStreams::VDev
 {
-
 public:
   /// Default Constructor
-  TAO_VDev (void);
+  TAO_VDev ();
 
   /// Called to tell the vdev who the streamctrl, peer vdev is
   virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
@@ -672,7 +657,7 @@ public:
 protected:
   /// Destructor for a servant should be protected or private.
   /// Use _remove_ref() to delete this servant.
-  virtual ~TAO_VDev (void);
+  virtual ~TAO_VDev ();
 
   /// hook called after set_peer is done to set the media ctrl of the peer vdev.
   virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl);
@@ -697,9 +682,7 @@ class TAO_AV_Export TAO_MMDevice
   :public virtual POA_AVStreams::MMDevice,
    public virtual TAO_PropertySet
 {
-
 public:
-
   /// Constructor
   enum MMDevice_Type {MMDEVICE_A = 0,MMDEVICE_B = 1};
   TAO_MMDevice (TAO_AV_Endpoint_Strategy *endpoint_strategy_);
@@ -755,14 +738,13 @@ public:
   virtual void remove_fdev (const char *flow_name);
 
   /// Destructor
-  virtual ~TAO_MMDevice (void);
+  virtual ~TAO_MMDevice ();
 
 protected:
   /// Helper method to implement add_fdev()
   char* add_fdev_i (AVStreams::FDev_ptr fdev);
 
 protected:
-
   TAO_AV_Endpoint_Strategy *endpoint_strategy_;
 
   /// Count of the number of flows in this MMDevice , used to
@@ -798,19 +780,18 @@ class TAO_AV_Export TAO_FlowConnection
  : public virtual POA_AVStreams::FlowConnection,
    public virtual TAO_PropertySet
 {
-
 public:
   /// default constructor.
-  TAO_FlowConnection (void);
+  TAO_FlowConnection ();
 
   /// stop this flow.
-  virtual void stop (void);
+  virtual void stop ();
 
   /// start this flow.
-  virtual void start (void);
+  virtual void start ();
 
   /// destroy this flow.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// modify the QoS for this flow.
   virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos);
@@ -834,7 +815,7 @@ public:
                                   AVStreams::QoS & the_qos);
 
   /// disconnect this flow connection.
-  virtual CORBA::Boolean disconnect (void);
+  virtual CORBA::Boolean disconnect ();
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
@@ -880,11 +861,9 @@ class TAO_AV_Export TAO_FlowEndPoint :
   public virtual POA_AVStreams::FlowEndPoint,
   public virtual TAO_Base_StreamEndPoint
 {
-
 public:
-
   ///default constructor.
-  TAO_FlowEndPoint (void);
+  TAO_FlowEndPoint ();
 
   TAO_FlowEndPoint (const char *flowname,
                     AVStreams::protocolSpec &protocols,
@@ -903,24 +882,24 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   /// lock the flow endpoint for a particular flow.
-  virtual CORBA::Boolean lock (void);
+  virtual CORBA::Boolean lock ();
 
   /// unlock the flow endpoint for subsequent use.
-  virtual void unlock (void);
+  virtual void unlock ();
 
 
   /// destroy this flow.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// get method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual AVStreams::StreamEndPoint_ptr related_sep(void);
+  virtual AVStreams::StreamEndPoint_ptr related_sep();
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
   virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep);
 
-  virtual AVStreams::FlowConnection_ptr related_flow_connection(void);
+  virtual AVStreams::FlowConnection_ptr related_flow_connection();
 
   // accessor for the related flow connection attribute.
 
@@ -928,7 +907,7 @@ public:
   virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection);
 
   /// returns the other flowendpoint to which this is connected.
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void);
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep ();
 
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
@@ -1031,7 +1010,7 @@ class TAO_AV_Export TAO_FlowProducer:
 {
 public:
   /// default constructor
-  TAO_FlowProducer (void);
+  TAO_FlowProducer ();
 
   TAO_FlowProducer (const char *flowname,
                     AVStreams::protocolSpec protocols,
@@ -1047,10 +1026,10 @@ public:
   virtual char * get_rev_channel (const char * pcol_name);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (void);
+  virtual void stop ();
 
   /// start this flow, to be overridden by the application.
-  virtual void start (void);
+  virtual void start ();
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
@@ -1068,7 +1047,6 @@ public:
                                 const char * use_flow_protocol);
 
 
-
   /// sets the public key  to be used for encryption of the data.
   virtual void set_key (const AVStreams::key & the_key);
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
index fb5072ec91d..978c26126d3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_AV_QoS &
-TAO_Base_StreamEndPoint::qos (void)
+TAO_Base_StreamEndPoint::qos ()
 {
   return this->qos_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 0c5f67b7260..e8150293080 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -530,7 +530,6 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint,
   int result = -1;
   switch (direction)
     {
-
     case TAO_AV_Core::TAO_AV_ENDPOINT_A:
       {
         result = this->connector_registry_->open (endpoint,
@@ -565,10 +564,8 @@ TAO_AV_Core::get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set,
 TAO_AV_Acceptor*
 TAO_AV_Core::get_acceptor (const char *flowname)
 {
-
   try
     {
-
       TAO_AV_AcceptorSetItor acceptor =  this->acceptor_registry_->begin ();
 
       TAO_AV_AcceptorSetItor end =
@@ -590,10 +587,8 @@ TAO_AV_Core::get_acceptor (const char *flowname)
 int
 TAO_AV_Core::remove_acceptor (const char *flowname)
 {
-
   try
     {
-
       TAO_AV_AcceptorSetItor acceptor =  this->acceptor_registry_->begin ();
 
       TAO_AV_AcceptorSetItor end =
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 4fea5b533cf..d717322ee5d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -87,15 +87,15 @@ public:
   };
 
   /// Default constructor.
-  TAO_AV_Core (void);
+  TAO_AV_Core ();
 
   /// Destructor.
-  ~TAO_AV_Core (void);
+  ~TAO_AV_Core ();
 
   int init (CORBA::ORB_ptr orb,
             PortableServer::POA_ptr poa);
-  int run (void);
-  int stop_run (void);
+  int run ();
+  int stop_run ();
   int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
                           TAO_AV_FlowSpecSet &flow_spec_set,
                           EndPoint direction,
@@ -104,33 +104,33 @@ public:
                           TAO_AV_FlowSpecSet &forward_flow_spec_set,
                           TAO_AV_FlowSpecSet &reverse_flow_spec_set,
                           EndPoint direction);
-  int init_transport_factories (void);
-  int init_flow_protocol_factories (void);
+  int init_transport_factories ();
+  int init_flow_protocol_factories ();
 
-  int load_default_transport_factories (void);
-  int load_default_flow_protocol_factories (void);
+  int load_default_transport_factories ();
+  int load_default_flow_protocol_factories ();
 
   /// = Get the acceptor registry
   TAO_AV_Acceptor *get_acceptor (const char *flowname);
   TAO_AV_Connector *get_connector (const char *flowname);
   int remove_acceptor (const char *flowname);
   int remove_connector (const char *flowname);
-  TAO_AV_Connector_Registry *connector_registry (void);
+  TAO_AV_Connector_Registry *connector_registry ();
   TAO_FlowSpec_Entry *get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set,
                                            const char *flowname);
-  TAO_AV_Acceptor_Registry  *acceptor_registry  (void);
+  TAO_AV_Acceptor_Registry  *acceptor_registry  ();
 
   // = Get the protocol factories
   /// = Set/get the <ACE_Reactor>.
   TAO_AV_Flow_Protocol_Factory *get_flow_protocol_factory(const char *flow_protocol);
   TAO_AV_Transport_Factory *get_transport_factory(const char *transport_protocol);
-  TAO_AV_Flow_ProtocolFactorySet *flow_protocol_factories (void);
-  TAO_AV_TransportFactorySet *transport_factories (void);
+  TAO_AV_Flow_ProtocolFactorySet *flow_protocol_factories ();
+  TAO_AV_TransportFactorySet *transport_factories ();
   void reactor (ACE_Reactor *r);
-  ACE_Reactor *reactor (void);
-  CORBA::ORB_ptr orb (void);
+  ACE_Reactor *reactor ();
+  CORBA::ORB_ptr orb ();
   void orb (CORBA::ORB_ptr orb_);
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
   void poa (PortableServer::POA_ptr poa_);
 
   static int deactivate_servant (PortableServer::Servant servant);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index ed0f32ee71a..ce63260d5ae 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -259,7 +259,6 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
   stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() );
   vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
   return 0;
-
 }
 
 // Gets the stream endpoint object reference from the naming service
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 77caf7696f1..aad83b4c600 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -39,10 +39,10 @@ class TAO_AV_Export TAO_AV_Endpoint_Strategy
 {
 public:
   /// Constructor
-  TAO_AV_Endpoint_Strategy (void);
+  TAO_AV_Endpoint_Strategy ();
 
   /// Destructor
-  virtual ~TAO_AV_Endpoint_Strategy (void);
+  virtual ~TAO_AV_Endpoint_Strategy ();
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
@@ -78,26 +78,26 @@ public:
   TAO_AV_Endpoint_Process_Strategy (ACE_Process_Options *process_options);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Process_Strategy (void);
+  virtual ~TAO_AV_Endpoint_Process_Strategy ();
 
   /// creates a new child process, and waits on a semaphore
   /// until the child process has finished creating the endpoints
-  virtual int activate (void);
+  virtual int activate ();
 
 protected:
   /// Bind to the naming service
-  virtual int bind_to_naming_service (void);
+  virtual int bind_to_naming_service ();
 
   /**
    * Get the object reference for the newly created stream
    * endpoint (which will be in the child process)
    * Subclasses will define the functionality for this
    */
-  virtual int get_stream_endpoint (void) = 0;
+  virtual int get_stream_endpoint () = 0;
 
   /// Get the Vdev object reference for the newly created
   /// endpoint
-  virtual int get_vdev (void);
+  virtual int get_vdev ();
 
   /// Naming context
   CosNaming::NamingContext_var naming_context_;
@@ -127,7 +127,7 @@ public:
   TAO_AV_Endpoint_Process_Strategy_A (ACE_Process_Options *process_options);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Process_Strategy_A (void);
+  virtual ~TAO_AV_Endpoint_Process_Strategy_A ();
 
 protected:
   /// Creates an "A" type stream endpoint, and a vdev
@@ -135,7 +135,7 @@ protected:
                         AVStreams::VDev_ptr &vdev);
 
   /// Gets the "A" type stream endpoint from the child process
-  virtual int get_stream_endpoint (void);
+  virtual int get_stream_endpoint ();
 };
 
 // ----------------------------------------------------------------------
@@ -152,7 +152,7 @@ public:
   TAO_AV_Endpoint_Process_Strategy_B (ACE_Process_Options *process_options);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Process_Strategy_B (void);
+  virtual ~TAO_AV_Endpoint_Process_Strategy_B ();
 
 protected:
   /// Creates a "B" type stream endpoint, and a vdev
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index bbe3cfc9108..f1679c2ad4f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -17,14 +17,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // ----------------------------------------------------------------------
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy ()
    :  stream_endpoint_a_servant_(0), stream_endpoint_b_servant_(0), vdev_servant_(0),
       media_ctrl_servant_(0)
 {
 }
 
 template <class T_StreamEndpoint, class T_VDev, class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy ()
 {
   // Do not allow exceptions to escape from the destructor
   try
@@ -58,7 +58,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_
 // Create, activate the objects with the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate ()
 {
   try
     {
@@ -84,7 +84,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant)
 {
-
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant);
 
@@ -101,7 +100,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate VDev into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev ()
 {
   try
     {
@@ -132,7 +131,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate the media_controller
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl ()
 {
   try
     {
@@ -150,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)
     {
@@ -203,14 +201,14 @@ TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_m
 
 //Constructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_A (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_A ()
 {
 }
 
 
 // Destructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_A (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_A ()
 {
 }
 
@@ -239,17 +237,15 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
   stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() );
   vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
   return 0;
-
 }
 
 // Put the stream_endpoint into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint ()
 {
   try
     {
-
       // Use the bridge method
       if (this->make_stream_endpoint (this->stream_endpoint_a_servant_) == -1)
         return -1;
@@ -273,13 +269,13 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 
 // Constructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_B (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_B ()
 {
 }
 
 // Destructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_B (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy_B ()
 {
 }
 
@@ -296,7 +292,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint ()
 {
   try
     {
@@ -397,7 +393,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
 TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant)
 {
-
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant);
 
@@ -458,7 +453,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 // Bind to the namingservice
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (void)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service ()
 {
   try
     {
@@ -484,7 +479,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
 // register the vdev with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (void)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev ()
 {
   try
     {
@@ -592,7 +587,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 // register the stream_endpoint with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (void)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint ()
 {
   CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
   try
@@ -657,7 +652,7 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_mediactrl (T_M
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
+TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names ()
 {
   // Remove the names from the naming service
   try
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index a16bcc74b66..e4e93dd5ba5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -35,16 +35,16 @@ protected:
   virtual ~TAO_AV_Endpoint_Reactive_Strategy ();
 
   /// creates and activates the streamendpoint, vdev, and mediacontrol
-  virtual int activate (void);
+  virtual int activate ();
 
   /// activates the stream_endpoint with the POA
-  virtual int activate_stream_endpoint (void) = 0;
+  virtual int activate_stream_endpoint () = 0;
 
   /// activates the vdev with the POA
-  virtual int activate_vdev (void);
+  virtual int activate_vdev ();
 
   /// activates the media controller with the POA
-  virtual int activate_mediactrl (void);
+  virtual int activate_mediactrl ();
 
   /// Bridge method to create a vdev, a la Acceptor. Applications
   /// can override this
@@ -86,17 +86,17 @@ class TAO_AV_Endpoint_Reactive_Strategy_A
   : public TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev , T_MediaCtrl>
 {
 public:
-  TAO_AV_Endpoint_Reactive_Strategy_A (void);
+  TAO_AV_Endpoint_Reactive_Strategy_A ();
 
   /// Constructor
   int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Reactive_Strategy_A (void);
+  virtual ~TAO_AV_Endpoint_Reactive_Strategy_A ();
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// an "A" type endpoint
-  virtual int activate_stream_endpoint (void);
+  virtual int activate_stream_endpoint ();
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
@@ -168,16 +168,16 @@ protected:
   char* activate_with_poa (PortableServer::Servant servant);
 
   /// Removes the vdev and streamendpoint names from the naming service.
-  int unbind_names (void);
+  int unbind_names ();
 
   /// Binds to the naming service
-  int bind_to_naming_service (void);
+  int bind_to_naming_service ();
 
   /// Registers vdev with the naming service
-  int register_vdev (void);
+  int register_vdev ();
 
   /// Registers stream_endpoint with the naming service
-  int register_stream_endpoint (void);
+  int register_stream_endpoint ();
 
   /// Releases the semaphore on which the parent is waiting on
   int release_semaphore ();
@@ -227,7 +227,6 @@ protected:
   CORBA::ORB_ptr orb_;
 
   PortableServer::POA_ptr poa_;
-
 };
 
 // ----------------------------------------------------------------------
@@ -241,10 +240,10 @@ class TAO_AV_Child_Process_A
 {
 public:
   /// Constructor.
-  TAO_AV_Child_Process_A (void);
+  TAO_AV_Child_Process_A ();
 
   /// Destructor.
-  virtual ~TAO_AV_Child_Process_A (void);
+  virtual ~TAO_AV_Child_Process_A ();
 };
 
 // ----------------------------------------------------------------------
@@ -259,10 +258,10 @@ class TAO_AV_Child_Process_B
 {
 public:
   /// Constructor.
-  TAO_AV_Child_Process_B (void);
+  TAO_AV_Child_Process_B ();
 
   /// Destructor.
-  virtual ~TAO_AV_Child_Process_B (void);
+  virtual ~TAO_AV_Child_Process_B ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index f0b511711d2..5654b7b8a07 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -3,12 +3,11 @@
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const iovec Fill_ACE_QoS::iov_ = {0,0};
 
-Fill_ACE_QoS::Fill_ACE_QoS (void)
+Fill_ACE_QoS::Fill_ACE_QoS ()
 {
   ACE_NEW (this->default_traffic_,
            ACE_Flow_Spec  (ACE_QOS_NOT_SPECIFIED,
@@ -24,7 +23,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void)
 }
 
 // destructor.
-Fill_ACE_QoS::~Fill_ACE_QoS (void)
+Fill_ACE_QoS::~Fill_ACE_QoS ()
 {}
 
 int
@@ -63,7 +62,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
 }
 
 Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
-Fill_ACE_QoS::map (void)
+Fill_ACE_QoS::map ()
 {
   return this->flow_spec_map_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
index 6e4165f5b43..90e6286b790 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
@@ -40,10 +40,10 @@ public:
 
   //Initialization and termination methods.
   /// constructor.
-  Fill_ACE_QoS (void);
+  Fill_ACE_QoS ();
 
   /// destructor.
-  ~Fill_ACE_QoS (void);
+  ~Fill_ACE_QoS ();
 
   /// To be used by receivers. Fills the receiver qos and sets the
   /// sender qos to NO_TRAFFIC.
@@ -62,7 +62,7 @@ public:
                        ACE_Flow_Spec *sender_flow_spec);
 
   /// Returns the hash map of flowspecs indexed by flowspec name.
-  FLOW_SPEC_HASH_MAP& map (void);
+  FLOW_SPEC_HASH_MAP& map ();
 
 private:
   // The Service Provider is currently set to NULL for all ACE_QoS.
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/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index d0ff485c6f4..2ce728f6324 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -79,7 +79,7 @@ public:
   };
 
   /// default constructor.
-  TAO_FlowSpec_Entry (void);
+  TAO_FlowSpec_Entry ();
 
   /// constructor to construct an entry from the arguments.
   TAO_FlowSpec_Entry (const char *flowname,
@@ -102,12 +102,12 @@ public:
   virtual int parse (const char* flowSpec_entry) = 0;
 
   /// virtual destructor.
-  virtual ~TAO_FlowSpec_Entry (void);
+  virtual ~TAO_FlowSpec_Entry ();
 
   /// accessor to the direction.
-  int direction (void);
+  int direction ();
 
-  virtual Role role (void) = 0;
+  virtual Role role () = 0;
   void role (Role role);
   /// accessor to string version of direction .
   const char * direction_str () const;
@@ -119,9 +119,9 @@ public:
   void flow_protocol_str (const char *flow_protocol_str);
 
   /// accessor to address of the carrier protocol.
-  //ACE_Addr *fwd_address (void);
-  ACE_Addr *address (void);
-  ACE_Addr *control_address (void);
+  //ACE_Addr *fwd_address ();
+  ACE_Addr *address ();
+  ACE_Addr *control_address ();
   void address (ACE_Addr *address, bool cleanup = false);
   void control_address (ACE_Addr *address);
 
@@ -130,7 +130,7 @@ public:
   //  const char * peer_address_str () const;
 
   /// accessor to carrier protocol i.e TCP,UDP,RTP/UDP.
-  TAO_AV_Core::Protocol carrier_protocol (void);
+  TAO_AV_Core::Protocol carrier_protocol ();
 
   /// accessor to string version of carrier protocol.
   const char * carrier_protocol_str () const;
@@ -142,41 +142,41 @@ public:
   const char *flowname () const;
 
   /// converts the entry to a string.
-  virtual const char *entry_to_string (void) = 0;
+  virtual const char *entry_to_string () = 0;
 
   int set_peer_addr (ACE_Addr *peer_addr);
-  ACE_Addr *get_peer_addr (void);
+  ACE_Addr *get_peer_addr ();
   int set_peer_control_addr (ACE_Addr *peer_control_addr);
-  ACE_Addr *get_peer_control_addr (void);
+  ACE_Addr *get_peer_control_addr ();
 
   int set_local_sec_addr (char** local_sec_addr, int size);
-  char** get_local_sec_addr (void);
-  int num_local_sec_addrs (void);
+  char** get_local_sec_addr ();
+  int num_local_sec_addrs ();
 
   int set_peer_sec_addr (char** peer_sec_addr, int size);
-  char** get_peer_sec_addr (void);
-  int num_peer_sec_addrs (void);
+  char** get_peer_sec_addr ();
+  int num_peer_sec_addrs ();
 
   int set_local_addr (ACE_Addr *local_addr);
-  ACE_Addr *get_local_addr (void);
-  char *get_local_addr_str (void);
+  ACE_Addr *get_local_addr ();
+  char *get_local_addr_str ();
   int set_local_control_addr (ACE_Addr *local_control_addr);
-  ACE_Addr *get_local_control_addr (void);
-  char *get_local_control_addr_str (void);
+  ACE_Addr *get_local_control_addr ();
+  char *get_local_control_addr_str ();
 
-  TAO_AV_Transport *transport (void);
+  TAO_AV_Transport *transport ();
   void transport (TAO_AV_Transport *transport);
-  TAO_AV_Transport *control_transport (void);
+  TAO_AV_Transport *control_transport ();
   void control_transport (TAO_AV_Transport *control_transport);
 
-  TAO_AV_Flow_Handler* handler (void);
+  TAO_AV_Flow_Handler* handler ();
   void handler (TAO_AV_Flow_Handler *handler);
-  TAO_AV_Flow_Handler* control_handler (void);
+  TAO_AV_Flow_Handler* control_handler ();
   void control_handler (TAO_AV_Flow_Handler *control_handler);
 
-  TAO_AV_Protocol_Object* protocol_object (void);
+  TAO_AV_Protocol_Object* protocol_object ();
   void protocol_object (TAO_AV_Protocol_Object *object);
-  TAO_AV_Protocol_Object* control_protocol_object (void);
+  TAO_AV_Protocol_Object* control_protocol_object ();
   void control_protocol_object (TAO_AV_Protocol_Object *object);
 
   /// sets the address for this flow.
@@ -184,7 +184,7 @@ public:
                      TAO_AV_Core::Flow_Component flow_component);
 
   /// returns true for a multicast address.
-  int is_multicast (void);
+  int is_multicast ();
 
 protected:
   /// parses the flow protocol string with tokens separated by :
@@ -194,7 +194,7 @@ protected:
   int set_direction (const char *direction_string);
 
   /// sets the protocol_ enum from the carrier_protocol_ string.
-  int set_protocol (void);
+  int set_protocol ();
 
   /// Addr information for the carrier protocol.
   ACE_Addr *address_;
@@ -268,7 +268,7 @@ public:
                  TAO_AV_PEER_ADDR = 5};
 
   /// default constructor.
-  TAO_Forward_FlowSpec_Entry (void);
+  TAO_Forward_FlowSpec_Entry ();
 
   /// constructor to construct an entry from the arguments.
   TAO_Forward_FlowSpec_Entry (const char *flowname,
@@ -285,12 +285,12 @@ public:
                               const char *flow_protocol,
                               const char *address);
 
-  virtual ~TAO_Forward_FlowSpec_Entry (void);
+  virtual ~TAO_Forward_FlowSpec_Entry ();
 
   /// converts the entry to a string.
-  virtual const char *entry_to_string (void);
+  virtual const char *entry_to_string ();
 
-  virtual Role role (void);
+  virtual Role role ();
 
   /// construct the entry from a string specified by the flowSpec grammar.
   virtual int parse (const char* flowSpec_entry);
@@ -311,7 +311,7 @@ public:
                  TAO_AV_FORMAT = 4};
 
   // default constructor.
-  TAO_Reverse_FlowSpec_Entry (void);
+  TAO_Reverse_FlowSpec_Entry ();
 
   // constructor to construct an entry from the arguments.
   TAO_Reverse_FlowSpec_Entry (const char *flowname,
@@ -329,12 +329,12 @@ public:
                               const char *flow_protocol,
                               const char *address);
 
-  virtual ~TAO_Reverse_FlowSpec_Entry (void);
+  virtual ~TAO_Reverse_FlowSpec_Entry ();
 
   /// converts the entry to a string.
-  virtual const char *entry_to_string (void);
+  virtual const char *entry_to_string ();
 
-  virtual Role role (void);
+  virtual Role role ();
 
   /// construct the entry from a string specified by the flowSpec grammar.
   virtual int parse (const char* flowSpec_entry);
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
index 85c5e0b0e43..acd5d7a5ebb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
@@ -39,7 +39,7 @@ TAO_FlowSpec_Entry::parse_flow_protocol_string (const char *flow_string)
 
 ACE_INLINE
 int
-TAO_FlowSpec_Entry::direction (void)
+TAO_FlowSpec_Entry::direction ()
 {
   return this->direction_;
 }
@@ -67,7 +67,7 @@ TAO_FlowSpec_Entry::flow_protocol_str (const char *str)
 
 ACE_INLINE
 TAO_AV_Core::Protocol
-TAO_FlowSpec_Entry::carrier_protocol (void)
+TAO_FlowSpec_Entry::carrier_protocol ()
 {
   return this->protocol_;
 }
@@ -81,7 +81,7 @@ TAO_FlowSpec_Entry::carrier_protocol_str () const
 
 ACE_INLINE
 ACE_Addr *
-TAO_FlowSpec_Entry::address (void)
+TAO_FlowSpec_Entry::address ()
 {
   return this->address_;
 }
@@ -99,7 +99,7 @@ TAO_FlowSpec_Entry::address (ACE_Addr *addr, bool cleanup)
 
 ACE_INLINE
 ACE_Addr *
-TAO_FlowSpec_Entry::control_address (void)
+TAO_FlowSpec_Entry::control_address ()
 {
   return this->control_address_;
 }
@@ -150,7 +150,7 @@ TAO_FlowSpec_Entry::set_peer_addr (ACE_Addr *peer_addr)
 
 ACE_INLINE
 ACE_Addr *
-TAO_FlowSpec_Entry::get_peer_addr (void)
+TAO_FlowSpec_Entry::get_peer_addr ()
 {
   return this->peer_addr_;
 }
@@ -173,14 +173,14 @@ TAO_FlowSpec_Entry::set_local_control_addr (ACE_Addr *local_addr)
 
 ACE_INLINE
 ACE_Addr*
-TAO_FlowSpec_Entry::get_local_addr (void)
+TAO_FlowSpec_Entry::get_local_addr ()
 {
   return this->local_addr_;
 }
 
 ACE_INLINE
 ACE_Addr*
-TAO_FlowSpec_Entry::get_local_control_addr (void)
+TAO_FlowSpec_Entry::get_local_control_addr ()
 {
   return this->local_control_addr_;
 }
@@ -197,14 +197,14 @@ TAO_FlowSpec_Entry::set_local_sec_addr (char** local_sec_addr,
 
 ACE_INLINE
 char**
-TAO_FlowSpec_Entry::get_local_sec_addr (void)
+TAO_FlowSpec_Entry::get_local_sec_addr ()
 {
   return this->local_sec_addr_;
 }
 
 ACE_INLINE
 int
-TAO_FlowSpec_Entry::num_local_sec_addrs (void)
+TAO_FlowSpec_Entry::num_local_sec_addrs ()
 {
   return this->num_local_sec_addrs_;
 }
@@ -221,21 +221,21 @@ TAO_FlowSpec_Entry::set_peer_sec_addr (char** peer_sec_addr,
 
 ACE_INLINE
 char**
-TAO_FlowSpec_Entry::get_peer_sec_addr (void)
+TAO_FlowSpec_Entry::get_peer_sec_addr ()
 {
   return this->peer_sec_addr_;
 }
 
 ACE_INLINE
 int
-TAO_FlowSpec_Entry::num_peer_sec_addrs (void)
+TAO_FlowSpec_Entry::num_peer_sec_addrs ()
 {
   return this->num_peer_sec_addrs_;
 }
 
 ACE_INLINE
 TAO_AV_Transport*
-TAO_FlowSpec_Entry::transport (void)
+TAO_FlowSpec_Entry::transport ()
 {
   return this->transport_;
 }
@@ -249,7 +249,7 @@ TAO_FlowSpec_Entry::transport (TAO_AV_Transport *transport)
 
 ACE_INLINE
 TAO_AV_Transport*
-TAO_FlowSpec_Entry::control_transport (void)
+TAO_FlowSpec_Entry::control_transport ()
 {
   return this->control_transport_;
 }
@@ -263,14 +263,14 @@ TAO_FlowSpec_Entry::control_transport (TAO_AV_Transport *control_transport)
 
 ACE_INLINE
 TAO_AV_Flow_Handler *
-TAO_FlowSpec_Entry::handler (void)
+TAO_FlowSpec_Entry::handler ()
 {
   return this->handler_;
 }
 
 ACE_INLINE
 TAO_AV_Flow_Handler *
-TAO_FlowSpec_Entry::control_handler (void)
+TAO_FlowSpec_Entry::control_handler ()
 {
   return this->control_handler_;
 }
@@ -305,7 +305,7 @@ TAO_FlowSpec_Entry::control_handler (TAO_AV_Flow_Handler *handler)
 
 ACE_INLINE
 TAO_AV_Protocol_Object*
-TAO_FlowSpec_Entry::protocol_object (void)
+TAO_FlowSpec_Entry::protocol_object ()
 {
   return this->protocol_object_;
 }
@@ -319,7 +319,7 @@ TAO_FlowSpec_Entry::protocol_object (TAO_AV_Protocol_Object *object)
 
 ACE_INLINE
 TAO_AV_Protocol_Object*
-TAO_FlowSpec_Entry::control_protocol_object (void)
+TAO_FlowSpec_Entry::control_protocol_object ()
 {
   return this->control_protocol_object_;
 }
@@ -333,7 +333,7 @@ TAO_FlowSpec_Entry::control_protocol_object (TAO_AV_Protocol_Object *object)
 
 ACE_INLINE
 int
-TAO_FlowSpec_Entry::is_multicast (void)
+TAO_FlowSpec_Entry::is_multicast ()
 {
   return this->is_multicast_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index b1feb2a1270..127bbe6fccc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // default constructor
 template <class T_Producer, class T_Consumer>
-TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (void)
+TAO_FDev<T_Producer, T_Consumer>::TAO_FDev ()
 {
 }
 
@@ -35,14 +35,14 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
 }
 
 template <class T_Producer, class T_Consumer>
-TAO_FDev<T_Producer, T_Consumer>::~TAO_FDev (void)
+TAO_FDev<T_Producer, T_Consumer>::~TAO_FDev ()
 {
   //no-op
 }
 
 template <class T_Producer, class T_Consumer>
 const char *
-TAO_FDev<T_Producer, T_Consumer>::flowname (void)
+TAO_FDev<T_Producer, T_Consumer>::flowname ()
 {
   return this->flowname_.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 8848fffcf47..57dfc5fc1e4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -167,7 +167,6 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf,
 //   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr));
 
   return this->handler_->get_mcast_socket ()->send (buf, len);
-
 }
 
 ssize_t
@@ -178,7 +177,6 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov,
   return this->handler_->get_mcast_socket ()->send (iov,
                                                     iovcnt,
                                                     0);
-
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h
index 0639f3cb4cb..624b37f9a8a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -30,23 +30,22 @@ class TAO_AV_UDP_MCast_Flow_Handler;
 class TAO_AV_UDP_MCast_Transport
   :public TAO_AV_Transport
 {
-
 public:
-  TAO_AV_UDP_MCast_Transport (void);
+  TAO_AV_UDP_MCast_Transport ();
 
   TAO_AV_UDP_MCast_Transport (TAO_AV_UDP_MCast_Flow_Handler *handler);
 
-  virtual ~TAO_AV_UDP_MCast_Transport (void);
+  virtual ~TAO_AV_UDP_MCast_Transport ();
 
   virtual int open (ACE_Addr *address);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
   /// Write the complete Message_Block chain to the connection.
-  virtual ACE_Addr *get_peer_addr (void);
-  virtual ACE_Addr *get_local_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
+  virtual ACE_Addr *get_local_addr ();
   virtual ssize_t send (const ACE_Message_Block *mblk,
                         ACE_Time_Value *s = 0);
 
@@ -90,13 +89,13 @@ class TAO_AV_UDP_MCast_Flow_Handler
    public virtual ACE_Event_Handler
 {
 public:
-  TAO_AV_UDP_MCast_Flow_Handler (void);
-  virtual ~TAO_AV_UDP_MCast_Flow_Handler (void);
+  TAO_AV_UDP_MCast_Flow_Handler ();
+  virtual ~TAO_AV_UDP_MCast_Flow_Handler ();
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
   ACE_SOCK_Dgram_Mcast *get_mcast_socket () const;
-  virtual ACE_Event_Handler* event_handler (void){ return this; }
+  virtual ACE_Event_Handler* event_handler () { return this; }
   void set_peer_addr (ACE_INET_Addr *peer_addr);
 protected:
   ACE_INET_Addr *peer_addr_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index b05af920247..b32d61a2539 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -118,7 +118,7 @@ TAO_AV_Callback::get_policies ()
 }
 
 // TAO_AV_Transport*
-// TAO_AV_Callback::transport (void)
+// TAO_AV_Callback::transport ()
 // {
 //   return this->transport_;
 // }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index f1b1793347a..75f26d55e1b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -53,7 +53,7 @@ class TAO_AV_Export TAO_AV_Policy
 {
 public:
   TAO_AV_Policy (CORBA::ULong type);
-  CORBA::ULong type (void);
+  CORBA::ULong type ();
 protected:
   CORBA::ULong type_;
 };
@@ -62,7 +62,7 @@ class  TAO_AV_Export TAO_AV_SSRC_Policy : public TAO_AV_Policy
 {
 public:
   TAO_AV_SSRC_Policy (CORBA::ULong ssrc = 0);
-  CORBA::ULong value (void);
+  CORBA::ULong value ();
   void value (CORBA::ULong ssrc);
 protected:
   CORBA::ULong ssrc_;
@@ -72,7 +72,7 @@ class  TAO_AV_Export TAO_AV_Payload_Type_Policy : public TAO_AV_Policy
 {
 public:
   TAO_AV_Payload_Type_Policy (int payload_type = -1);
-  int value (void);
+  int value ();
   void value (int pt);
 protected:
   int payload_type_;
@@ -81,8 +81,8 @@ protected:
 class TAO_AV_Export TAO_AV_RTCP_Sdes_Policy : public TAO_AV_Policy
 {
 public:
-  TAO_AV_RTCP_Sdes_Policy (void);
-  TAO_AV_RTCP_Sdes &value (void);
+  TAO_AV_RTCP_Sdes_Policy ();
+  TAO_AV_RTCP_Sdes &value ();
   void value (const TAO_AV_RTCP_Sdes& sdes_val);
 protected:
   TAO_AV_RTCP_Sdes sdes_;
@@ -91,8 +91,8 @@ protected:
 class TAO_AV_Export TAO_AV_SFP_Credit_Policy : public TAO_AV_Policy
 {
 public:
-  TAO_AV_SFP_Credit_Policy (void);
-  int value (void);
+  TAO_AV_SFP_Credit_Policy ();
+  int value ();
   void value (int val);
 protected:
   int value_;
@@ -113,23 +113,23 @@ class TAO_AV_Flow_Handler;
 class TAO_AV_Export TAO_AV_Callback
 {
 public:
-  TAO_AV_Callback (void);
-  virtual ~TAO_AV_Callback (void);
+  TAO_AV_Callback ();
+  virtual ~TAO_AV_Callback ();
 
   /// Called for opening the callback.
   int open (TAO_AV_Protocol_Object *object,
             TAO_AV_Flow_Handler *handler);
 
   /// Called during Streamctrl->start.
-  virtual int handle_start (void);
+  virtual int handle_start ();
 
   /// Called during Streamctrl->stop.
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
 
   /// Called during timeout for Flow Producers.
   virtual int handle_timeout (void *arg);
 
-  virtual int schedule_timer (void);
+  virtual int schedule_timer ();
 
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
@@ -142,7 +142,7 @@ public:
                                      const ACE_Addr &address = ACE_Addr::sap_any);
 
   /// Called during Streamctrl->destroy i.e tear_down  of the stream
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
 
   /**
    * Called to get the timeout. If tv is 0 then the framework stop
@@ -153,10 +153,10 @@ public:
                             void *&arg);
 
   /// Accessor to protocol object.
-  TAO_AV_Protocol_Object *protocol_object (void);
+  TAO_AV_Protocol_Object *protocol_object ();
 
   /// get the policies for the protocol object.
-  virtual TAO_AV_PolicyList get_policies (void);
+  virtual TAO_AV_PolicyList get_policies ();
 protected:
   TAO_AV_Protocol_Object *protocol_object_;
   TAO_AV_Flow_Handler *handler_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.inl b/TAO/orbsvcs/orbsvcs/AV/Policy.inl
index 54793355891..2f8157e7c03 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //--------------------------------------------------
 
 ACE_INLINE CORBA::ULong
-TAO_AV_Policy::type (void)
+TAO_AV_Policy::type ()
 {
   return this->type_;
 }
@@ -16,7 +16,7 @@ TAO_AV_Policy::type (void)
 //--------------------------------------------------
 
 ACE_INLINE CORBA::ULong
-TAO_AV_SSRC_Policy::value (void)
+TAO_AV_SSRC_Policy::value ()
 {
   return this->ssrc_;
 }
@@ -38,7 +38,7 @@ TAO_AV_Payload_Type_Policy::value (int pt)
 }
 
 ACE_INLINE int
-TAO_AV_Payload_Type_Policy::value (void)
+TAO_AV_Payload_Type_Policy::value ()
 {
   return this->payload_type_;
 }
@@ -46,7 +46,7 @@ TAO_AV_Payload_Type_Policy::value (void)
 
 // TAO_AV_RTCP_Sdes_Policy
 ACE_INLINE TAO_AV_RTCP_Sdes &
-TAO_AV_RTCP_Sdes_Policy::value (void)
+TAO_AV_RTCP_Sdes_Policy::value ()
 {
   return this->sdes_;
 }
@@ -70,7 +70,7 @@ TAO_AV_SFP_Credit_Policy::value (int credit)
 
 ACE_INLINE
 int
-TAO_AV_SFP_Credit_Policy::value (void)
+TAO_AV_SFP_Credit_Policy::value ()
 {
   return this->value_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
index e672e21cc4f..5ae2158e849 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
@@ -27,19 +27,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_AV_Export TAO_AV_Protocol_Object
 {
 public:
-  TAO_AV_Protocol_Object (void);
+  TAO_AV_Protocol_Object ();
 
   /// constructor.
   TAO_AV_Protocol_Object (TAO_AV_Callback *callback,
                           TAO_AV_Transport *transport);
 
   /// Destructor
-  virtual ~TAO_AV_Protocol_Object (void);
+  virtual ~TAO_AV_Protocol_Object ();
 
   virtual int open (TAO_AV_Callback *callback,
                     TAO_AV_Transport *transport);
 
-  virtual int handle_input (void) = 0;
+  virtual int handle_input () = 0;
 
   /// Called on a control object.
   virtual int handle_control_input (ACE_Message_Block *control_frame,
@@ -47,11 +47,11 @@ public:
 
   /// set/get policies.
   virtual int set_policies (const TAO_AV_PolicyList &policy_list);
-  virtual TAO_AV_PolicyList get_policies (void);
+  virtual TAO_AV_PolicyList get_policies ();
 
   /// start/stop the flow.
-  virtual int start (void);
-  virtual int stop (void);
+  virtual int start ();
+  virtual int stop ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -67,8 +67,8 @@ public:
 
   /// end the stream.
   virtual void control_object (TAO_AV_Protocol_Object *object);
-  virtual int destroy (void) = 0;
-  TAO_AV_Transport *transport (void);
+  virtual int destroy () = 0;
+  TAO_AV_Transport *transport ();
 protected:
   TAO_AV_Transport *transport_;
   TAO_AV_PolicyList policy_list_;
@@ -83,15 +83,15 @@ class TAO_AV_Export TAO_AV_Flow_Protocol_Factory : public ACE_Service_Object
 {
 public:
   /// Initialization hook.
-  TAO_AV_Flow_Protocol_Factory (void);
-  virtual ~TAO_AV_Flow_Protocol_Factory (void);
+  TAO_AV_Flow_Protocol_Factory ();
+  virtual ~TAO_AV_Flow_Protocol_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
                                                         TAO_Base_StreamEndPoint *endpoint,
                                                         TAO_AV_Flow_Handler *handler,
                                                         TAO_AV_Transport *transport);
-  virtual const char *control_flow_factory (void);
+  virtual const char *control_flow_factory ();
   int ref_count;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 4d3a2c5dc31..cddbdbc3725 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -37,12 +37,11 @@ FillQoSParams (ACE_QoS_Params &qos_params,
   return 0;
 }
 
-TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper (void)
+TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper ()
 {
-
 }
 
-TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void)
+TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper ()
 {
 }
 
@@ -81,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 ();
@@ -180,22 +178,21 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio
                       -1);
 
   return 0;
-
 }
 
-TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void)
+TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler ()
 {
   ACE_NEW (this->transport_,
            TAO_AV_UDP_QoS_Transport (this));
 }
 
-TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler (void)
+TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler ()
 {
   delete this->transport_;
 }
 
 TAO_AV_Transport *
-TAO_AV_UDP_QoS_Flow_Handler::transport (void)
+TAO_AV_UDP_QoS_Flow_Handler::transport ()
 {
   return this->transport_;
 }
@@ -319,7 +316,6 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
 int
 TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 {
-
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
                 "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
@@ -487,7 +483,6 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
 int
 TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
 {
-
   if (TAO_debug_level > 0)
     {
       ACE_TCHAR buf [BUFSIZ];
@@ -510,7 +505,6 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
 
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
     {
-
       TAO_AV_UDP_QoS_Session_Helper helper;
 
       this->qos_session_ = helper.open_qos_session (this,
@@ -557,7 +551,7 @@ TAO_AV_UDP_QoS_Flow_Handler::get_handle () const
 // TAO_AV_UDP_Transport
 //------------------------------------------------------------
 
-TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (void)
+TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport ()
   :handler_ (0)
 {
 }
@@ -568,7 +562,7 @@ TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler
 {
 }
 
-TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport (void)
+TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport ()
 {
 }
 
@@ -586,19 +580,19 @@ TAO_AV_UDP_QoS_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_UDP_QoS_Transport::close (void)
+TAO_AV_UDP_QoS_Transport::close ()
 {
   return 0;
 }
 
 int
-TAO_AV_UDP_QoS_Transport::mtu (void)
+TAO_AV_UDP_QoS_Transport::mtu ()
 {
   return ACE_MAX_DGRAM_SIZE;
 }
 
 ACE_Addr*
-TAO_AV_UDP_QoS_Transport::get_peer_addr (void)
+TAO_AV_UDP_QoS_Transport::get_peer_addr ()
 {
   return &this->peer_addr_;
 }
@@ -778,11 +772,11 @@ TAO_AV_UDP_QoS_Transport::recv (iovec *iov,
 // TAO_AV_UDP_Acceptor
 //------------------------------------------------------------
 
-TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor (void)
+TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor ()
 {
 }
 
-TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor (void)
+TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor ()
 {
 }
 
@@ -920,7 +914,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
     {
-
       TAO_AV_UDP_QoS_Session_Helper helper;
 
       int result = handler->get_socket ()->open (*inet_addr,
@@ -983,7 +976,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 
       if (qos_available == 0)
         {
-
           ACE_Flow_Spec *ace_flow_spec = 0;
           ACE_NEW_RETURN (ace_flow_spec,
                           ACE_Flow_Spec,
@@ -1002,7 +994,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
     }
   else
     {
-
       int result = handler->get_socket ()->open (*inet_addr,
                                                  qos_params,
                                                  AF_INET,
@@ -1066,11 +1057,10 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
   this->entry_->handler (flow_handler);
 
   return 0;
-
 }
 
 int
-TAO_AV_UDP_QoS_Acceptor::close (void)
+TAO_AV_UDP_QoS_Acceptor::close ()
 {
   return 0;
 }
@@ -1078,11 +1068,11 @@ TAO_AV_UDP_QoS_Acceptor::close (void)
 //------------------------------------------------------------
 // TAO_AV_UDP_Connector
 //------------------------------------------------------------
-TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector (void)
+TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector ()
 {
 }
 
-TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector (void)
+TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector ()
 {
 }
 
@@ -1226,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
     {
@@ -1271,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_);
@@ -1285,7 +1273,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
                                                             qos);
   if (qos_available == 0)
     {
-
       ACE_Flow_Spec* ace_flow_spec;
       ACE_NEW_RETURN (ace_flow_spec,
                       ACE_Flow_Spec,
@@ -1382,7 +1369,7 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han
 }
 
 int
-TAO_AV_UDP_QoS_Connector::close (void)
+TAO_AV_UDP_QoS_Connector::close ()
 {
   return 0;
 }
@@ -1391,14 +1378,14 @@ TAO_AV_UDP_QoS_Connector::close (void)
 // TAO_AV_UDP_Protocol_Factory
 //------------------------------------------------------------
 
-TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void)
+TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
                 "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n"));
 }
 
-TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void)
+TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory ()
 {
 }
 
@@ -1415,7 +1402,7 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string)
 }
 
 TAO_AV_Acceptor*
-TAO_AV_UDP_QoS_Factory::make_acceptor (void)
+TAO_AV_UDP_QoS_Factory::make_acceptor ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -1429,7 +1416,7 @@ TAO_AV_UDP_QoS_Factory::make_acceptor (void)
 }
 
 TAO_AV_Connector*
-TAO_AV_UDP_QoS_Factory::make_connector (void)
+TAO_AV_UDP_QoS_Factory::make_connector ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -1453,14 +1440,14 @@ TAO_AV_UDP_QoS_Factory::init (int /* argc */,
 //------------------------------------------------------------
 // TAO_AV_UDP_Flow_Factory
 //------------------------------------------------------------
-TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void)
+TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
                 "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n"));
 }
 
-TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void)
+TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index 2b2cd75f0d0..f8aabc16a90 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -30,13 +30,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
 {
 public:
-  TAO_AV_UDP_QoS_Factory (void);
-  virtual ~TAO_AV_UDP_QoS_Factory (void);
+  TAO_AV_UDP_QoS_Factory ();
+  virtual ~TAO_AV_UDP_QoS_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   /// Initialization hook.
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_UDP_QoS_Flow_Handler;
@@ -52,19 +52,19 @@ class TAO_AV_UDP_QoS_Transport
   :public TAO_AV_Transport
 {
 public:
-  TAO_AV_UDP_QoS_Transport (void);
+  TAO_AV_UDP_QoS_Transport ();
 
   TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler *handler);
 
-  virtual  ~TAO_AV_UDP_QoS_Transport (void);
+  virtual  ~TAO_AV_UDP_QoS_Transport ();
 
   virtual int open (ACE_Addr *addr);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   virtual int set_remote_address (const ACE_INET_Addr &address);
 
@@ -112,10 +112,10 @@ public:
   /**
    * Destructor
    */
-  TAO_AV_UDP_QoS_Flow_Handler (void);
-  ~TAO_AV_UDP_QoS_Flow_Handler (void);
+  TAO_AV_UDP_QoS_Flow_Handler ();
+  ~TAO_AV_UDP_QoS_Flow_Handler ();
   int open (ACE_Addr &address);
-  virtual TAO_AV_Transport *transport (void);
+  virtual TAO_AV_Transport *transport ();
   virtual int set_remote_address (ACE_Addr *address);
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
@@ -124,9 +124,9 @@ public:
   /// Handles a QoS event. Right now, just
   /// prints a message.
   virtual int handle_qos (ACE_HANDLE fd);
-  ACE_SOCK_Dgram_Mcast_QoS *get_socket (void);
-  virtual ACE_Event_Handler* event_handler (void){ return this; }
-  virtual ACE_QoS_Session* qos_session (void);
+  ACE_SOCK_Dgram_Mcast_QoS *get_socket ();
+  virtual ACE_Event_Handler* event_handler () { return this; }
+  virtual ACE_QoS_Session* qos_session ();
   virtual void qos_session (ACE_QoS_Session *qos_session);
 
   int translate (ACE_Flow_Spec *ace_flow_spec,
@@ -137,13 +137,13 @@ public:
   void negotiator (AVStreams::Negotiator_ptr);
 
   void endpoint (TAO_Base_StreamEndPoint *endpoint);
-  TAO_Base_StreamEndPoint* endpoint (void);
+  TAO_Base_StreamEndPoint* endpoint ();
 
   void flowspec_entry (TAO_FlowSpec_Entry *entry);
-  TAO_FlowSpec_Entry* flowspec_entry (void);
+  TAO_FlowSpec_Entry* flowspec_entry ();
 
   void av_core (TAO_AV_Core *avcore);
-  TAO_AV_Core* av_core (void);
+  TAO_AV_Core* av_core ();
 
 protected:
   TAO_AV_Core *av_core_;
@@ -159,8 +159,8 @@ class TAO_AV_UDP_QoS_Acceptor
   :public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_UDP_QoS_Acceptor (void);
-  virtual ~TAO_AV_UDP_QoS_Acceptor (void);
+  TAO_AV_UDP_QoS_Acceptor ();
+  virtual ~TAO_AV_UDP_QoS_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -177,7 +177,7 @@ public:
 
   virtual int open_i (ACE_INET_Addr *address);
 
-  virtual int close (void);
+  virtual int close ();
 
   virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler);
 
@@ -195,8 +195,8 @@ class TAO_AV_UDP_QoS_Connector
   :public TAO_AV_Connector
 {
 public:
-  TAO_AV_UDP_QoS_Connector (void);
-  ~TAO_AV_UDP_QoS_Connector (void);
+  TAO_AV_UDP_QoS_Connector ();
+  ~TAO_AV_UDP_QoS_Connector ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_AV_Flow_Protocol_Factory *factory);
@@ -206,7 +206,7 @@ public:
                        TAO_AV_Core::Flow_Component flow_comp =
                            TAO_AV_Core::TAO_AV_DATA);
   virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler);
-  virtual int close (void);
+  virtual int close ();
 
   int translate (CosPropertyService::Properties &qos_params,
                  ACE_Flow_Spec *ace_flow_spec);
@@ -226,10 +226,10 @@ protected:
 //   TAO_AV_UDP_Object (TAO_AV_Callback *callback,
 //                      TAO_AV_Transport *transport = 0);
 
-//   virtual ~TAO_AV_UDP_Object (void);
+//   virtual ~TAO_AV_UDP_Object ();
 //   // Dtor
 
-//   virtual int handle_input (void);
+//   virtual int handle_input ();
 
 //   virtual int send_frame (ACE_Message_Block *frame,
 //                           TAO_AV_frame_info *frame_info = 0);
@@ -239,7 +239,7 @@ protected:
 //                           int iovcnt,
 //                           TAO_AV_frame_info *frame_info = 0);
 
-//   virtual int destroy (void);
+//   virtual int destroy ();
 //   // end the stream.
 
 // private:
@@ -250,8 +250,8 @@ protected:
 class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory
 {
 public:
-  TAO_AV_UDP_QoS_Flow_Factory (void);
-  virtual ~TAO_AV_UDP_QoS_Flow_Factory (void);
+  TAO_AV_UDP_QoS_Flow_Factory ();
+  virtual ~TAO_AV_UDP_QoS_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   /// Initialization hook.
   virtual int match_protocol (const char *flow_string);
@@ -267,8 +267,8 @@ public:
 class TAO_AV_UDP_QoS_Session_Helper
 {
 public:
-  TAO_AV_UDP_QoS_Session_Helper (void);
-  ~TAO_AV_UDP_QoS_Session_Helper (void);
+  TAO_AV_UDP_QoS_Session_Helper ();
+  ~TAO_AV_UDP_QoS_Session_Helper ();
 
   /// Open a QoS Session with the specified address
   ACE_QoS_Session* open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *handler,
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
index 2961bdac0d5..eae0a699a6d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
@@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_SOCK_Dgram_Mcast_QoS *
-TAO_AV_UDP_QoS_Flow_Handler::get_socket (void)
+TAO_AV_UDP_QoS_Flow_Handler::get_socket ()
 {
   return &this->qos_sock_dgram_;
 }
@@ -22,7 +22,7 @@ TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address)
 }
 
 ACE_INLINE ACE_QoS_Session*
-TAO_AV_UDP_QoS_Flow_Handler::qos_session (void)
+TAO_AV_UDP_QoS_Flow_Handler::qos_session ()
 {
   return this->qos_session_;
 }
@@ -46,7 +46,7 @@ TAO_AV_UDP_QoS_Flow_Handler::endpoint (TAO_Base_StreamEndPoint *endpoint)
 }
 
 ACE_INLINE TAO_Base_StreamEndPoint *
-TAO_AV_UDP_QoS_Flow_Handler::endpoint (void)
+TAO_AV_UDP_QoS_Flow_Handler::endpoint ()
 {
   return this->endpoint_;
 }
@@ -58,7 +58,7 @@ TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry (TAO_FlowSpec_Entry *entry)
 }
 
 ACE_INLINE TAO_FlowSpec_Entry *
-TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry (void)
+TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry ()
 {
   return this->entry_;
 }
@@ -70,7 +70,7 @@ TAO_AV_UDP_QoS_Flow_Handler::av_core (TAO_AV_Core *avcore)
 }
 
 ACE_INLINE TAO_AV_Core *
-TAO_AV_UDP_QoS_Flow_Handler::av_core (void)
+TAO_AV_UDP_QoS_Flow_Handler::av_core ()
 {
   return this->av_core_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index feb571fe886..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)
@@ -330,7 +329,6 @@ TAO_AV_RTCP::rtcp_interval (int members,
 }
 
 
-
 // TAO_AV_RTCP_Flow_Factory
 TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory ()
 {
@@ -437,7 +435,6 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb,
 {
   rtcp_cb = &this->rtcp_cb_;
   this->client_cb_ = client_cb;
-
 }
 
 TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object ()
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 24d3b48a509..c9ed999f8a5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -114,8 +114,8 @@ class TAO_AV_Export TAO_AV_RTCP_Flow_Factory
   :public TAO_AV_Flow_Protocol_Factory
 {
 public:
-  TAO_AV_RTCP_Flow_Factory (void);
-  virtual ~TAO_AV_RTCP_Flow_Factory (void);
+  TAO_AV_RTCP_Flow_Factory ();
+  virtual ~TAO_AV_RTCP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
@@ -134,16 +134,16 @@ class TAO_AV_Export TAO_AV_RTCP_Callback : public TAO_AV_Callback
 {
 public:
   /// RTCP callback.
-  TAO_AV_RTCP_Callback (void);
+  TAO_AV_RTCP_Callback ();
 
   /// virtual destructor.
-  virtual ~TAO_AV_RTCP_Callback (void);
+  virtual ~TAO_AV_RTCP_Callback ();
 
   /// Called during Streamctrl->start.
-  virtual int handle_start (void);
+  virtual int handle_start ();
 
   /// Called during Streamctrl->stop.
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
 
   /// Called during timeout for Flow Producers.
   virtual int handle_timeout (void *arg);
@@ -159,7 +159,7 @@ public:
 
   /// Called during Streamctrl->destroy i.e tear_down  of the stream
   /// @@coryan:Call it handle_destroy or handle_close.
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
 
   /// Called to get the timeout. If tv is 0 then the framework stop
   /// calling this.
@@ -168,7 +168,7 @@ public:
 
   int send_report(int bye);
   void schedule (int ms);
-  TAO_AV_RTP_State *state (void);
+  TAO_AV_RTP_State *state ();
   void ts_offset (ACE_UINT32 offset);
 
 protected:
@@ -199,9 +199,9 @@ public:
                       TAO_AV_Transport *transport = 0);
 
   /// Destructor
-  virtual ~TAO_AV_RTCP_Object (void);
+  virtual ~TAO_AV_RTCP_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
   virtual int handle_control_input (ACE_Message_Block *frame,
                                     const ACE_Addr &peer_address);
   virtual int handle_control_output (ACE_Message_Block *frame);
@@ -210,8 +210,8 @@ public:
   virtual int set_policies (const TAO_AV_PolicyList &policy_list);
 
   /// start/stop the flow.
-  virtual int start (void);
-  virtual int stop (void);
+  virtual int start ();
+  virtual int stop ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -226,10 +226,10 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
   void ssrc (ACE_UINT32 ssrc) {this->ssrc_ = ssrc; }
-  ACE_UINT32 ssrc (void) { return this->ssrc_; }
+  ACE_UINT32 ssrc () { return this->ssrc_; }
 
   void ts_offset (ACE_UINT32 ts_offset);
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index c19c7fe86cd..fffb2dc60fb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -40,13 +40,13 @@ public:
                         const ACE_Addr *peer_addr);
 
   /// Takes statistics of incoming RTP traffic and creates a receiver report block.
-  RR_Block *getRRBlock(void);
+  RR_Block *getRRBlock();
 
   /// Returns the delay since last sender report.
-  ACE_UINT32 dlsr (void);
+  ACE_UINT32 dlsr ();
 
   /// Returns the last sender report timestamp.
-  ACE_UINT32 lsr (void);
+  ACE_UINT32 lsr ();
 
   /// Updates channel information with incoming sender report.
   int updateStatistics(RTCP_SR_Packet *sr);
@@ -55,14 +55,14 @@ public:
   int updateStatistics(RTCP_RR_Packet *rr);
 
   /// Returns 1 if data has been sent since the last report, 0 if not.
-  int sender (void) { return this->data_since_last_report_; }
+  int sender () { return this->data_since_last_report_; }
 
   /// Returns 1 if this is an active source, 0 if not.
-  int active (void) { return this->active_; }
+  int active () { return this->active_; }
 
 private:
   /// Don't want default constructor.
-  RTCP_Channel_In(void);
+  RTCP_Channel_In();
 
   /// Don't want copy constructor.
   RTCP_Channel_In(const RTCP_Channel_In &ch);
@@ -166,31 +166,31 @@ class RTCP_Channel_Out
 {
 public:
   /// Constructor.
-  RTCP_Channel_Out(void);
+  RTCP_Channel_Out();
 
   /// Destructor.
-  ~RTCP_Channel_Out(void);
+  ~RTCP_Channel_Out();
 
   /// Update the channel statistics each time an RTP packet is sent.
   void updateStatistics (RTP_Packet *pkt);
 
   /// Returns the timestamp of the last RTP packet sent.
-  ACE_UINT32 timestamp (void);
+  ACE_UINT32 timestamp ();
 
   /// Returns the number of packets sent.
-  ACE_UINT32 packets_sent (void);
+  ACE_UINT32 packets_sent ();
 
   /// Returns the number of octets sent.
-  ACE_UINT32 octets_sent (void);
+  ACE_UINT32 octets_sent ();
 
   /// Sets the canonical name of the source.
   void cname (const char *cname) { this->cname_ = cname; }
 
   /// Returns the canonical name of the source.
-  const char *cname (void) { return this->cname_.c_str(); }
+  const char *cname () { return this->cname_.c_str(); }
 
   /// Returns whether or not this source is active.
-  char active (void);
+  char active ();
 
 private:
   /// Holds the canonical name for this channel.
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 9423eef309a..f346476b939 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -66,7 +66,6 @@ RTCP_Packet::is_valid (char is_first)
     }
 
   return 1;
-
 }
 
 /*
@@ -143,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/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 4fe56cc5b30..e12627729da 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -43,7 +43,7 @@ class RTCP_Packet
 {
 public:
   /// Constructor for outgoing RTCP packets.
-  RTCP_Packet(void);
+  RTCP_Packet();
 
   /// Constructor for incoming RTCP packets.
   RTCP_Packet(char *buffer);
@@ -56,7 +56,7 @@ public:
 
   /// Returns the size of the packet.
   /// Defined in child class.
-  virtual unsigned int packet_size(void) = 0;
+  virtual unsigned int packet_size() = 0;
 
   /// Checks the validity of an RTCP packet.  RTCP packets can be sent
   /// together in a compound packet and is_first indicates the first packet
@@ -72,7 +72,7 @@ protected:
 
   /// Used to create the byte representation of the RTCP packet.
   /// Defined in child class.
-  virtual void build_packet(void) = 0;
+  virtual void build_packet() = 0;
 };
 
 /**
@@ -95,10 +95,10 @@ public:
                    int *len);
 
   /// Destructor.
-  virtual ~RTCP_BYE_Packet (void);
+  virtual ~RTCP_BYE_Packet ();
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size (void);
+  unsigned int packet_size ();
 
   /// Returns a pointer to a local list of synchronization source ids that are
   /// leaving the session.
@@ -106,10 +106,10 @@ public:
                   unsigned char &length);
 
   /// Returns the reason for leaving the session.
-  const char *reason (void);
+  const char *reason ();
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
 private:
   /// Used to create the byte representation of the RTCP packet.
@@ -180,20 +180,20 @@ public:
   RTCP_RR_Packet (ACE_UINT32 ssrc, RR_Block *blocks);
 
   /// Destructor.
-  virtual ~RTCP_RR_Packet (void);
+  virtual ~RTCP_RR_Packet ();
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size(void);
+  unsigned int packet_size();
 
   /// Returns the synchronization source id of the source sending this packet.
-  ACE_INT32 ssrc (void) { return this->ssrc_; }
+  ACE_INT32 ssrc () { return this->ssrc_; }
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
 private:
   /// Used to create the byte representation of the RTCP packet.
-  void build_packet(void);
+  void build_packet();
 
   /// The synchronization source id of the sender of this report.
   ACE_UINT32 ssrc_;
@@ -278,10 +278,10 @@ public:
   RTCP_SDES_Packet(char* buffer, int *len);
 
   /// Constructor for outgoing SDES packets.
-  RTCP_SDES_Packet(void);
+  RTCP_SDES_Packet();
 
   /// Destructor.
-  virtual ~RTCP_SDES_Packet(void);
+  virtual ~RTCP_SDES_Packet();
 
   /// This will add a standard item of type and length for the ssrc specified.
   /// When the first item for a ssrc is added, a chunk is created.  Subsequent
@@ -303,19 +303,19 @@ public:
                      const char *data);
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size(void);
+  unsigned int packet_size();
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
   /// This returns the synchronization source id for this packet.  This assumes
   /// that this source is only receiving messages from end systems (i.e. only
   /// one source id per SDES)
-  ACE_UINT32 ssrc (void) { return this->chunk_->ssrc_; }
+  ACE_UINT32 ssrc () { return this->chunk_->ssrc_; }
 
 private:
   /// Used to create the byte representation of the RTCP packet.
-  void build_packet(void);
+  void build_packet();
 
   /// Add a chunk to the packet.
   void add_chunk(ACE_UINT32 ssrc);
@@ -354,26 +354,26 @@ public:
                  RR_Block *rrBlocks);
 
   /// Destructor
-  virtual ~RTCP_SR_Packet(void);
+  virtual ~RTCP_SR_Packet();
 
   /// Returns the size of the packet in bytes.
-  unsigned int packet_size(void);
+  unsigned int packet_size();
 
   /// Returns the synchronization source id for the sender of this packet.
-  ACE_UINT32 ssrc (void) { return this->ssrc_; }
+  ACE_UINT32 ssrc () { return this->ssrc_; }
 
   /// Returns the most significant word of the NTP timestamp.
-  ACE_UINT32 ntp_ts_msw (void) { return this->ntp_ts_msw_; }
+  ACE_UINT32 ntp_ts_msw () { return this->ntp_ts_msw_; }
 
   /// Returns the least significant word of the NTP timestamp.
-  ACE_UINT32 ntp_ts_lsw (void) { return this->ntp_ts_lsw_; }
+  ACE_UINT32 ntp_ts_lsw () { return this->ntp_ts_lsw_; }
 
   /// Prints the contents of the packet.
-  void dump (void);
+  void dump ();
 
 private:
   /// Used to create the byte representation of the RTCP packet.
-  void build_packet(void);
+  void build_packet();
 
   /// The synchronization source id of the sender generating this report.
   ACE_UINT32 ssrc_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 633b870830e..04068aed0d7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -681,7 +681,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list)
               static_cast<TAO_AV_SSRC_Policy *> (policy);
             if (ssrc_policy == 0)
               ORBSVCS_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:SSRC policy not defined\n"),-1);
-            this->ssrc_ = ssrc_policy->value ();;
+            this->ssrc_ = ssrc_policy->value ();
           }
           break;
         default:
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index ea8d3821ac7..52355672fa4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -239,7 +239,6 @@ public:
     unsigned char ebit;
     ACE_UINT16 blkno;
   };
-
 };
 
 /**
@@ -268,50 +267,50 @@ public:
              ACE_UINT16 dataSize);
 
   /// Destructor
-  ~RTP_Packet(void);
+  ~RTP_Packet();
 
   /// Returns the size of the RTP packet in bytes.
-  ACE_UINT16 packet_size(void);
+  ACE_UINT16 packet_size();
 
   /// Returns the size of the payload in bytes.
-  ACE_UINT16 payload_size(void);
+  ACE_UINT16 payload_size();
 
   /// Populates the passed in frame_info.
   void get_frame_info (TAO_AV_frame_info *frame_info);
 
   /// Returns 1 if packet is valid and 0 if not.
-  int is_valid (void);
+  int is_valid ();
 
   /// Returns the RTP version of the packet.
-  unsigned int ver (void);
+  unsigned int ver ();
 
   /// Returns 1 if the padding bit is set, 0 if not.
-  unsigned int pad (void);
+  unsigned int pad ();
 
   /// Returns 1 if the header extension bit is set, 0 if not.
-  unsigned int ext (void);
+  unsigned int ext ();
 
   /// Returns the number of bytes in the header extension or 0 if no extension.
-  unsigned int ext_bytes (void);
+  unsigned int ext_bytes ();
 
   /// Returns the contributing source count.
   /// This should only be non-zero for mixers.
-  unsigned int cc  (void);
+  unsigned int cc  ();
 
   /// Returns 1 if the marker bit is set, 0 if not.
-  unsigned int mrk (void);
+  unsigned int mrk ();
 
   /// Returns the payload type of the packet.
-  unsigned int pt  (void);
+  unsigned int pt  ();
 
   /// Returns the sequence number of the packet.
-  ACE_UINT16   sn  (void);
+  ACE_UINT16   sn  ();
 
   /// Returns the timestamp of the packet.
-  ACE_UINT32   ts  (void);
+  ACE_UINT32   ts  ();
 
   /// Returns the synchronization source id of the packet.
-  ACE_UINT32  ssrc (void);
+  ACE_UINT32  ssrc ();
 
   /// Returns a pointer to the local contributing source list and its length.
   /// This should be empty except for mixers.
@@ -358,11 +357,11 @@ public:
   TAO_AV_RTP_Object (TAO_AV_Callback *callback,
                      TAO_AV_Transport *transport);
 
-  virtual ~TAO_AV_RTP_Object (void);
+  virtual ~TAO_AV_RTP_Object ();
 
-  virtual int start (void);
-  virtual int stop (void);
-  virtual int handle_input (void);
+  virtual int start ();
+  virtual int stop ();
+  virtual int handle_input ();
   virtual int send_frame (ACE_Message_Block *frame,
                           TAO_AV_frame_info *frame_info = 0);
 
@@ -373,7 +372,7 @@ public:
   virtual int send_frame (const char*buf,
                           size_t len);
 
-  virtual int destroy (void);
+  virtual int destroy ();
   virtual int set_policies (const TAO_AV_PolicyList &policy_list);
   virtual void control_object (TAO_AV_Protocol_Object *object);
 
@@ -391,7 +390,6 @@ protected:
 };
 
 
-
 /**
  * @class TAO_AV_RTP_Flow_Factory
  * @brief
@@ -400,15 +398,15 @@ class TAO_AV_Export TAO_AV_RTP_Flow_Factory : public TAO_AV_Flow_Protocol_Factor
 {
 public:
   /// Initialization hook.
-  TAO_AV_RTP_Flow_Factory (void);
-  virtual ~TAO_AV_RTP_Flow_Factory (void);
+  TAO_AV_RTP_Flow_Factory ();
+  virtual ~TAO_AV_RTP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
                                                         TAO_Base_StreamEndPoint *endpoint,
                                                         TAO_AV_Flow_Handler *handler,
                                                         TAO_AV_Transport *transport);
-  virtual const char*control_flow_factory (void);
+  virtual const char*control_flow_factory ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
index 374aa83731f..4aebea969d3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -35,14 +35,12 @@ class TAO_AV_Export TAO_AV_Resource_Factory
 : public ACE_Service_Object
 {
 public:
-
   /**
    * @name Service Configurator Hooks
    */
   //@{
   /// Dynamic linking hook
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index d70ef01bb09..1a7cc09f55c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_SCTP_SEQ_Transport
 //------------------------------------------------------------
 
-TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport (void)
+TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport ()
   :handler_ (0)
 {
 }
@@ -24,7 +24,7 @@ TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport (TAO_AV_SCTP_SEQ_Flow_Handl
 {
 }
 
-TAO_AV_SCTP_SEQ_Transport::~TAO_AV_SCTP_SEQ_Transport (void)
+TAO_AV_SCTP_SEQ_Transport::~TAO_AV_SCTP_SEQ_Transport ()
 {
 }
 
@@ -35,19 +35,19 @@ TAO_AV_SCTP_SEQ_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_SCTP_SEQ_Transport::close (void)
+TAO_AV_SCTP_SEQ_Transport::close ()
 {
   return 0;
 }
 
 int
-TAO_AV_SCTP_SEQ_Transport::mtu (void)
+TAO_AV_SCTP_SEQ_Transport::mtu ()
 {
   return 0;
 }
 
 ACE_Addr*
-TAO_AV_SCTP_SEQ_Transport::get_peer_addr (void)
+TAO_AV_SCTP_SEQ_Transport::get_peer_addr ()
 {
   return 0;
 }
@@ -221,11 +221,11 @@ TAO_AV_SCTP_SEQ_Base_Acceptor::make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&
 // TAO_AV_SCTP_SEQ_Acceptor
 //------------------------------------------------------------
 
-TAO_AV_SCTP_SEQ_Acceptor::TAO_AV_SCTP_SEQ_Acceptor (void)
+TAO_AV_SCTP_SEQ_Acceptor::TAO_AV_SCTP_SEQ_Acceptor ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Acceptor::~TAO_AV_SCTP_SEQ_Acceptor (void)
+TAO_AV_SCTP_SEQ_Acceptor::~TAO_AV_SCTP_SEQ_Acceptor ()
 {
 }
 
@@ -354,7 +354,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 
 
 int
-TAO_AV_SCTP_SEQ_Acceptor::close (void)
+TAO_AV_SCTP_SEQ_Acceptor::close ()
 {
   return 0;
 }
@@ -404,11 +404,11 @@ TAO_AV_SCTP_SEQ_Base_Connector::connector_connect (TAO_AV_SCTP_SEQ_Flow_Handler
 //------------------------------------------------------------
 // TAO_AV_SCTP_SEQ_Connector
 //------------------------------------------------------------
-TAO_AV_SCTP_SEQ_Connector::TAO_AV_SCTP_SEQ_Connector (void)
+TAO_AV_SCTP_SEQ_Connector::TAO_AV_SCTP_SEQ_Connector ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Connector::~TAO_AV_SCTP_SEQ_Connector (void)
+TAO_AV_SCTP_SEQ_Connector::~TAO_AV_SCTP_SEQ_Connector ()
 {
 }
 
@@ -566,7 +566,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry,
 }
 
 int
-TAO_AV_SCTP_SEQ_Connector::close (void)
+TAO_AV_SCTP_SEQ_Connector::close ()
 {
   return 0;
 }
@@ -576,11 +576,11 @@ TAO_AV_SCTP_SEQ_Connector::close (void)
 //------------------------------------------------------------
 
 
-TAO_AV_SCTP_SEQ_Factory::TAO_AV_SCTP_SEQ_Factory (void)
+TAO_AV_SCTP_SEQ_Factory::TAO_AV_SCTP_SEQ_Factory ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Factory::~TAO_AV_SCTP_SEQ_Factory (void)
+TAO_AV_SCTP_SEQ_Factory::~TAO_AV_SCTP_SEQ_Factory ()
 {
 }
 
@@ -594,7 +594,7 @@ TAO_AV_SCTP_SEQ_Factory::match_protocol (const char *protocol_string)
 }
 
 TAO_AV_Acceptor*
-TAO_AV_SCTP_SEQ_Factory::make_acceptor (void)
+TAO_AV_SCTP_SEQ_Factory::make_acceptor ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_acceptor\n"));
@@ -606,7 +606,7 @@ TAO_AV_SCTP_SEQ_Factory::make_acceptor (void)
 }
 
 TAO_AV_Connector*
-TAO_AV_SCTP_SEQ_Factory::make_connector (void)
+TAO_AV_SCTP_SEQ_Factory::make_connector ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_connector\n"));
@@ -621,7 +621,6 @@ TAO_AV_SCTP_SEQ_Factory::make_connector (void)
 int
 TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[])
 {
-
   return 0;
 }
 
@@ -630,7 +629,7 @@ TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[])
 //------------------------------------------------------------
 
 int
-TAO_AV_SCTP_SEQ_Object::handle_input (void)
+TAO_AV_SCTP_SEQ_Object::handle_input ()
 {
   int n = this->transport_->recv (this->frame_.rd_ptr (),
                                   this->frame_.size ());
@@ -676,12 +675,12 @@ TAO_AV_SCTP_SEQ_Object::TAO_AV_SCTP_SEQ_Object (TAO_AV_Callback *callback,
   this->frame_.size (BUFSIZ);
 }
 
-TAO_AV_SCTP_SEQ_Object::~TAO_AV_SCTP_SEQ_Object (void)
+TAO_AV_SCTP_SEQ_Object::~TAO_AV_SCTP_SEQ_Object ()
 {
   // No-op
 }
 int
-TAO_AV_SCTP_SEQ_Object::destroy (void)
+TAO_AV_SCTP_SEQ_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   delete this;
@@ -699,13 +698,13 @@ TAO_AV_SCTP_SEQ_Flow_Handler::TAO_AV_SCTP_SEQ_Flow_Handler (TAO_AV_Callback * /*
            TAO_AV_SCTP_SEQ_Transport (this));
 }
 
-TAO_AV_SCTP_SEQ_Flow_Handler::~TAO_AV_SCTP_SEQ_Flow_Handler (void)
+TAO_AV_SCTP_SEQ_Flow_Handler::~TAO_AV_SCTP_SEQ_Flow_Handler ()
 {
   delete this->transport_;
 }
 
 TAO_AV_Transport *
-TAO_AV_SCTP_SEQ_Flow_Handler::transport (void)
+TAO_AV_SCTP_SEQ_Flow_Handler::transport ()
 {
   return this->transport_;
 }
@@ -727,7 +726,6 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos)
   int dscp_flag=0;
   for(i=0; i < qos.QoSParams.length(); i++)
     {
-
       if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0)
         {
           qos.QoSParams[i].property_value >>= dscp;
@@ -849,11 +847,11 @@ TAO_AV_SCTP_SEQ_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
 //------------------------------------------------------------
 // TAO_AV_SCTP_SEQ_Flow_Factory
 //------------------------------------------------------------
-TAO_AV_SCTP_SEQ_Flow_Factory::TAO_AV_SCTP_SEQ_Flow_Factory (void)
+TAO_AV_SCTP_SEQ_Flow_Factory::TAO_AV_SCTP_SEQ_Flow_Factory ()
 {
 }
 
-TAO_AV_SCTP_SEQ_Flow_Factory::~TAO_AV_SCTP_SEQ_Flow_Factory (void)
+TAO_AV_SCTP_SEQ_Flow_Factory::~TAO_AV_SCTP_SEQ_Flow_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
index 17ca39012f5..bde2dbdf451 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
@@ -44,12 +44,12 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Factory : public TAO_AV_Transport_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_SCTP_SEQ_Factory (void);
-  virtual ~TAO_AV_SCTP_SEQ_Factory (void);
+  TAO_AV_SCTP_SEQ_Factory ();
+  virtual ~TAO_AV_SCTP_SEQ_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_SCTP_SEQ_Flow_Handler;
@@ -63,18 +63,18 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Transport
   :public TAO_AV_Transport
 {
 public:
-  TAO_AV_SCTP_SEQ_Transport (void);
+  TAO_AV_SCTP_SEQ_Transport ();
 
   TAO_AV_SCTP_SEQ_Transport (TAO_AV_SCTP_SEQ_Flow_Handler *handler);
 
-  virtual  ~TAO_AV_SCTP_SEQ_Transport (void);
+  virtual  ~TAO_AV_SCTP_SEQ_Transport ();
   virtual int open (ACE_Addr *addr);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (const ACE_Message_Block *mblk,
@@ -106,7 +106,7 @@ public:
                         int iovcnt,
                         ACE_Time_Value *s = 0);
 
-  TAO_AV_SCTP_SEQ_Flow_Handler *handler (void) { return this->handler_; }
+  TAO_AV_SCTP_SEQ_Flow_Handler *handler () { return this->handler_; }
 
 protected:
   TAO_AV_SCTP_SEQ_Flow_Handler *handler_;
@@ -123,12 +123,12 @@ class TAO_AV_SCTP_SEQ_Flow_Handler
 {
 public:
   TAO_AV_SCTP_SEQ_Flow_Handler (TAO_AV_Callback *callback = 0);
-  virtual ~TAO_AV_SCTP_SEQ_Flow_Handler (void);
-  virtual TAO_AV_Transport *transport (void);
+  virtual ~TAO_AV_SCTP_SEQ_Flow_Handler ();
+  virtual TAO_AV_Transport *transport ();
   virtual int open (void * = 0);
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
-  virtual ACE_Event_Handler* event_handler (void){ return this; }
+  virtual ACE_Event_Handler* event_handler () { return this; }
   /// Change the QoS
   virtual int change_qos (AVStreams::QoS);
 
@@ -163,8 +163,8 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Acceptor
    :public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_SCTP_SEQ_Acceptor (void);
-  virtual ~TAO_AV_SCTP_SEQ_Acceptor (void);
+  TAO_AV_SCTP_SEQ_Acceptor ();
+  virtual ~TAO_AV_SCTP_SEQ_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -179,7 +179,7 @@ public:
                             TAO_AV_Core::Flow_Component flow_comp =
                             TAO_AV_Core::TAO_AV_DATA);
 
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&handler);
 
 protected:
@@ -217,8 +217,8 @@ protected:
 class TAO_AV_SCTP_SEQ_Connector  : public TAO_AV_Connector
 {
 public:
-  TAO_AV_SCTP_SEQ_Connector (void);
-  virtual ~TAO_AV_SCTP_SEQ_Connector (void);
+  TAO_AV_SCTP_SEQ_Connector ();
+  virtual ~TAO_AV_SCTP_SEQ_Connector ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -228,7 +228,7 @@ public:
                        TAO_AV_Transport *&transport,
                        TAO_AV_Core::Flow_Component flow_comp =
                        TAO_AV_Core::TAO_AV_DATA);
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&handler);
 protected:
   TAO_AV_Core *av_core_;
@@ -249,9 +249,9 @@ public:
                      TAO_AV_Transport *transport = 0);
 
   /// Dtor
-  virtual ~TAO_AV_SCTP_SEQ_Object (void);
+  virtual ~TAO_AV_SCTP_SEQ_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -265,7 +265,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 private:
   /// Pre-allocated memory to receive the data...
@@ -280,8 +280,8 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Flow_Factory : public TAO_AV_Flow_Protocol_F
 {
 public:
   /// Initialization hook.
-  TAO_AV_SCTP_SEQ_Flow_Factory (void);
-  virtual ~TAO_AV_SCTP_SEQ_Flow_Factory (void);
+  TAO_AV_SCTP_SEQ_Flow_Factory ();
+  virtual ~TAO_AV_SCTP_SEQ_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index 8e0291e108d..b555f2e0a09 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -642,7 +642,6 @@ TAO_AV_TCP_Flow_Handler::transport ()
 int
 TAO_AV_TCP_Flow_Handler::open (void * /*arg*/)
 {
-
 #if defined (TCP_NODELAY)
   int nodelay = 1;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index 1f9481a8b07..ee2690ae122 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -29,12 +29,12 @@ class TAO_AV_Export TAO_AV_TCP_Factory : public TAO_AV_Transport_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_TCP_Factory (void);
-  virtual ~TAO_AV_TCP_Factory (void);
+  TAO_AV_TCP_Factory ();
+  virtual ~TAO_AV_TCP_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_TCP_Flow_Handler;
@@ -105,12 +105,12 @@ class TAO_AV_TCP_Flow_Handler
 {
 public:
   TAO_AV_TCP_Flow_Handler (TAO_AV_Callback *callback = 0);
-  virtual ~TAO_AV_TCP_Flow_Handler (void);
-  virtual TAO_AV_Transport *transport (void);
+  virtual ~TAO_AV_TCP_Flow_Handler ();
+  virtual TAO_AV_Transport *transport ();
   virtual int open (void * = 0);
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
-  virtual ACE_Event_Handler* event_handler (void){ return this; }
+  virtual ACE_Event_Handler* event_handler () { return this; }
 protected:
   TAO_AV_Core *av_core_;
 };
@@ -142,8 +142,8 @@ protected:
 class TAO_AV_TCP_Acceptor : public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_TCP_Acceptor (void);
-  virtual ~TAO_AV_TCP_Acceptor (void);
+  TAO_AV_TCP_Acceptor ();
+  virtual ~TAO_AV_TCP_Acceptor ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -159,7 +159,7 @@ public:
                             TAO_AV_Core::Flow_Component flow_component =
                                 TAO_AV_Core::TAO_AV_DATA);
 
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler);
 protected:
   TAO_AV_TCP_Base_Acceptor acceptor_;
@@ -195,8 +195,8 @@ protected:
 class TAO_AV_TCP_Connector : public TAO_AV_Connector
 {
 public:
-  TAO_AV_TCP_Connector (void);
-  virtual ~TAO_AV_TCP_Connector (void);
+  TAO_AV_TCP_Connector ();
+  virtual ~TAO_AV_TCP_Connector ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -206,7 +206,7 @@ public:
                        TAO_AV_Transport *&transport,
                        TAO_AV_Core::Flow_Component flow_comp =
                            TAO_AV_Core::TAO_AV_DATA);
-  virtual int close (void);
+  virtual int close ();
   virtual int make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler);
 protected:
   TAO_AV_Core *av_core_;
@@ -227,9 +227,9 @@ public:
                      TAO_AV_Transport *transport = 0);
 
   /// Dtor
-  virtual ~TAO_AV_TCP_Object (void);
+  virtual ~TAO_AV_TCP_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -243,7 +243,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 public:
   /// Pre-allocated memory to receive the data...
@@ -258,8 +258,8 @@ class TAO_AV_TCP_Flow_Factory : public TAO_AV_Flow_Protocol_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_TCP_Flow_Factory (void);
-  virtual ~TAO_AV_TCP_Flow_Factory (void);
+  TAO_AV_TCP_Flow_Factory ();
+  virtual ~TAO_AV_TCP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 462361e5aa3..9f6ab194b87 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -56,7 +56,6 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint,
                                  TAO_AV_Core* av_core,
                                  TAO_AV_FlowSpecSet &flow_spec_set)
 {
-
   TAO_AV_FlowSpecSetItor last_flowspec =  flow_spec_set.end ();
 
   for (TAO_AV_FlowSpecSetItor flow_spec = flow_spec_set.begin ();
@@ -293,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,
@@ -386,7 +384,6 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint,
 
   if (control_flow_factory_name != 0)
     {
-
       TAO_AV_Flow_Protocol_Factory *control_flow_factory =
         av_core->get_flow_protocol_factory (control_flow_factory_name);
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index c414a81dbb6..e9eba73347c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -49,10 +49,10 @@ public:
 
   /// Return a reference to the character representation of the Transport
   /// factories name.
-  const ACE_CString &name (void);
+  const ACE_CString &name ();
 
   /// Return a pointer to the Transport factory.
-  TAO_AV_Transport_Factory *factory (void);
+  TAO_AV_Transport_Factory *factory ();
 
   /// Set the factory pointer's valus.
   void factory (TAO_AV_Transport_Factory *factory);
@@ -80,10 +80,10 @@ public:
 
   /// return a reference to the character representation of the Flow_Protocol
   /// factories name.
-  const ACE_CString &name (void);
+  const ACE_CString &name ();
 
   /// return a pointer to the Flow_Protocol factory.
-  TAO_AV_Flow_Protocol_Factory *factory (void);
+  TAO_AV_Flow_Protocol_Factory *factory ();
 
   /// set the factory pointer's valus.
   void factory (TAO_AV_Flow_Protocol_Factory *factory);
@@ -104,22 +104,22 @@ class TAO_AV_Export TAO_AV_Flow_Handler
 {
 public:
   /// Constructor.
-  TAO_AV_Flow_Handler (void);
+  TAO_AV_Flow_Handler ();
 
-  virtual ~TAO_AV_Flow_Handler (void);
+  virtual ~TAO_AV_Flow_Handler ();
   /// Start/stop the flow handler.
   virtual int start (TAO_FlowSpec_Entry::Role role);
   virtual int stop  (TAO_FlowSpec_Entry::Role role);
 
   /// Schedule timer. Uses the get_timeout method on the callback.
-  virtual int schedule_timer (void);
-  virtual int cancel_timer (void);
+  virtual int schedule_timer ();
+  virtual int cancel_timer ();
 
   /// get the transport.
-  TAO_AV_Transport *transport (void);
+  TAO_AV_Transport *transport ();
 
   /// set/get protocol_object.
-  TAO_AV_Protocol_Object* protocol_object (void);
+  TAO_AV_Protocol_Object* protocol_object ();
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// set the callback.
@@ -132,7 +132,7 @@ public:
   virtual int set_remote_address (ACE_Addr *address);
 
   /// get the underlying event handler. To be overridden by the derived clases.
-  virtual ACE_Event_Handler* event_handler (void) = 0;
+  virtual ACE_Event_Handler* event_handler () = 0;
 
   virtual int change_qos (AVStreams::QoS);
 
@@ -155,18 +155,18 @@ protected:
 class TAO_AV_Export TAO_AV_Transport
 {
 public:
-  TAO_AV_Transport (void);
+  TAO_AV_Transport ();
 
-  virtual ~TAO_AV_Transport (void);
+  virtual ~TAO_AV_Transport ();
 
   virtual int open (ACE_Addr *address) = 0;
 
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /// Write the complete Message_Block chain to the connection.
-  virtual int mtu (void) = 0;
-  virtual ACE_Addr *get_peer_addr (void) = 0;
-  virtual ACE_Addr *get_local_addr (void);
+  virtual int mtu () = 0;
+  virtual ACE_Addr *get_peer_addr () = 0;
+  virtual ACE_Addr *get_local_addr ();
   virtual ssize_t send (const ACE_Message_Block *mblk,
                         ACE_Time_Value *s = 0) = 0;
 
@@ -208,8 +208,8 @@ class TAO_FlowSpec_Entry;
 class TAO_AV_Export TAO_AV_Acceptor
 {
 public:
-  TAO_AV_Acceptor (void);
-  virtual ~TAO_AV_Acceptor (void);
+  TAO_AV_Acceptor ();
+  virtual ~TAO_AV_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -223,7 +223,7 @@ public:
                             TAO_AV_Core::Flow_Component flow_comp) = 0;
 
   const char *flowname ();
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 protected:
   ACE_CString flowname_;
   TAO_AV_Core *av_core_;
@@ -237,9 +237,9 @@ protected:
 class TAO_AV_Export TAO_AV_Connector
 {
 public:
-  TAO_AV_Connector (void);
-  virtual ~TAO_AV_Connector (void);
-  const char *flowname (void);
+  TAO_AV_Connector ();
+  virtual ~TAO_AV_Connector ();
+  const char *flowname ();
 
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -249,7 +249,7 @@ public:
                        TAO_AV_Transport *&transport,
                        TAO_AV_Core::Flow_Component flow_component) = 0;
 
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 protected:
   ACE_CString flowname_;
 };
@@ -270,15 +270,15 @@ public:
    *  TAO_AV_Connector *get_connector (TAO_AV_Core::Protocol protocol);
    * Return the connector bridges
    */
-  TAO_AV_Connector_Registry (void);
-  ~TAO_AV_Connector_Registry (void);
+  TAO_AV_Connector_Registry ();
+  ~TAO_AV_Connector_Registry ();
   int open (TAO_Base_StreamEndPoint *endpoint,
             TAO_AV_Core *av_core,
             TAO_AV_FlowSpecSet &flow_spec_set);
   int close (TAO_AV_Connector *connector);
-  int close_all (void);
-  TAO_AV_ConnectorSetItor begin (void);
-  TAO_AV_ConnectorSetItor end (void);
+  int close_all ();
+  TAO_AV_ConnectorSetItor begin ();
+  TAO_AV_ConnectorSetItor end ();
 protected:
   TAO_AV_ConnectorSet connectors_;
 };
@@ -293,15 +293,15 @@ typedef ACE_Unbounded_Set_Iterator<TAO_AV_Acceptor*> TAO_AV_AcceptorSetItor;
 class TAO_AV_Export TAO_AV_Acceptor_Registry
 {
 public:
-  TAO_AV_Acceptor_Registry (void);
-  ~TAO_AV_Acceptor_Registry (void);
+  TAO_AV_Acceptor_Registry ();
+  ~TAO_AV_Acceptor_Registry ();
   int open (TAO_Base_StreamEndPoint *endpoint,
             TAO_AV_Core *av_core,
             TAO_AV_FlowSpecSet &flow_spec_set);
   int close (TAO_AV_Acceptor *acceptor);
-  int close_all (void);
-  TAO_AV_AcceptorSetItor begin (void);
-  TAO_AV_AcceptorSetItor end (void);
+  int close_all ();
+  TAO_AV_AcceptorSetItor begin ();
+  TAO_AV_AcceptorSetItor end ();
 protected:
   int open_default (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
@@ -317,12 +317,12 @@ class TAO_AV_Export TAO_AV_Transport_Factory : public ACE_Service_Object
 {
 public:
   /// Initialization hook.
-  TAO_AV_Transport_Factory (void);
-  virtual ~TAO_AV_Transport_Factory (void);
+  TAO_AV_Transport_Factory ();
+  virtual ~TAO_AV_Transport_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
   int ref_count;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.inl b/TAO/orbsvcs/orbsvcs/AV/Transport.inl
index 7c78c72c1f8..3deba20196b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.inl
@@ -6,14 +6,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //------------------------------------------------------------
 ACE_INLINE
 const ACE_CString &
-TAO_AV_Transport_Item::name (void)
+TAO_AV_Transport_Item::name ()
 {
   return this->name_;
 }
 
 ACE_INLINE
 TAO_AV_Transport_Factory *
-TAO_AV_Transport_Item::factory (void)
+TAO_AV_Transport_Item::factory ()
 {
   return this->factory_;
 }
@@ -31,14 +31,14 @@ TAO_AV_Transport_Item::factory (TAO_AV_Transport_Factory *factory)
 //------------------------------------------------------------
 ACE_INLINE
 const ACE_CString &
-TAO_AV_Flow_Protocol_Item::name (void)
+TAO_AV_Flow_Protocol_Item::name ()
 {
   return this->name_;
 }
 
 ACE_INLINE
 TAO_AV_Flow_Protocol_Factory *
-TAO_AV_Flow_Protocol_Item::factory (void)
+TAO_AV_Flow_Protocol_Item::factory ()
 {
   return this->factory_;
 }
@@ -56,14 +56,14 @@ TAO_AV_Flow_Protocol_Item::factory (TAO_AV_Flow_Protocol_Factory *factory)
 
 ACE_INLINE
 TAO_AV_ConnectorSetItor
-TAO_AV_Connector_Registry::begin (void)
+TAO_AV_Connector_Registry::begin ()
 {
   return this->connectors_.begin ();
 }
 
 ACE_INLINE
 TAO_AV_ConnectorSetItor
-TAO_AV_Connector_Registry::end (void)
+TAO_AV_Connector_Registry::end ()
 {
   return this->connectors_.end ();
 }
@@ -73,14 +73,14 @@ TAO_AV_Connector_Registry::end (void)
 //------------------------------------------------------------
 ACE_INLINE
 TAO_AV_AcceptorSetItor
-TAO_AV_Acceptor_Registry::begin (void)
+TAO_AV_Acceptor_Registry::begin ()
 {
   return this->acceptors_.begin ();
 }
 
 ACE_INLINE
 TAO_AV_AcceptorSetItor
-TAO_AV_Acceptor_Registry::end (void)
+TAO_AV_Acceptor_Registry::end ()
 {
   return this->acceptors_.end ();
 }
@@ -90,7 +90,7 @@ TAO_AV_Acceptor_Registry::end (void)
 //------------------------------------------------------------
 ACE_INLINE
 const char *
-TAO_AV_Acceptor::flowname (void)
+TAO_AV_Acceptor::flowname ()
 {
   return this->flowname_.c_str ();
 }
@@ -100,7 +100,7 @@ TAO_AV_Acceptor::flowname (void)
 //------------------------------------------------------------
 ACE_INLINE
 const char *
-TAO_AV_Connector::flowname (void)
+TAO_AV_Connector::flowname ()
 {
   return this->flowname_.c_str ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index d320d327028..2f19adac8bc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -94,7 +94,6 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos)
   int dscp_flag=0;
   for(i=0; i < qos.QoSParams.length(); i++)
     {
-
       if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0)
         {
           qos.QoSParams[i].property_value >>= dscp;
@@ -280,7 +279,6 @@ TAO_AV_UDP_Transport::send (const iovec *iov,
   return this->handler_->get_socket ()->send ((const iovec *) iov,
                                               iovcnt,
                                               this->peer_addr_);
-
 }
 
 ssize_t
@@ -678,7 +676,6 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
                     control_inet_addr =  dynamic_cast<ACE_INET_Addr*> (entry->control_address ()) ;
                   else
                     {
-
                       if (local_addr != 0)
                         {
                           ACE_TCHAR buf [BUFSIZ];
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index 7b482492ebc..75dd1aa0722 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -28,12 +28,12 @@ class TAO_AV_Export TAO_AV_UDP_Factory : public TAO_AV_Transport_Factory
 {
 public:
   /// Initialization hook.
-  TAO_AV_UDP_Factory (void);
-  virtual ~TAO_AV_UDP_Factory (void);
+  TAO_AV_UDP_Factory ();
+  virtual ~TAO_AV_UDP_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
+  virtual TAO_AV_Acceptor *make_acceptor ();
+  virtual TAO_AV_Connector *make_connector ();
 };
 
 class TAO_AV_UDP_Flow_Handler;
@@ -46,20 +46,19 @@ class TAO_AV_UDP_Flow_Handler;
 class TAO_AV_Export TAO_AV_UDP_Transport
   :public TAO_AV_Transport
 {
-
 public:
-  TAO_AV_UDP_Transport (void);
+  TAO_AV_UDP_Transport ();
 
   TAO_AV_UDP_Transport (TAO_AV_UDP_Flow_Handler *handler);
 
-  virtual  ~TAO_AV_UDP_Transport (void);
+  virtual  ~TAO_AV_UDP_Transport ();
   virtual int open (ACE_Addr *addr);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   virtual int set_remote_address (const ACE_INET_Addr &address);
 
@@ -93,7 +92,7 @@ public:
                         int iovcnt,
                         ACE_Time_Value *s = 0);
 
-  TAO_AV_UDP_Flow_Handler *handler (void) { return this->handler_; }
+  TAO_AV_UDP_Flow_Handler *handler () { return this->handler_; }
 
 protected:
   TAO_AV_UDP_Flow_Handler *handler_;
@@ -112,17 +111,17 @@ class TAO_AV_Export TAO_AV_UDP_Flow_Handler
 public:
   ///Ctor
   /// Dtor
-  TAO_AV_UDP_Flow_Handler (void);
-  virtual ~TAO_AV_UDP_Flow_Handler (void);
+  TAO_AV_UDP_Flow_Handler ();
+  virtual ~TAO_AV_UDP_Flow_Handler ();
   int open (ACE_Addr &address);
-  int close (void);
-  virtual TAO_AV_Transport *transport (void);
+  int close ();
+  virtual TAO_AV_Transport *transport ();
   virtual int set_remote_address (ACE_Addr *address);
   virtual ACE_HANDLE get_handle () const;
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
   const ACE_SOCK_Dgram *get_socket () const;
-  virtual ACE_Event_Handler* event_handler (void){ return this; }
+  virtual ACE_Event_Handler* event_handler () { return this; }
   /// Change the QoS
   virtual int change_qos (AVStreams::QoS);
 
@@ -140,8 +139,8 @@ class TAO_AV_Export TAO_AV_UDP_Acceptor
   :public TAO_AV_Acceptor
 {
 public:
-  TAO_AV_UDP_Acceptor (void);
-  virtual ~TAO_AV_UDP_Acceptor (void);
+  TAO_AV_UDP_Acceptor ();
+  virtual ~TAO_AV_UDP_Acceptor ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_FlowSpec_Entry *entry,
@@ -158,7 +157,7 @@ public:
 
   virtual int open_i (ACE_INET_Addr *address, int is_default_open);
 
-  virtual int close (void);
+  virtual int close ();
   virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler);
 
 protected:
@@ -178,8 +177,8 @@ class TAO_AV_Export TAO_AV_UDP_Connector
   :public TAO_AV_Connector
 {
 public:
-  TAO_AV_UDP_Connector (void);
-  ~TAO_AV_UDP_Connector (void);
+  TAO_AV_UDP_Connector ();
+  ~TAO_AV_UDP_Connector ();
   virtual int open (TAO_Base_StreamEndPoint *endpoint,
                     TAO_AV_Core *av_core,
                     TAO_AV_Flow_Protocol_Factory *factory);
@@ -189,7 +188,7 @@ public:
                        TAO_AV_Core::Flow_Component flow_comp =
                            TAO_AV_Core::TAO_AV_DATA);
   virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler);
-  virtual int close (void);
+  virtual int close ();
 protected:
   ACE_INET_Addr *control_inet_address_;
   bool delete_control_inet_address_;
@@ -198,7 +197,6 @@ protected:
   TAO_FlowSpec_Entry *entry_;
   TAO_AV_Flow_Protocol_Factory *flow_protocol_factory_;
   TAO_AV_Core::Flow_Component flow_component_;
-
 };
 
 /**
@@ -233,9 +231,9 @@ public:
                      TAO_AV_Transport *transport = 0);
 
   /// Dtor
-  virtual ~TAO_AV_UDP_Object (void);
+  virtual ~TAO_AV_UDP_Object ();
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -249,7 +247,7 @@ public:
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
 private:
   /// Pre-allocated memory to receive the data...
@@ -264,8 +262,8 @@ class TAO_AV_Export TAO_AV_UDP_Flow_Factory : public TAO_AV_Flow_Protocol_Factor
 {
 public:
   /// Initialization hook.
-  TAO_AV_UDP_Flow_Factory (void);
-  virtual ~TAO_AV_UDP_Flow_Factory (void);
+  TAO_AV_UDP_Flow_Factory ();
+  virtual ~TAO_AV_UDP_Flow_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.inl b/TAO/orbsvcs/orbsvcs/AV/UDP.inl
index d1d330728fb..1f883056803 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.inl
@@ -21,7 +21,7 @@ TAO_AV_UDP_Flow_Handler::open (ACE_Addr &address)
 
 ACE_INLINE
 int
-TAO_AV_UDP_Flow_Handler::close (void)
+TAO_AV_UDP_Flow_Handler::close ()
 {
   return  this->sock_dgram_.close ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 77b9e1542a7..ddba84bfa49 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -649,7 +649,6 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport,
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -1093,7 +1092,6 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies)
       policy = policies[i];
       switch (policies[i]->type ())
         {
-
         case TAO_AV_SFP_CREDIT_POLICY:
           {
             TAO_AV_SFP_Credit_Policy *credit_policy =
@@ -1270,7 +1268,6 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry,
       break;
     case TAO_FlowSpec_Entry::TAO_AV_CONSUMER:
       {
-
         ACE_NEW_RETURN (object,
                         TAO_SFP_Consumer_Object (callback,
                                                  transport,
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index c3023b5f101..ea45cc9a3da 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_SFP_Fragment_Node
 {
 public:
-  TAO_SFP_Fragment_Node (void) : data_ (0) {}
+  TAO_SFP_Fragment_Node () : data_ (0) {}
   flowProtocol::fragment fragment_info_;
   ACE_Message_Block *data_;
   friend bool operator< (const TAO_SFP_Fragment_Node& left,
@@ -56,7 +56,7 @@ public:
 class TAO_SFP_Fragment_Table_Entry
 {
 public:
-  TAO_SFP_Fragment_Table_Entry (void)
+  TAO_SFP_Fragment_Table_Entry ()
     :last_received_ (0),
      num_fragments_ (0)
     {}
@@ -138,7 +138,7 @@ public:
     START_RECEIVED
   };
 
-  TAO_SFP_Base (void);
+  TAO_SFP_Base ();
   static CORBA::Boolean start_frame (CORBA::Octet flags,
                                      flowProtocol::MsgType type,
                                      TAO_OutputCDR &msg);
@@ -217,10 +217,10 @@ public:
                   TAO_AV_Transport *transport);
   // We should add a sfp options parameter.
 
-  virtual ~TAO_SFP_Object (void);
+  virtual ~TAO_SFP_Object ();
   // Dtor
 
-  virtual int handle_input (void) = 0;
+  virtual int handle_input () = 0;
   virtual int send_frame (ACE_Message_Block *frame,
                           TAO_AV_frame_info *frame_info = 0);
 
@@ -231,7 +231,7 @@ public:
   virtual int send_frame (const char*buf,
                           size_t len);
 
-  virtual int destroy (void);
+  virtual int destroy ();
   virtual int set_policies (const TAO_AV_PolicyList &policies);
 
 protected:
@@ -256,7 +256,7 @@ public:
   TAO_SFP_Producer_Object (TAO_AV_Callback *callback,
                            TAO_AV_Transport *transport,
                            const char *flow_options);
-  virtual int handle_input (void);
+  virtual int handle_input ();
 protected:
   CORBA::ULong credit_sequence_num_;
 };
@@ -271,7 +271,7 @@ public:
   TAO_SFP_Consumer_Object (TAO_AV_Callback *callback,
                            TAO_AV_Transport *transport,
                            ACE_CString& flow_options);
-  virtual int handle_input (void);
+  virtual int handle_input ();
 };
 
 /**
@@ -281,8 +281,8 @@ public:
 class TAO_AV_Export TAO_AV_SFP_Factory : public TAO_AV_Flow_Protocol_Factory
 {
 public:
-  TAO_AV_SFP_Factory (void);
-  virtual ~TAO_AV_SFP_Factory (void);
+  TAO_AV_SFP_Factory ();
+  virtual ~TAO_AV_SFP_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialization hook.
   virtual int match_protocol (const char *flow_string);
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index cc2cd295b79..cc226f585c0 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -18,7 +18,6 @@ ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events)
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ()
 {
-
   target_->disconnect_push_consumer ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 5dfc74f87ac..136e2727a04 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -48,23 +48,23 @@ class TAO_Concurrency_Serv_Export CC_Lock
 {
 public:
   /// Creates the lock with mode = intention_read (weakest)
-  CC_Lock (void);
+  CC_Lock ();
 
   /// Creates the lock with the desired mode
   CC_Lock (CosConcurrencyControl::lock_mode mode);
 
   /// Deletes the lock
-  ~CC_Lock (void);
+  ~CC_Lock ();
 
   /// Acquires this lock. Blocks until lock is obtained
-  void lock (void);
+  void lock ();
 
   /// Tries to acquire this lock. If it is not possible to acquire the
   /// lock, false is returned
-  CORBA::Boolean try_lock (void);
+  CORBA::Boolean try_lock ();
 
   /// Releases this lock.
-  void unlock (void);
+  void unlock ();
 
   /// Changes the mode of this lock.
   void change_mode (CosConcurrencyControl::lock_mode new_mode);
@@ -79,16 +79,16 @@ public:
   CORBA::Boolean Compatible (CosConcurrencyControl::lock_mode mode);
 
   /// Returns the mode of the lock.
-  CosConcurrencyControl::lock_mode GetMode (void);
+  CosConcurrencyControl::lock_mode GetMode ();
 
   /// Returns the number of times this lock have been locked
-  int GetLocksHeld(void);
+  int GetLocksHeld();
 
   /// Decrements the number of locks held in this mode. Used by change_mode.
-  void DecLocksHeld(void);
+  void DecLocksHeld();
 
   /// Dumps the state of the object to stdout
-  void dump(void);
+  void dump();
 
 protected:
   /// Holds the lock's mode.
@@ -116,23 +116,23 @@ class TAO_Concurrency_Serv_Export CC_LockModeIterator
 {
 public:
   /// Default constructor
-  CC_LockModeIterator(void);
+  CC_LockModeIterator();
 
   /// Destructor
-  ~CC_LockModeIterator(void);
+  ~CC_LockModeIterator();
 
   /// Reset the iterator to the first element
-  void First(void);
+  void First();
 
   /// Advance the iterator to the next element
   /// Throws exception if out of range
-  void Next(void);
+  void Next();
 
   /// Returns true if the iterator has reached the last element
-  CORBA::Boolean IsDone(void);
+  CORBA::Boolean IsDone();
 
   /// Get the current element
-  CosConcurrencyControl::lock_mode GetLockMode(void);
+  CosConcurrencyControl::lock_mode GetLockMode();
 
 private:
   CosConcurrencyControl::lock_mode current_;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 99d6a1b442e..5fbb84bab35 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet ()
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("CC_LockSet::CC_LockSet (void)");
+      ex._tao_print_exception ("CC_LockSet::CC_LockSet ()");
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 139e389bf01..6e2d6de6bb1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -76,14 +76,14 @@ class TAO_Concurrency_Serv_Export CC_LockSet :  public POA_CosConcurrencyControl
 {
 public:
   /// Default constructor
-  CC_LockSet (void);
+  CC_LockSet ();
 
   /// Constructor used if create_related is used to create the lock
   /// set.
   CC_LockSet (CosConcurrencyControl::LockSet_ptr related);
 
   /// Destructor.
-  ~CC_LockSet (void);
+  ~CC_LockSet ();
 
   // = CosConcurrencyControl methods
   /// Acquires this lock. Blocks until lock is obtained
@@ -102,7 +102,7 @@ public:
 
   // = Debugging methods
   /// Dump the state of the object to stdout
-  void dump (void);
+  void dump ();
 
 private:
   /// Converts the CORBA specification's lock mode to the internal
@@ -111,7 +111,7 @@ private:
 
   /// Initiatlizes the lock set array and acquires the initial
   /// semaphore.
-  void Init (void);
+  void Init ();
 
   /// Returns true if the held lock and the requested lock are compatible
   CORBA::Boolean compatible (CC_LockModeEnum mr);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 03a2175adb9..247cc2bf866 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -11,7 +11,6 @@
 #include "orbsvcs/Concurrency/CC_LockSet.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 8690633dff9..4c032f823de 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -37,10 +37,10 @@ class TAO_Concurrency_Serv_Export CC_LockSetFactory
 {
 public:
   /// Default constructor.
-  CC_LockSetFactory (void);
+  CC_LockSetFactory ();
 
   /// Destructor.
-  ~CC_LockSetFactory (void);
+  ~CC_LockSetFactory ();
 
   virtual CosConcurrencyControl::LockSet_ptr create ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 74555ec8ed7..d192342a8cb 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -15,7 +15,6 @@
 #include "ace/Dynamic_Service.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Concurrency_Loader::TAO_Concurrency_Loader ()
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 693e026a7a2..4d14f2e112a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -30,12 +30,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loader
 {
 public:
-
   /// Constructor
-  TAO_Concurrency_Loader (void);
+  TAO_Concurrency_Loader ();
 
   /// Destructor
-  ~TAO_Concurrency_Loader (void);
+  ~TAO_Concurrency_Loader ();
 
   /// Called by the Service Configurator framework to initialize the
   /// Event Service. Defined in <ace/Service_Config.h>
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index 2338e119ff0..b71e392b930 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -39,7 +39,7 @@ class TAO_Concurrency_Serv_Export TAO_Concurrency_Server
 {
 public:
   ///Default constructor.
-  TAO_Concurrency_Server (void);
+  TAO_Concurrency_Server ();
 
   /// Takes the POA under which to register the Concurrency Service
   /// implementation object.
@@ -47,17 +47,17 @@ public:
                           PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~TAO_Concurrency_Server (void);
+  ~TAO_Concurrency_Server ();
 
   /// Initialize the concurrency server under the given ORB and POA.
   CORBA::Object_ptr init (CORBA::ORB_ptr orb,
                           PortableServer::POA_ptr poa);
 
   /// Cleanup resources.
-  int fini (void);
+  int fini ();
 
   /// Get the lock set factory.
-  CC_LockSetFactory *GetLockSetFactory (void);
+  CC_LockSetFactory *GetLockSetFactory ();
 
 private:
   /// This is the lock set factory activated under the POA.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 96ce57e6d30..aca1ebd3610 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -57,7 +57,7 @@ public:
   TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel);
 
   /// Destructor...
-  virtual ~TAO_CEC_ConsumerAdmin (void);
+  virtual ~TAO_CEC_ConsumerAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
@@ -77,16 +77,16 @@ public:
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-      obtain_pull_supplier (void);
+      obtain_pull_supplier ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
@@ -100,7 +100,6 @@ private:
 
   /// Implement the pull side of this class
   TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier,CosEventChannelAdmin::ProxyPullSupplier> pull_admin_;
-
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index e21474a5230..10e7c9015f4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -48,15 +48,15 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerControl
 {
 public:
   /// Constructor
-  TAO_CEC_ConsumerControl (void);
+  TAO_CEC_ConsumerControl ();
 
   /// Destructor
-  virtual ~TAO_CEC_ConsumerControl (void);
+  virtual ~TAO_CEC_ConsumerControl ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the consumers
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
 
   /**
    * When pushing an event to the consumer a CORBA::OBJECT_NOT_EXIST
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index 84403d50e75..071686cf93f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -43,14 +43,14 @@ class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory
 {
 public:
   /// Constructor
-  TAO_CEC_Default_Factory (void);
+  TAO_CEC_Default_Factory ();
 
   /// destructor...
-  virtual ~TAO_CEC_Default_Factory (void);
+  virtual ~TAO_CEC_Default_Factory ();
 
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
@@ -110,9 +110,9 @@ public:
       destroy_proxy_pull_supplier_collection (
           TAO_CEC_ProxyPullSupplier_Collection*);
 
-  virtual ACE_Lock* create_consumer_lock (void);
+  virtual ACE_Lock* create_consumer_lock ();
   virtual void destroy_consumer_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_lock (void);
+  virtual ACE_Lock* create_supplier_lock ();
   virtual void destroy_supplier_lock (ACE_Lock*);
 
   virtual TAO_CEC_ConsumerControl*
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
index c33f0c7672f..41321de6851 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void)
+TAO_CEC_Default_Factory::TAO_CEC_Default_Factory ()
   :  dispatching_ (TAO_CEC_DEFAULT_DISPATCHING),
      pulling_strategy_ (TAO_CEC_DEFAULT_PULLING_STRATEGY),
      consumer_collection_ (TAO_CEC_DEFAULT_CONSUMER_COLLECTION),
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 2a92dd1fde7..f0c04bb8599 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -44,18 +44,18 @@ class TAO_Event_Serv_Export TAO_CEC_Dispatching
 {
 public:
   /// destructor...
-  virtual ~TAO_CEC_Dispatching (void);
+  virtual ~TAO_CEC_Dispatching ();
 
   /// Initialize all the data structures, activate any internal threads,
   /// etc.
-  virtual void activate (void) = 0;
+  virtual void activate () = 0;
 
   /**
    * Deactivate any internal threads and cleanup internal data
    * structures, it should only return once the threads have finished
    * their jobs.
    */
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /// The consumer represented by @a proxy should receive @a event.
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
@@ -85,11 +85,11 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispat
 public:
   /// The scheduler is used to find the range of priorities and similar
   /// info.
-  TAO_CEC_Reactive_Dispatching (void);
+  TAO_CEC_Reactive_Dispatching ();
 
   // = The CEC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
                      const CORBA::Any &event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 5561bbca026..d4a609cf86e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -78,10 +78,10 @@ public:
                            ACE_Allocator *mb_allocator = 0);
 
   /// Destructor
-  virtual ~TAO_CEC_Dispatch_Command (void);
+  virtual ~TAO_CEC_Dispatch_Command ();
 
   /// Command callback
-  virtual int execute (void) = 0;
+  virtual int execute () = 0;
 };
 
 // ****************************************************************
@@ -93,7 +93,7 @@ public:
   TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 // ****************************************************************
@@ -108,10 +108,10 @@ public:
                         ACE_Allocator *mb_allocator);
 
   /// Destructor
-  virtual ~TAO_CEC_Push_Command (void);
+  virtual ~TAO_CEC_Push_Command ();
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// The proxy
@@ -134,10 +134,10 @@ public:
                           ACE_Allocator *mb_allocator);
 
   /// Destructor
-  virtual ~TAO_CEC_Invoke_Command (void);
+  virtual ~TAO_CEC_Invoke_Command ();
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index 6227b513645..b59e5cf186b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -29,14 +29,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation
 {
 public:
-
   /// Constructor
   TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa,
                                        TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer,
                                        TAO_CEC_TypedEventChannel *typed_event_channel);
 
   /// Destructor
-  virtual ~TAO_CEC_DynamicImplementationServer (void);
+  virtual ~TAO_CEC_DynamicImplementationServer ();
 
   // = The DynamicImplementation methods.
   virtual void invoke (CORBA::ServerRequest_ptr request);
@@ -45,7 +44,7 @@ public:
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Handles the _is_a call
   virtual void is_a (CORBA::ServerRequest_ptr request);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 90304ed1fd1..2692e29434f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -126,15 +126,15 @@ public:
                         int own_factory = 0);
 
   /// destructor
-  virtual ~TAO_CEC_EventChannel (void);
+  virtual ~TAO_CEC_EventChannel ();
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (void);
+  virtual void activate ();
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching () const;
@@ -183,14 +183,14 @@ public:
   void destroy_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection*);
 
   /// Access the supplier and consumer POAs from the factory.
-  PortableServer::POA_ptr supplier_poa (void);
-  PortableServer::POA_ptr consumer_poa (void);
+  PortableServer::POA_ptr supplier_poa ();
+  PortableServer::POA_ptr consumer_poa ();
 
   /// Locking strategies for the ProxyPushConsumer and
   /// ProxyPushSupplier objects
-  ACE_Lock* create_consumer_lock (void);
+  ACE_Lock* create_consumer_lock ();
   void destroy_consumer_lock (ACE_Lock*);
-  ACE_Lock* create_supplier_lock (void);
+  ACE_Lock* create_supplier_lock ();
   void destroy_supplier_lock (ACE_Lock*);
 
   /// Used to inform the EC that a Consumer has connected or
@@ -228,17 +228,17 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void);
+      for_consumers ();
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this (env);
   virtual CosEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void);
+      for_suppliers ();
 
   /// Commit suicide.
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  ServantRetryMap& get_servant_retry_map (void);
+  ServantRetryMap& get_servant_retry_map ();
 
   /// Forwarded to the factory
   CORBA::Policy_ptr
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
index 1de0e16e264..1a8aaae29ca 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
@@ -140,19 +140,19 @@ TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPullSupplier_Collec
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_CEC_EventChannel::supplier_poa (void)
+TAO_CEC_EventChannel::supplier_poa ()
 {
   return PortableServer::POA::_duplicate (this->supplier_poa_.in ());
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_CEC_EventChannel::consumer_poa (void)
+TAO_CEC_EventChannel::consumer_poa ()
 {
   return PortableServer::POA::_duplicate (this->consumer_poa_.in ());
 }
 
 ACE_INLINE ACE_Lock*
-TAO_CEC_EventChannel::create_consumer_lock (void)
+TAO_CEC_EventChannel::create_consumer_lock ()
 {
   return this->factory_->create_consumer_lock ();
 }
@@ -164,7 +164,7 @@ TAO_CEC_EventChannel::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_INLINE ACE_Lock*
-TAO_CEC_EventChannel::create_supplier_lock (void)
+TAO_CEC_EventChannel::create_supplier_lock ()
 {
   return this->factory_->create_supplier_lock ();
 }
@@ -194,7 +194,7 @@ TAO_CEC_EventChannel::disconnect_callbacks () const
 }
 
 ACE_INLINE TAO_CEC_EventChannel::ServantRetryMap&
-TAO_CEC_EventChannel::get_servant_retry_map (void)
+TAO_CEC_EventChannel::get_servant_retry_map ()
 {
   return this->retry_map_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index f4019a5c167..c28e0872960 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -38,10 +38,10 @@ class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
-  TAO_CEC_Event_Loader (void);
+  TAO_CEC_Event_Loader ();
 
   /// Destructor
-  ~TAO_CEC_Event_Loader (void);
+  ~TAO_CEC_Event_Loader ();
 
   //@{
   /**
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 27cdd6becc9..f91be9f4b5a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -83,7 +83,7 @@ class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
-  virtual ~TAO_CEC_Factory (void);
+  virtual ~TAO_CEC_Factory ();
 
   /// Create and destroy the dispatching module.
   virtual TAO_CEC_Dispatching*
@@ -199,9 +199,9 @@ public:
 
   /// Create and destroy the locking strategies for both
   /// ProxyPushConsumers and ProxyPushSuppliers
-  virtual ACE_Lock* create_consumer_lock (void) = 0;
+  virtual ACE_Lock* create_consumer_lock () = 0;
   virtual void destroy_consumer_lock (ACE_Lock*) = 0;
-  virtual ACE_Lock* create_supplier_lock (void) = 0;
+  virtual ACE_Lock* create_supplier_lock () = 0;
   virtual void destroy_supplier_lock (ACE_Lock*) = 0;
 
   /// The ConsumerControl and SupplierControl strategies are used to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 8d8e725998d..af65ca8e51d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -46,8 +46,8 @@ public:
                          int force_activate);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_CEC_ProxyPushSupplier* proxy,
                      const CORBA::Any & event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index aeea3d822b8..e172324f8b5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -52,14 +52,14 @@ public:
                              const ACE_Time_Value &timeout);
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPullConsumer (void);
+  virtual ~TAO_CEC_ProxyPullConsumer ();
 
   /// Activate in the POA
   virtual void  activate (
       CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected () const;
@@ -70,7 +70,7 @@ public:
 
   /// Pulls from the supplier, verifies that it is connected.
   CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event);
-  CORBA::Any* pull_from_supplier (void);
+  CORBA::Any* pull_from_supplier ();
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -80,21 +80,21 @@ public:
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
                 CosEventComm::PullSupplier_ptr pull_supplier);
-  virtual void disconnect_pull_consumer (void);
+  virtual void disconnect_pull_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the supplier, used by some implementations to change the
@@ -106,7 +106,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and
   /// applies policies (when appropriate) to supplier_.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 2660286b370..6d63db1de83 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -59,14 +59,14 @@ public:
                              const ACE_Time_Value &timeout);
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPullSupplier (void);
+  virtual ~TAO_CEC_ProxyPullSupplier ();
 
   /// Activate in the POA
   virtual void activate (
       CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected () const;
@@ -80,7 +80,7 @@ public:
   CosEventComm::PullConsumer_ptr consumer () const;
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
@@ -95,18 +95,18 @@ public:
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
                 CosEventComm::PullConsumer_ptr pull_consumer);
-  virtual CORBA::Any * pull (void);
+  virtual CORBA::Any * pull ();
   virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event);
-  virtual void disconnect_pull_supplier (void);
+  virtual void disconnect_pull_supplier ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the consumer, used by some implementations to change the
@@ -118,7 +118,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the child and the consumer
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both consumer_ and nopolicy_consumer_, and
   /// applies policies (when appropriate) to consumer_.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 5bbf33df9f3..0239d91fb73 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -54,14 +54,14 @@ public:
                              const ACE_Time_Value &timeout);
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPushConsumer (void);
+  virtual ~TAO_CEC_ProxyPushConsumer ();
 
   /// Activate in the POA
   virtual void activate (
       CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return false if no supplier is connected...
   CORBA::Boolean is_connected () const;
@@ -78,22 +78,22 @@ public:
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 CosEventComm::PushSupplier_ptr push_supplier);
   virtual void push (const CORBA::Any& event);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the supplier, used by some implementations to change the
@@ -108,7 +108,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and
   /// applies policies (when appropriate) to supplier_.
@@ -164,7 +164,7 @@ public:
                                    TAO_CEC_ProxyPushConsumer *proxy);
 
   /// Destructor
-  ~TAO_CEC_ProxyPushConsumer_Guard (void);
+  ~TAO_CEC_ProxyPushConsumer_Guard ();
 
   /// Returns true if the reference count successfully acquired
   bool locked () const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index 0e5bc198acb..c7117ca75b4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -232,7 +232,6 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event)
                                     this->typed_event_channel_,
                                     this);
   {
-
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
     if (!this->is_connected_i ())
@@ -329,7 +328,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
     throw CORBA::BAD_PARAM ();
 
   {
-
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     // Check if we have a typed event channel
     if (this->is_typed_ec () )
@@ -379,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 () );
@@ -391,7 +388,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
 
         // Notify the event channel...
         this->typed_event_channel_->connected (this);
-
       } /* this->is_typed_ec */
     else
       {
@@ -405,7 +401,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
           }
 
         {
-
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index b7fec15b0b8..838b92d8ef1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -70,14 +70,14 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// destructor...
-  virtual ~TAO_CEC_ProxyPushSupplier (void);
+  virtual ~TAO_CEC_ProxyPushSupplier ();
 
   /// Activate in the POA
   virtual void activate (
       CosEventChannelAdmin::ProxyPushSupplier_ptr &);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected () const;
@@ -91,7 +91,7 @@ public:
   CosEventComm::PushConsumer_ptr consumer () const;
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Internal methods to push an event to each consumer.
   virtual void push (const CORBA::Any &event);
@@ -119,16 +119,16 @@ public:
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 CosEventComm::PushConsumer_ptr push_consumer);
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// Set the consumer, used by some implementations to change the
@@ -144,7 +144,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the child and the consumer
-  void cleanup_i (void);
+  void cleanup_i ();
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   CORBA::Boolean is_typed_ec () const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 5b0e9843feb..90b37c27cad 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -39,18 +39,18 @@ class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy
 {
 public:
   /// destructor...
-  virtual ~TAO_CEC_Pulling_Strategy (void);
+  virtual ~TAO_CEC_Pulling_Strategy ();
 
   /// Initialize all the data structures, activate any internal threads,
   /// etc.
-  virtual void activate (void) = 0;
+  virtual void activate () = 0;
 
   /**
    * Deactivate any internal threads and cleanup internal data
    * structures, it should only return once the threads have finished
    * their jobs.
    */
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
 #if 0
   /// Some strategies may want to keep track of connected consumers.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index ab8852c1d3c..13bd60f92eb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -161,7 +161,6 @@ void
 TAO_CEC_Reactive_ConsumerControl::successful_transmission (
                                     PortableServer::ServantBase* proxy)
 {
-
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->typed_event_channel_)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 88a17ffeb22..958e8a544e7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -99,15 +99,15 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// destructor...
-  virtual ~TAO_CEC_Reactive_ConsumerControl (void);
+  virtual ~TAO_CEC_Reactive_ConsumerControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_CEC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy);
   virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy);
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
@@ -125,7 +125,7 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (void);
+  void query_consumers ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 3253d29db2a..e8deaffa063 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -85,8 +85,8 @@ public:
                        const void* arg);
 
   // = The CEC_Pulling_Strategy methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
 
 private:
   /// The Adapter for the reactor events
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index cabd907629c..6df5666491a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -97,15 +97,15 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// destructor...
-  virtual ~TAO_CEC_Reactive_SupplierControl (void);
+  virtual ~TAO_CEC_Reactive_SupplierControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_CEC_SupplierControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy);
@@ -126,7 +126,7 @@ public:
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (void);
+  void query_suppliers ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 9441c9087ad..d81786b7263 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -57,7 +57,7 @@ public:
   TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel* event_channel);
 
   /// destructor...
-  virtual ~TAO_CEC_SupplierAdmin (void);
+  virtual ~TAO_CEC_SupplierAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker);
@@ -75,16 +75,16 @@ public:
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-      obtain_pull_consumer (void);
+      obtain_pull_consumer ();
 
   /// The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 33ddb1892b4..1302fd25c21 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -57,15 +57,15 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierControl
 {
 public:
   /// Constructor
-  TAO_CEC_SupplierControl (void);
+  TAO_CEC_SupplierControl ();
 
   /// destructor...
-  virtual ~TAO_CEC_SupplierControl (void);
+  virtual ~TAO_CEC_SupplierControl ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the suppliers
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
 
   /**
    * Invoked by helper classes when they detect that a supplier does
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index fa7a864fef8..cbc61e407fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -36,12 +36,11 @@ class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin
   : public POA_CosTypedEventChannelAdmin::TypedConsumerAdmin
 {
 public:
-
   // Constructor
   TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel* typed_event_channel);
 
   // Destructor
-  virtual ~TAO_CEC_TypedConsumerAdmin (void);
+  virtual ~TAO_CEC_TypedConsumerAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
@@ -57,7 +56,7 @@ public:
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
@@ -67,13 +66,13 @@ public:
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier (void);
+    obtain_push_supplier ();
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier (void);
+    obtain_pull_supplier ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
index df5816d4608..7a47f2ea313 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -41,7 +41,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEvent
 {
 public:
   /// constructors...
-  TAO_CEC_TypedEvent (void);
+  TAO_CEC_TypedEvent ();
 
   TAO_CEC_TypedEvent (CORBA::NVList_ptr list,
                       const char * operation);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
index f5897f1f124..6abb9bf56e8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void)
+TAO_CEC_TypedEvent::TAO_CEC_TypedEvent ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index b7b171e9427..d282d632f19 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -502,7 +502,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper
 
   for (CORBA::ULong param=0; param<oper_params->num_params_; param++)
     {
-
       CORBA::Any any_1;
       any_1._tao_set_typecode(oper_params->parameters_[param].type_.in ());
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 43c7cbd5c52..7ffac9043a0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -136,15 +136,15 @@ public:
                              int own_factory = 0);
 
   /// Destructor
-  virtual ~TAO_CEC_TypedEventChannel (void);
+  virtual ~TAO_CEC_TypedEventChannel ();
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (void);
+  virtual void activate ();
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching () const;
@@ -181,14 +181,14 @@ public:
   void destroy_proxy_collection (TAO_CEC_TypedProxyPushConsumer_Collection*);
 
   /// Access the supplier and consumer POAs from the factory.
-  PortableServer::POA_ptr typed_supplier_poa (void);
-  PortableServer::POA_ptr typed_consumer_poa (void);
+  PortableServer::POA_ptr typed_supplier_poa ();
+  PortableServer::POA_ptr typed_consumer_poa ();
 
   /// Locking strategies for the ProxyPushConsumer and
   /// ProxyPushSupplier objects
-  ACE_Lock* create_consumer_lock (void);
+  ACE_Lock* create_consumer_lock ();
   void destroy_consumer_lock (ACE_Lock*);
-  ACE_Lock* create_supplier_lock (void);
+  ACE_Lock* create_supplier_lock ();
   void destroy_supplier_lock (ACE_Lock*);
 
   /// Used to inform the EC that a Consumer has connected or
@@ -245,14 +245,14 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedEventChannel methods...
   virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
 
   virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-    for_suppliers (void);
+    for_suppliers ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  ServantRetryMap& get_servant_retry_map (void);
+  ServantRetryMap& get_servant_retry_map ();
 
   /// Forwarded to the factory
   CORBA::Policy_ptr
@@ -266,7 +266,7 @@ protected:
   int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);
 
   /// Function clears the IFR cache
-  int clear_ifr_cache (void);
+  int clear_ifr_cache ();
 
 private:
   /// The POAs used to activate "supplier-side" and "consumer-side"
@@ -339,10 +339,10 @@ class TAO_Event_Serv_Export TAO_CEC_Param
 {
 public:
   /// Constructor
-  TAO_CEC_Param (void);
+  TAO_CEC_Param ();
 
   /// Destructor
-  ~TAO_CEC_Param (void);
+  ~TAO_CEC_Param ();
 
 private:
   /// Only the TypedEventChannel can read the private fields.
@@ -359,7 +359,7 @@ class TAO_Event_Serv_Export TAO_CEC_Operation_Params
   /// constructor
   TAO_CEC_Operation_Params (CORBA::ULong num_params);
   /// destructor
-  ~TAO_CEC_Operation_Params (void);
+  ~TAO_CEC_Operation_Params ();
 
 private:
   /// Only the TypedEventChannel can read the private fields.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
index b7e5dc7e0fd..61be2f67742 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
@@ -99,19 +99,19 @@ TAO_CEC_TypedEventChannel::destroy_proxy_collection (TAO_CEC_TypedProxyPushConsu
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_CEC_TypedEventChannel::typed_supplier_poa (void)
+TAO_CEC_TypedEventChannel::typed_supplier_poa ()
 {
   return PortableServer::POA::_duplicate (this->typed_supplier_poa_.in ());
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_CEC_TypedEventChannel::typed_consumer_poa (void)
+TAO_CEC_TypedEventChannel::typed_consumer_poa ()
 {
   return PortableServer::POA::_duplicate (this->typed_consumer_poa_.in ());
 }
 
 ACE_INLINE ACE_Lock*
-TAO_CEC_TypedEventChannel::create_consumer_lock (void)
+TAO_CEC_TypedEventChannel::create_consumer_lock ()
 {
   return this->factory_->create_consumer_lock ();
 }
@@ -123,7 +123,7 @@ TAO_CEC_TypedEventChannel::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_INLINE ACE_Lock*
-TAO_CEC_TypedEventChannel::create_supplier_lock (void)
+TAO_CEC_TypedEventChannel::create_supplier_lock ()
 {
   return this->factory_->create_supplier_lock ();
 }
@@ -171,18 +171,18 @@ TAO_CEC_TypedEventChannel::number_of_base_interfaces () const
 }
 
 ACE_INLINE TAO_CEC_TypedEventChannel::ServantRetryMap&
-TAO_CEC_TypedEventChannel::get_servant_retry_map (void)
+TAO_CEC_TypedEventChannel::get_servant_retry_map ()
 {
   return this->retry_map_;
 }
 
 ACE_INLINE
-TAO_CEC_Param::TAO_CEC_Param (void)
+TAO_CEC_Param::TAO_CEC_Param ()
 {
 }
 
 ACE_INLINE
-TAO_CEC_Param::~TAO_CEC_Param (void)
+TAO_CEC_Param::~TAO_CEC_Param ()
 {
 }
 
@@ -194,7 +194,7 @@ TAO_CEC_Operation_Params::TAO_CEC_Operation_Params (CORBA::ULong num_params)
 }
 
 ACE_INLINE
-TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void)
+TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params ()
 {
   delete [] parameters_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 016cb1c681c..d9fc5c8adca 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -43,14 +43,14 @@ public:
       const ACE_Time_Value &timeout);
 
   /// Destructor
-  virtual ~TAO_CEC_TypedProxyPushConsumer (void);
+  virtual ~TAO_CEC_TypedProxyPushConsumer ();
 
   /// Activate in the POA
   virtual void activate (
       CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy);
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -60,11 +60,11 @@ public:
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)...
   virtual void connect_push_supplier (
@@ -74,15 +74,15 @@ public:
 
   virtual void invoke (const TAO_CEC_TypedEvent& typed_event);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
-  virtual CORBA::Object_ptr get_typed_consumer (void);
+  virtual CORBA::Object_ptr get_typed_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 protected:
   /// The guard needs access to the following protected methods.
@@ -92,7 +92,7 @@ protected:
   CORBA::Boolean is_connected_i () const;
 
   /// Release the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and
   /// applies policies (when appropriate) to supplier_.
@@ -156,7 +156,7 @@ public:
       TAO_CEC_TypedProxyPushConsumer *proxy);
 
   /// Destructor
-  ~TAO_CEC_TypedProxyPushConsumer_Guard (void);
+  ~TAO_CEC_TypedProxyPushConsumer_Guard ();
 
   /// Returns 1 if the reference count successfully acquired
   int locked () const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index 3fd23168cfe..c15b44ebe17 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -39,7 +39,7 @@ public:
    TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel* event_channel);
 
   /// Destructor
-  virtual ~TAO_CEC_TypedSupplierAdmin (void);
+  virtual ~TAO_CEC_TypedSupplierAdmin ();
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker);
@@ -51,7 +51,7 @@ public:
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
   virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
@@ -62,13 +62,13 @@ public:
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (void);
+    obtain_push_consumer ();
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer (void);
+    obtain_pull_consumer ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 88506cad928..b8154a68990 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -30,14 +30,4 @@ project(CosNaming_Serv) : cosnaming_serv_persistence, orbsvcslib, orbsvcs_output
   Pkgconfig_Files {
     TAO_CosNaming_Serv.pc.in
   }
-
-  verbatim(gnuace, local) {
-    ## The optimizer in cxx (as of V6.5-014) is broken.  Evidence can
-    ## be found in the iterator portion of Simple_Naming test
-    ifeq ($(CXX), cxx)
-      ifeq ($(findstring Tru64, $(ACE_DU_SUBVERSION)), Tru64)
-        OCFLAGS += -O0
-      endif
-    endif
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
index be736a7c572..50b35d37d89 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
@@ -10,49 +10,49 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::remove (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::remove ()
 {
   return 0;
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::acquire (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::acquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::release (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::release ()
 {
   return this->adaptee_->idle ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::acquire_read (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::acquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::acquire_write (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::acquire_write ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_read (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write (void)
+int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write ()
 {
   return this->adaptee_->busy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 62fdae62ef7..3009b5ec526 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_ESF_Copy_On_Read (void)
+    TAO_ESF_Copy_On_Read ()
 {
 }
 
@@ -101,7 +101,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
-TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown (void)
+TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index fd1535e5e4c..0978a668656 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -11,14 +11,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
-TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt ()
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   return this->refcount_++;
 }
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
-TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt ()
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   {
@@ -41,7 +41,7 @@ TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_ESF_Copy_On_Write (void)
+    TAO_ESF_Copy_On_Write ()
       :  pending_writes_ (0),
          writing_ (0),
          cond_ (mutex_)
@@ -51,7 +51,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    ~TAO_ESF_Copy_On_Write (void)
+    ~TAO_ESF_Copy_On_Write ()
 {
   ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->mutex_);
 
@@ -119,7 +119,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
-TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::shutdown (void)
+TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::shutdown ()
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -175,7 +175,7 @@ TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    ~TAO_ESF_Copy_On_Write_Write_Guard (void)
+    ~TAO_ESF_Copy_On_Write_Write_Guard ()
 {
   Collection *tmp = 0;
   {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
index 39f67a9b21f..0a14eefb447 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class COLLECTION, class ITERATOR> ACE_INLINE
 TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
-    TAO_ESF_Copy_On_Write_Collection (void)
+    TAO_ESF_Copy_On_Write_Collection ()
       :  refcount_ (1)
 {
 }
@@ -24,7 +24,7 @@ TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
 
 template<class COLLECTION, class ITERATOR, class ACE_LOCK> ACE_INLINE
 TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
-    ~TAO_ESF_Copy_On_Write_Read_Guard (void)
+    ~TAO_ESF_Copy_On_Write_Read_Guard ()
 {
   if (this->collection != 0)
     {
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/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 56ddea2d0a4..a84699fa475 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -14,7 +14,7 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    ~TAO_ESF_Peer_Admin (void)
+    ~TAO_ESF_Peer_Admin ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 47dc3e6d917..ee2b608dbda 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -19,14 +19,14 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE>
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    ~TAO_ESF_Proxy_Admin (void)
+    ~TAO_ESF_Proxy_Admin ()
 {
   this->event_channel_->destroy_proxy_collection (this->collection_);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    obtain (void)
+    obtain ()
 {
   PROXY* proxy;
   this->event_channel_->create_proxy (proxy);
@@ -44,7 +44,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
-TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::shutdown (void)
+TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::shutdown ()
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index ceb4b3ab3f3..dbb9b9cfa80 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -55,7 +55,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * /// activate the proxy and return the object reference
  * PROXY::_ptr_type
- * PROXY::activate (void) throw ();
+ * PROXY::activate () throw ();
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
index 64154fe0806..5377484a4ba 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // ****************************************************************
 
 template<class PROXY>
-TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection (void)
+TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index ff57ce85e4e..22783936d19 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY>
-TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void)
+TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List ()
 {
 }
 
@@ -72,7 +72,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (void)
+TAO_ESF_Proxy_List<PROXY>::shutdown ()
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
index 34c682b59a6..8b83bc94e07 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
@@ -2,13 +2,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
-TAO_ESF_Proxy_List<PROXY>::begin (void)
+TAO_ESF_Proxy_List<PROXY>::begin ()
 {
   return this->impl_.begin ();
 }
 
 template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
-TAO_ESF_Proxy_List<PROXY>::end (void)
+TAO_ESF_Proxy_List<PROXY>::end ()
 {
   return this->impl_.end ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 462e0542d1b..cae70aec586 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY>
-TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree ()
 {
 }
 
@@ -70,7 +70,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown ()
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
index a5cf13695a9..69291d20800 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
@@ -23,7 +23,7 @@ TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator != (
 }
 
 template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>&
-TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator++ (void)
+TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator++ ()
 {
   ++this->impl_;
   return *this;
@@ -38,7 +38,7 @@ TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator++ (int)
 }
 
 template<class PROXY> ACE_INLINE PROXY*
-TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator *(void)
+TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator *()
 {
   return (*this->impl_).key ();
 }
@@ -46,13 +46,13 @@ TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator *(void)
 // ****************************************************************
 
 template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>
-TAO_ESF_Proxy_RB_Tree<PROXY>::begin (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::begin ()
 {
   return Iterator (this->impl_.begin ());
 }
 
 template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>
-TAO_ESF_Proxy_RB_Tree<PROXY>::end (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::end ()
 {
   return Iterator (this->impl_.end ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
index 5ee83f5becd..c8674165ac5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EC, class P>
-TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void)
+TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard ()
 {
   // Checking for 0 is safe, once the variable reaches 0 the value
   // will stay there.
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index a60a7f02583..f69967a1709 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -8,5 +8,4 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 #endif /* TAO_ESF_REFCOUNT_GUARD_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
index 590b187dae9..d62013e40c0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
@@ -11,7 +11,7 @@ TAO_ESF_RefCount_Guard<T>::
 
 template<class T> ACE_INLINE
 TAO_ESF_RefCount_Guard<T>::
-    ~TAO_ESF_RefCount_Guard (void)
+    ~TAO_ESF_RefCount_Guard ()
 {
   --this->refcount_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
index bf44a389032..21341d12802 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
@@ -6,7 +6,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class Object>
-TAO_ESF_Worker<Object>::~TAO_ESF_Worker (void)
+TAO_ESF_Worker<Object>::~TAO_ESF_Worker ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index c44cadd0a86..f1ceb4aa5b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -39,7 +39,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTEvent_Serv_Export TAO_ECG_Handler_Shutdown
 {
 public:
-
   // Define virtual destructor to make sure we can delete derived
   // objects through a pointer to TAO_ECG_Handler_Shutdown.
   virtual ~TAO_ECG_Handler_Shutdown ();
@@ -57,7 +56,6 @@ public:
 class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler
 {
 public:
-
   virtual ~TAO_ECG_Dgram_Handler ();
 
   virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index d0bfcaf73f8..5115cfd085c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -28,7 +28,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base
   : public virtual POA_RtecUDPAdmin::AddrServer
 {
 public:
-
   virtual int init (const char *arg) = 0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index 199834e90fc..bf0363145ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -86,7 +86,6 @@ public:
   char* fragment_buffer (CORBA::ULong fragment_offset);
 
 private:
-
   TAO_ECG_UDP_Request_Entry (const TAO_ECG_UDP_Request_Entry & rhs);
   TAO_ECG_UDP_Request_Entry& operator= (const TAO_ECG_UDP_Request_Entry & rhs);
 
@@ -176,7 +175,6 @@ public:
   static TAO_ECG_UDP_Request_Entry Request_Completed_;
 
 private:
-
   enum {
     ECG_DEFAULT_MAX_FRAGMENTED_REQUESTS = 1024,
     ECG_DEFAULT_FRAGMENTED_REQUESTS_MIN_PURGE_COUNT = 32
@@ -190,7 +188,6 @@ private:
                                ACE_Null_Mutex> Request_Map;
 
 private:
-
   /// Returns 1 on success, 0 if <request_id> has already been
   /// received or is below current request range, and -1 on error.
   int mark_received (const ACE_INET_Addr &from,
@@ -208,7 +205,6 @@ private:
   Request_Map::ENTRY* get_source_entry (const ACE_INET_Addr &from);
 
 private:
-
   /// Ignore any events coming from this IP address.
   TAO_ECG_Refcounted_Endpoint ignore_from_;
 
@@ -257,7 +253,6 @@ struct TAO_ECG_CDR_Message_Receiver::Mcast_Header
 class TAO_ECG_CDR_Message_Receiver::Requests
 {
 public:
-
   Requests ();
   ~Requests ();
 
@@ -274,7 +269,6 @@ public:
   TAO_ECG_UDP_Request_Entry ** get_request (CORBA::ULong request_id);
 
 private:
-
   /// Delete any outstanding requests with ids in the range
   /// [<purge_first>, <purge_last>] from <fragmented_requests> and
   /// and reset their slots.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
index ac3b70296da..0d595ebf4e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_ECG_CDR_Message_Receiver::Requests::Requests (void)
+TAO_ECG_CDR_Message_Receiver::Requests::Requests ()
   : fragmented_requests_ (0)
   , size_ (0)
   , id_range_low_ (0)
@@ -27,7 +27,7 @@ TAO_ECG_CDR_Message_Receiver::TAO_ECG_CDR_Message_Receiver (CORBA::Boolean crc)
 }
 
 ACE_INLINE
-TAO_ECG_CDR_Message_Receiver::~TAO_ECG_CDR_Message_Receiver (void)
+TAO_ECG_CDR_Message_Receiver::~TAO_ECG_CDR_Message_Receiver ()
 {
   this->shutdown ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index a218fb7f0d5..b07c2c26bc3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -10,7 +10,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
@@ -171,7 +170,6 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
     }
   // ACE_ASSERT (total_length == fragment_offset);
   // ACE_ASSERT (fragment_id == fragment_count);
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index d9ce3dd8bbb..c06a668793c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -73,7 +73,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Sender
 {
 public:
-
   enum {
     ECG_HEADER_SIZE = 32,
     ECG_MIN_MTU = 32 + 8,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
index c941146ebac..9197c1c7d42 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
@@ -12,7 +12,7 @@ TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc)
 }
 
 ACE_INLINE void
-TAO_ECG_CDR_Message_Sender::shutdown (void)
+TAO_ECG_CDR_Message_Sender::shutdown ()
 {
   // Release the endpoint.
   TAO_ECG_Refcounted_Endpoint empty_endpoint_rptr;
@@ -20,7 +20,7 @@ TAO_ECG_CDR_Message_Sender::shutdown (void)
 }
 
 ACE_INLINE ACE_SOCK_Dgram&
-TAO_ECG_CDR_Message_Sender::dgram (void)
+TAO_ECG_CDR_Message_Sender::dgram ()
 {
   ACE_ASSERT (this->endpoint_rptr_.get ());
   return this->endpoint_rptr_->dgram ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 5bb96c44b7b..7b911e886bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -46,7 +46,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server :
   public virtual POA_RtecUDPAdmin::AddrServer
 {
 public:
-
   /// Create a new TAO_ECG_Complex_Address_Server object.
   /*
    * (Constructor access is restricted to insure that all
@@ -75,7 +74,6 @@ public:
   void dump_content ();
 
 protected:
-
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_Complex_Address_Server objects using the static create()
   /// method.
@@ -84,7 +82,6 @@ protected:
   TAO_ECG_Complex_Address_Server (int is_source_mapping = 1);
 
 private:
-
   /// Helper.  Given key and mcast address in string form, add them to
   /// the mapping.
   int add_entry (const char * key, const char * mcast_addr);
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index 9c513ff2b77..925b755b3b7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -1,7 +1,6 @@
 #include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 8c36dc6b44c..59d75748768 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -13,7 +13,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 8afc5439610..881df9b925b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -51,7 +51,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_EH :
   public TAO_ECG_Handler_Shutdown
 {
 public:
-
   /// Initialization and termination methods.
   //@{
   /**
@@ -97,7 +96,6 @@ public:
   virtual int handle_input (ACE_HANDLE fd);
 
 private:
-
   /**
    * @class Observer
    *
@@ -211,7 +209,6 @@ private:
     void execute ();
 
   private:
-
     RtecEventChannelAdmin::Observer_Handle handle_;
     RtecEventChannelAdmin::EventChannel_var ec_;
   };
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
index 332d4f0d465..7e6de94975c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_ECG_Mcast_EH::
-Observer_Disconnect_Command::Observer_Disconnect_Command (void)
+Observer_Disconnect_Command::Observer_Disconnect_Command ()
   : handle_ ()
   , ec_ ()
 {
@@ -42,7 +42,7 @@ Observer_Disconnect_Command::operator= (
 
 ACE_INLINE void
 TAO_ECG_Mcast_EH::
-Observer_Disconnect_Command::execute (void)
+Observer_Disconnect_Command::execute ()
 {
   if (CORBA::is_nil (this->ec_.in ()))
     // We are not connected.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index a34a07843f8..dddb8ab6772 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -125,7 +125,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_Gateway
   : public ACE_Service_Object
 {
 public:
-
   /// The Service_Object entry points.
   //@{
   virtual int init (int argc, ACE_TCHAR* argv[]);
@@ -219,7 +218,6 @@ public:
             RtecEventChannelAdmin::EventChannel_ptr ec);
 
 private:
-
   /// Helpers.
   //@{
   /// Check that arguments to run() are not nil.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
index 1b18f69c414..240421f0405 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void)
+TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway ()
   : service_type_ (TAO_ECG_DEFAULT_SERVICE)
   , handler_type_ (TAO_ECG_DEFAULT_HANDLER)
   , address_server_type_ (TAO_ECG_DEFAULT_ADDRESS_SERVER)
@@ -17,7 +17,7 @@ TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void)
 }
 
 ACE_INLINE
-TAO_ECG_Mcast_Gateway::Attributes::Attributes (void)
+TAO_ECG_Mcast_Gateway::Attributes::Attributes ()
   : address_server_type (TAO_ECG_DEFAULT_ADDRESS_SERVER)
   , handler_type (TAO_ECG_DEFAULT_HANDLER)
   , service_type (TAO_ECG_DEFAULT_SERVICE)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 04b881ae603..fd3a321051d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -7,7 +7,6 @@
 #include "ace/Reactor.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_Reactive_ConsumerEC_Control::
@@ -175,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)
     {
@@ -195,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/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 018b710de09..bdba1aba31a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -5,7 +5,6 @@
 #include "ace/Reactor.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_Reconnect_ConsumerEC_Control::
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 267cea8f0c9..c79bf550925 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -28,7 +28,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server :
   public virtual POA_RtecUDPAdmin::AddrServer
 {
 public:
-
   /// Create a new TAO_ECG_Simple_Address_Server object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_Simple_Address_Server objects are heap-allocated.)
@@ -46,7 +45,6 @@ public:
                             RtecUDPAdmin::UDP_Address_out addr6);
 
 protected:
-
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_Simple_Address_Server objects using the static create()
   /// method.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
index 833ca1df6bb..41e0a41a768 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableServer::Servant_var<TAO_ECG_Simple_Address_Server>
-TAO_ECG_Simple_Address_Server::create (void)
+TAO_ECG_Simple_Address_Server::create ()
 {
   PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> s;
   ACE_NEW_RETURN (s,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index 69c5ac53150..5281a8e75a6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -38,7 +38,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Mcast_EH
   , public TAO_ECG_Handler_Shutdown
 {
 public:
-
   /// Initialization and termination methods.
   //@{
   /// Constructor.
@@ -70,7 +69,6 @@ public:
   virtual int handle_input (ACE_HANDLE fd);
 
 private:
-
   // Socket on which we listen for messages.
   ACE_SOCK_Dgram_Mcast dgram_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index 49ff6f35ecf..36d9075a0fd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -8,7 +8,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
index 0d865c992c5..a5a194fd14d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -43,7 +43,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_EH :
 , public TAO_ECG_Handler_Shutdown
 {
 public:
-
   /// Initialization and termination methods.
   //@{
   /// Constructor.
@@ -81,7 +80,6 @@ public:
   ACE_SOCK_Dgram &dgram ();
 
 private:
-
   /// The datagram used to receive the data.
   ACE_SOCK_Dgram dgram_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
index 43231a83b01..c2dce190a86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_SOCK_Dgram&
-TAO_ECG_UDP_EH::dgram (void)
+TAO_ECG_UDP_EH::dgram ()
 {
   return this->dgram_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 6f238efb3c1..1a8404f7906 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -8,7 +8,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
index 331d9ac2bdf..51ec31d56c3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
@@ -4,7 +4,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void)
+TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint ()
   : request_id_generator_ (static_cast<CORBA::ULong> (ACE_OS::time (0))),
     port_number_ (0),
     if_count_ (0),
@@ -22,13 +22,13 @@ TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoi
 }
 
 ACE_INLINE ACE_SOCK_Dgram&
-TAO_ECG_UDP_Out_Endpoint::dgram (void)
+TAO_ECG_UDP_Out_Endpoint::dgram ()
 {
   return this->dgram_;
 }
 
 ACE_INLINE CORBA::ULong
-TAO_ECG_UDP_Out_Endpoint::next_request_id (void)
+TAO_ECG_UDP_Out_Endpoint::next_request_id ()
 {
   return this->request_id_generator_++;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 68532c6b4b0..0a0abc3db9c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -84,7 +84,6 @@ public:
   void execute ();
 
 private:
-
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy_;
 };
 
@@ -104,10 +103,8 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver :
   , public virtual TAO_ECG_Dgram_Handler
 {
 public:
-
   /// Initialization and termination methods.
   //@{
-
   /// Create a new TAO_ECG_UDP_Receiver object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_UDP_Receiver objects are heap-allocated.)
@@ -186,13 +183,11 @@ public:
   virtual int handle_input (ACE_SOCK_Dgram& dgram);
 
 protected:
-
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_UDP_Receiver objects using the static create() method.
   TAO_ECG_UDP_Receiver (CORBA::Boolean perform_crc = false);
 
 private:
-
   /// Helpers for the connect() method.
   //@{
   // Establishes connection to the Event Channel for the first time.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index 6b6aec4d55c..6f112ad9d8c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_ECG_UDP_Receiver_Disconnect_Command::
-TAO_ECG_UDP_Receiver_Disconnect_Command (void)
+TAO_ECG_UDP_Receiver_Disconnect_Command ()
   : proxy_ ()
 {
 }
@@ -41,7 +41,7 @@ TAO_ECG_UDP_Receiver_Disconnect_Command::operator= (
 
 ACE_INLINE void
 TAO_ECG_UDP_Receiver_Disconnect_Command::
-execute (void)
+execute ()
 {
   if (CORBA::is_nil (this->proxy_.in ()))
     // We are not connected.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 67f29c6fc14..63d5482588f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -83,7 +83,6 @@ public:
   void execute ();
 
 private:
-
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy_;
 };
 
@@ -101,10 +100,8 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender :
   public TAO_EC_Deactivated_Object
 {
 public:
-
   /// Initialization and termination methods.
   //@{
-
   /// Create a new TAO_ECG_UDP_Sender object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_UDP_Sender objects are heap-allocated.)
@@ -175,13 +172,11 @@ public:
   //@}
 
 protected:
-
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_UDP_Sender objects using the static create() method.
   TAO_ECG_UDP_Sender (CORBA::Boolean crc = 0);
 
 private:
-
   /// Helpers for the connect() method.
   //@{
   // Establishes connection to the Event Channel for the first time.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index e800afa98bb..d8d47b0bf03 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -44,7 +44,7 @@ TAO_ECG_UDP_Sender::get_local_addr (ACE_INET_Addr& addr)
 
 ACE_INLINE
 TAO_ECG_UDP_Sender_Disconnect_Command::
-TAO_ECG_UDP_Sender_Disconnect_Command (void)
+TAO_ECG_UDP_Sender_Disconnect_Command ()
   : proxy_ ()
 {
 }
@@ -77,7 +77,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::operator= (
 }
 
 ACE_INLINE void
-TAO_ECG_UDP_Sender_Disconnect_Command::execute (void)
+TAO_ECG_UDP_Sender_Disconnect_Command::execute ()
 {
   if (CORBA::is_nil (this->proxy_.in ()))
     // We are not connected.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
index 4a3430d6980..6cbc48c6989 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
@@ -10,49 +10,49 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::remove (void)
+int TAO_EC_Busy_Lock_Adapter<T>::remove ()
 {
   return 0;
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire (void)
+int TAO_EC_Busy_Lock_Adapter<T>::acquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire (void)
+int TAO_EC_Busy_Lock_Adapter<T>::tryacquire ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::release (void)
+int TAO_EC_Busy_Lock_Adapter<T>::release ()
 {
   return this->adaptee_->idle ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire_read (void)
+int TAO_EC_Busy_Lock_Adapter<T>::acquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire_write (void)
+int TAO_EC_Busy_Lock_Adapter<T>::acquire_write ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_read (void)
+int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_read ()
 {
   return this->adaptee_->busy ();
 }
 
 template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write (void)
+int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write ()
 {
   return this->adaptee_->busy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index 49921468ef9..f60dd53129b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -35,14 +35,14 @@ public:
   // = The ACE_Lock methods, please check $ACE_ROOT/ace/Synch.h for
   // details.
 
-  int remove (void);
-  int acquire (void);
-  int tryacquire (void);
-  int release (void);
-  int acquire_read (void);
-  int acquire_write (void);
-  int tryacquire_read (void);
-  int tryacquire_write (void);
+  int remove ();
+  int acquire ();
+  int tryacquire ();
+  int release ();
+  int acquire_read ();
+  int acquire_write ();
+  int tryacquire_read ();
+  int tryacquire_write ();
 
 private:
   Adaptee* adaptee_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
index e6a6308afea..af798e51a7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Default_Factory::TAO_EC_Default_Factory (void)
+TAO_EC_Default_Factory::TAO_EC_Default_Factory ()
   :  dispatching_ (TAO_EC_DEFAULT_DISPATCHING),
      filtering_ (TAO_EC_DEFAULT_CONSUMER_FILTER),
      supplier_filtering_ (TAO_EC_DEFAULT_SUPPLIER_FILTER),
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 4230f1a6370..3f555a24f20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -37,7 +37,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushConsumer :
   public TAO_EC_ProxyPushConsumer
 {
 public:
-
   /// Constructor...
   TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
@@ -60,7 +59,6 @@ public:
   virtual void _remove_ref ();
 
 private:
-
   virtual PortableServer::ObjectId
          object_id ();
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index df5589db1f6..334928d75b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -34,7 +34,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier
     public TAO_EC_ProxyPushSupplier
 {
 public:
-
   /// Constructor...
   TAO_EC_Default_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
@@ -58,7 +57,6 @@ public:
   virtual void _remove_ref ();
 
 private:
-
   virtual PortableServer::ObjectId
             object_id ();
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index fac5d0fd162..c9701bf5525 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -96,7 +96,6 @@ protected:
 class TAO_RTEvent_Serv_Export TAO_EC_Dispatching_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
-
 #ifdef ACE_WIN32_VC14
   // Work around for Connect #2869042 Bugzilla #4215
   TAO_EC_Dispatching_Task (ACE_Thread_Manager *thr_manager, TAO_EC_Queue_Full_Service_Object *queue_full_service_object = 0);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
index d412117261f..0a705bed274 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Filter::TAO_EC_Filter (void)
+TAO_EC_Filter::TAO_EC_Filter ()
   :  parent_ (0)
 {
 }
@@ -33,7 +33,7 @@ TAO_EC_Filter::matches (const RtecEventComm::EventHeader& rhs,
 // ****************************************************************
 
 ACE_INLINE
-TAO_EC_Null_Filter::TAO_EC_Null_Filter (void)
+TAO_EC_Null_Filter::TAO_EC_Null_Filter ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 931b66be256..6d4f6ca041a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -49,7 +49,6 @@ public:
   virtual TAO_EC_Filter*
       build (TAO_EC_ProxyPushSupplier *supplier,
              RtecEventChannelAdmin::ConsumerQOS& qos) const = 0;
-
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
index 6a2b2f859fb..5001b5772cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder (void)
+TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 8ea47da59ff..91bd7ac2925 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -233,7 +233,6 @@ protected:
   /// proxy push consumer, if 0, we only use one proxy push consumer (the
   /// default) for all source ids.
   int use_consumer_proxy_map_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 4f8cf9d0039..c1f296e3dc5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -30,8 +30,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTSchedEvent_Export TAO_EC_Gateway_Sched : public TAO_EC_Gateway_IIOP
 {
 public:
-  TAO_EC_Gateway_Sched (void);
-  ~TAO_EC_Gateway_Sched (void);
+  TAO_EC_Gateway_Sched ();
+  ~TAO_EC_Gateway_Sched ();
 
   /**
    * To do its job this class requires to know the local and remote
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index df321abb0ab..168d5f1c7f5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -174,7 +174,6 @@ TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command()
 int
 TAO_EC_Kokyu_Push_Command::execute ()
 {
-
   try
     {
       //ORBSVCS_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index 14657975f06..d2b903dcaae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -60,8 +60,8 @@ public:
                             int sched_scope);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
@@ -74,7 +74,7 @@ public:
 private:
   ACE_Allocator *allocator_;
 
-  void setup_lanes (void);
+  void setup_lanes ();
 
   /// The dispatcher
   Kokyu::Dispatcher_Auto_Ptr dispatcher_;
@@ -96,12 +96,11 @@ public:
   TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator *allocator);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 protected:
   //Protected so can't be put on stack; must be dynamically allocated
-  virtual ~TAO_EC_Kokyu_Shutdown_Command (void);
-
+  virtual ~TAO_EC_Kokyu_Shutdown_Command ();
 };
 
 // ****************************************************************
@@ -116,11 +115,11 @@ public:
                              ACE_Allocator* allocator);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 protected:
   //Protected so can't be put on stack; must be dynamically allocated
-  virtual ~TAO_EC_Kokyu_Push_Command (void);
+  virtual ~TAO_EC_Kokyu_Push_Command ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
index 11dc877cd2a..3ce04b0af21 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
@@ -34,14 +34,14 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Factory : public TAO_EC_Default_Facto
 {
 public:
   /// Constructor
-  TAO_EC_Kokyu_Factory (void);
+  TAO_EC_Kokyu_Factory ();
 
   /// Helper function to register the Kokyu factory into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   /// destructor...
-  virtual ~TAO_EC_Kokyu_Factory (void);
+  virtual ~TAO_EC_Kokyu_Factory ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
index 99852966866..5e9ec37bbff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void)
+TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory ()
   :  TAO_EC_Default_Factory (),
      disp_sched_policy_ (ACE_SCHED_FIFO),
      disp_sched_scope_ (ACE_SCOPE_THREAD)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index d630ec559f2..a7dae431365 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -56,7 +56,7 @@ public:
                        RtecScheduler::Info_Type_t info_type);
 
   /// Destructor
-  virtual ~TAO_EC_Kokyu_Filter (void);
+  virtual ~TAO_EC_Kokyu_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
@@ -71,7 +71,7 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
+  virtual void clear ();
   virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
@@ -83,7 +83,7 @@ private:
   TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
   /// Compute a new qos_info to push up.
   void compute_qos_info (TAO_EC_QOS_Info& qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
index 7824e07cfa3..a2191c9ab15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
@@ -45,7 +45,7 @@ public:
   TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Kokyu_Filter_Builder (void);
+  virtual ~TAO_EC_Kokyu_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 74dfe4af919..b850ebd6723 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -42,7 +42,7 @@ public:
   TAO_EC_Kokyu_Scheduling (RtecScheduler::Scheduler_ptr scheduler);
 
   /// Destructor
-  virtual ~TAO_EC_Kokyu_Scheduling (void);
+  virtual ~TAO_EC_Kokyu_Scheduling ();
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
@@ -56,7 +56,7 @@ private:
   TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index f95099e6ab0..c97ba05367f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -81,7 +81,6 @@ public:
   PortableServer::POA_var poa () const;
 
 private:
-
   /// Disallow.
   //@{
   TAO_EC_Object_Deactivator (const TAO_EC_Object_Deactivator &rhs);
@@ -119,13 +118,11 @@ private:
 class TAO_RTEvent_Serv_Export TAO_EC_Deactivated_Object
 {
 public:
-
   /// Set deactivation state to that specified by the @a deactivator
   /// argument.
   void set_deactivator (TAO_EC_Object_Deactivator & deactivator);
 
 protected:
-
   TAO_EC_Deactivated_Object ();
   ~TAO_EC_Deactivated_Object ();
 
@@ -158,7 +155,6 @@ public:
   void init (CORBA::ORB_var orb_var);
 
 private:
-
   /// Disallow.
   //@{
   TAO_EC_ORB_Holder & operator= (const TAO_EC_ORB_Holder &rhs);
@@ -194,7 +190,6 @@ public:
   void init (RtecEventChannelAdmin::EventChannel_var ec_var);
 
 private:
-
   /// Disallow.
   //@{
   TAO_EC_Event_Channel_Holder & operator= (const TAO_EC_Event_Channel_Holder &rhs);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
index f37cc2d6a4b..3b11819fdf5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void)
+TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator ()
   : poa_ ()
   , id_ ()
   , deactivate_ (0)
@@ -20,7 +20,7 @@ TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (
 }
 
 ACE_INLINE void
-TAO_EC_Object_Deactivator::deactivate (void)
+TAO_EC_Object_Deactivator::deactivate ()
 {
   if (this->deactivate_ && !CORBA::is_nil (this->poa_.in ()))
   {
@@ -37,7 +37,7 @@ TAO_EC_Object_Deactivator::deactivate (void)
 }
 
 ACE_INLINE
-TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator (void)
+TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator ()
 {
   this->deactivate ();
 }
@@ -49,13 +49,13 @@ TAO_EC_Object_Deactivator::poa () const
 }
 
 ACE_INLINE void
-TAO_EC_Object_Deactivator::allow_deactivation (void)
+TAO_EC_Object_Deactivator::allow_deactivation ()
 {
   this->deactivate_ = 1;
 }
 
 ACE_INLINE void
-TAO_EC_Object_Deactivator::disallow_deactivation (void)
+TAO_EC_Object_Deactivator::disallow_deactivation ()
 {
   this->deactivate_ = 0;
 }
@@ -84,13 +84,13 @@ TAO_EC_Object_Deactivator::set_values (TAO_EC_Object_Deactivator & deactivator)
 // ****************************************************************
 
 ACE_INLINE
-TAO_EC_Deactivated_Object::TAO_EC_Deactivated_Object (void)
+TAO_EC_Deactivated_Object::TAO_EC_Deactivated_Object ()
   : deactivator_ ()
 {
 }
 
 ACE_INLINE
-TAO_EC_Deactivated_Object::~TAO_EC_Deactivated_Object (void)
+TAO_EC_Deactivated_Object::~TAO_EC_Deactivated_Object ()
 {
   // Prevent automatic deactivation in deactivator's destructor.
   this->deactivator_.disallow_deactivation ();
@@ -106,13 +106,13 @@ TAO_EC_Deactivated_Object::set_deactivator (
 // ****************************************************************
 
 ACE_INLINE
-TAO_EC_ORB_Holder::TAO_EC_ORB_Holder (void)
+TAO_EC_ORB_Holder::TAO_EC_ORB_Holder ()
   : orb_ ()
 {
 }
 
 ACE_INLINE
-TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder (void)
+TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder ()
 {
   if (!CORBA::is_nil (this->orb_.in ()))
   {
@@ -136,13 +136,13 @@ TAO_EC_ORB_Holder::init (CORBA::ORB_var orb_var)
 // ****************************************************************
 
 ACE_INLINE
-TAO_EC_Event_Channel_Holder::TAO_EC_Event_Channel_Holder (void)
+TAO_EC_Event_Channel_Holder::TAO_EC_Event_Channel_Holder ()
   : ec_ ()
 {
 }
 
 ACE_INLINE
-TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder (void)
+TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder ()
 {
   if (!CORBA::is_nil (this->ec_.in ()))
   {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 6b2ff5f2ae4..83fd3944ffa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -45,7 +45,7 @@ void activate (T & obj_ref,
  *
  * Template argument requirements:
  *
- * Has void execute (void); method which
+ * Has void execute (); method which
  * can throw ONLY CORBA exceptions.
  * Has default and copy constructors.
  */
@@ -82,7 +82,6 @@ public:
   void execute ();
 
 private:
-
   T target_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index 4b85ab2aaae..adfe4237b0e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
 ACE_INLINE
-TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void)
+TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command ()
   : command_ ()
   , allow_command_ (false)
 {
@@ -19,7 +19,7 @@ TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (const T & command)
 
 template <class T>
 ACE_INLINE
-TAO_EC_Auto_Command<T>::~TAO_EC_Auto_Command (void)
+TAO_EC_Auto_Command<T>::~TAO_EC_Auto_Command ()
 {
   this->execute ();
 }
@@ -46,7 +46,7 @@ TAO_EC_Auto_Command<T>::set_command (TAO_EC_Auto_Command<T> & auto_command)
 
 template <class T>
 ACE_INLINE void
-TAO_EC_Auto_Command<T>::execute (void)
+TAO_EC_Auto_Command<T>::execute ()
 {
   if (this->allow_command_)
     {
@@ -65,14 +65,14 @@ TAO_EC_Auto_Command<T>::execute (void)
 
 template <class T>
 ACE_INLINE void
-TAO_EC_Auto_Command<T>::allow_command (void)
+TAO_EC_Auto_Command<T>::allow_command ()
 {
   this->allow_command_ = true;
 }
 
 template <class T>
 ACE_INLINE void
-TAO_EC_Auto_Command<T>::disallow_command (void)
+TAO_EC_Auto_Command<T>::disallow_command ()
 {
   this->allow_command_ = false;
 }
@@ -82,7 +82,7 @@ TAO_EC_Auto_Command<T>::disallow_command (void)
 
 template <class T>
 ACE_INLINE
-TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command (void)
+TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command ()
   : target_ ()
 {
 }
@@ -96,7 +96,7 @@ TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command (T target)
 
 template <class T>
 ACE_INLINE void
-TAO_EC_Shutdown_Command<T>::execute (void)
+TAO_EC_Shutdown_Command<T>::execute ()
 {
   if (this->target_.in ())
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 0aabbbc08bc..615034df663 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -3,7 +3,6 @@
 
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 249dbb9e7ee..f323262abe0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -1,7 +1,6 @@
 #include "orbsvcs/Event/EC_Masked_Type_Filter.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Masked_Type_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index a64fc8b06f1..573a860d455 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -1,7 +1,6 @@
 #include "orbsvcs/Event/EC_Negation_Filter.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 8bc8ff7eab4..284b0d7d748 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -18,7 +18,6 @@
 #include "tao/ORB_Core.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Null_Factory::TAO_EC_Null_Factory ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index 141c3bd9b3b..a5bf9bac800 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -7,7 +7,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 void
 TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
index c30de3be660..22a28750a72 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
@@ -2,14 +2,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void)
+TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy ()
 {
 }
 
 // ****************************************************************
 
 ACE_INLINE
-TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry (void)
+TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry ()
   :  handle (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 74b29ea94cf..446b3e72b5f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -14,7 +14,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Per_Supplier_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 9aa1306d3b4..4ef991a850f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -14,7 +14,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 1908203fd0b..8afced46cac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -10,7 +10,6 @@
 #include "ace/Sched_Params.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index e610319f21f..8e6c9904924 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -55,8 +55,8 @@ public:
   TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base* ec);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 7f8bae66487..a0667e99cd9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -10,7 +10,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 206852bcafc..2b9c3de4272 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -41,7 +41,7 @@ public:
   TAO_EC_Priority_Scheduling (RtecScheduler::Scheduler_ptr scheduler);
 
   /// Destructor
-  virtual ~TAO_EC_Priority_Scheduling (void);
+  virtual ~TAO_EC_Priority_Scheduling ();
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
@@ -55,7 +55,7 @@ private:
   TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 65e699545b2..f361456a132 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -186,7 +186,6 @@ protected:
   /// Validate the connection to consumer on connect
   int consumer_validate_connection_;
 private:
-
   /// Template method hooks.
   virtual void refcount_zero_hook ();
   virtual void pre_dispatch_hook (RtecEventComm::EventSet&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
index 72b948b752f..06c05097c76 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
@@ -2,13 +2,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::suspend_connection_i (void)
+TAO_EC_ProxyPushSupplier::suspend_connection_i ()
 {
   this->suspended_ = 1;
 }
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::suspend_connection_locked (void)
+TAO_EC_ProxyPushSupplier::suspend_connection_locked ()
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
@@ -19,13 +19,13 @@ TAO_EC_ProxyPushSupplier::suspend_connection_locked (void)
 }
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::resume_connection_i (void)
+TAO_EC_ProxyPushSupplier::resume_connection_i ()
 {
   this->suspended_ = 0;
 }
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::resume_connection_locked (void)
+TAO_EC_ProxyPushSupplier::resume_connection_locked ()
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index bee04b5b3c7..d8a0d1104a8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -39,7 +39,6 @@ typedef ACE_Utils::Auto_Functor<
         TAO_EC_Supplier_Proxy_Disconnector;
 
 
-
 /**
  * @struct TAO_EC_Consumer_Proxy_Disconnect_Functor
  *
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
index e1ee9410d4b..f75178c929a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_QOS_Info::TAO_EC_QOS_Info (void)
+TAO_EC_QOS_Info::TAO_EC_QOS_Info ()
   :  rt_info (-1),
      preemption_priority (0),
      timer_id_ (-1)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 07ecf59d97c..64a79b50eff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -2,7 +2,6 @@
 #include "tao/RTCORBA/Priority_Mapping.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_RTCORBA_Dispatching::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index efb1073bf29..5c09eb57871 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -40,11 +40,11 @@ public:
                               RTCORBA::Current_ptr current);
 
   /// Destructor
-  ~TAO_EC_RTCORBA_Dispatching (void);
+  ~TAO_EC_RTCORBA_Dispatching ();
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 8c0d8d3723a..4d12df4083e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -4,7 +4,6 @@
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_RTCORBA_Factory::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index d643250f735..492ccc63240 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -41,7 +41,7 @@ public:
                           const RTCORBA::ThreadpoolLanes &lanes);
 
   /// destructor...
-  virtual ~TAO_EC_RTCORBA_Factory (void);
+  virtual ~TAO_EC_RTCORBA_Factory ();
 
   // Decorated methods...
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 585b4a0e10e..662a83b1532 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -14,7 +14,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Reactive_ConsumerControl::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index 1a2dee5f5d9..0148937adc8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -2,7 +2,6 @@
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index b76dc2aa4e7..a4edbf59e43 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -14,7 +14,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Reactive_SupplierControl::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index edc5a380c27..2404a9287d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -15,7 +15,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
index c2968bd2821..7174244826b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
@@ -33,10 +33,10 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Factory : public TAO_EC_Default_Facto
 {
 public:
   /// Constructor
-  TAO_EC_Sched_Factory (void);
+  TAO_EC_Sched_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Sched_Factory (void);
+  virtual ~TAO_EC_Sched_Factory ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
index 707e9dbd4e2..7c4c07c27b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Sched_Factory::TAO_EC_Sched_Factory (void)
+TAO_EC_Sched_Factory::TAO_EC_Sched_Factory ()
   :  TAO_EC_Default_Factory ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 99a0693f1f7..749f4fabdd4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -3,7 +3,6 @@
 #include "orbsvcs/Log_Macros.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Sched_Filter::
@@ -208,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/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 83731da3946..1998c4a2daa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -56,7 +56,7 @@ public:
                        RtecScheduler::Info_Type_t info_type);
 
   /// Destructor
-  virtual ~TAO_EC_Sched_Filter (void);
+  virtual ~TAO_EC_Sched_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
@@ -71,7 +71,7 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
+  virtual void clear ();
   virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
@@ -83,7 +83,7 @@ private:
   TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (void);
+  void init_rt_info ();
 
   /// Compute a new qos_info to push up.
   void compute_qos_info (TAO_EC_QOS_Info& qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 3df2fa9f386..ca4940982e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -14,7 +14,6 @@
 
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 110a2cbee86..63a08561ba7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -45,7 +45,7 @@ public:
   TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Sched_Filter_Builder (void);
+  virtual ~TAO_EC_Sched_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index ea13e8047b4..778c2086f39 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -2,7 +2,6 @@
 #include "orbsvcs/Event/EC_QOS_Info.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 6216f869b2c..731897ae5aa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -59,7 +59,6 @@ public:
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
                                TAO_EC_Supplier_Filter *filter) = 0;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index e31589276a4..dc6f1409a96 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -7,7 +7,6 @@
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 5519b5b9022..c91a5ce03f5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -1,7 +1,6 @@
 #include "orbsvcs/Event/EC_SupplierControl.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_SupplierControl::TAO_EC_SupplierControl ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 46ea1b4e70e..6efc05751f2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -7,7 +7,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 446058b3f45..ab000125751 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -1,7 +1,6 @@
 #include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 52af0795fc3..827973d288f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -12,7 +12,6 @@
 #include "ace/OS_NS_strings.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 unsigned long TAO_EC_TPC_debug_level;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index a08142d98ab..fc4299bf109 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -7,7 +7,6 @@
 #include "ace/Sched_Params.h"
 
 
-
 #define TETFSF(flag)  { #flag, flag }
 TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = {
 #if defined (ACE_HAS_THREADS)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
index 81f87cf51b5..185e3182d64 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
@@ -90,7 +90,6 @@ public:
   long default_priority () const;
 
 
-
   struct Supported_Flag
   {
     const char* n; /// Flag name, e.g., THR_NEW_LWP
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
index 9b8c73a7755..6686bfd2436 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void)
+TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 1ec13c1e230..713dc5e93f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -7,7 +7,6 @@
 #include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug
 
 
-
 // ****************************************************************
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 56ec593b2ea..15e693cfc85 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -1,7 +1,6 @@
 #include "orbsvcs/Event/EC_Type_Filter.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header)
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 3768edc213e..444d5e710c3 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -215,7 +215,6 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q
                   buf, qos.publications[i].dependency_info.number_of_calls));
         }
   ORBSVCS_DEBUG ((LM_DEBUG, "}\n"));
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
index 23ec7c5559d..a6267b29774 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
@@ -46,7 +46,7 @@ ACE_ConsumerQOS_Factory::insert_bitmasked_value (CORBA::ULong source_mask,
 }
 
 ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_null_terminator (void)
+ACE_ConsumerQOS_Factory::insert_null_terminator ()
 {
   RtecEventChannelAdmin::Dependency dependency;
   if (this->event_initializer_ != 0)
@@ -121,13 +121,13 @@ ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act)
 }
 
 ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS&
-ACE_ConsumerQOS_Factory::get_ConsumerQOS (void)
+ACE_ConsumerQOS_Factory::get_ConsumerQOS ()
 {
   return qos_;
 }
 
 ACE_INLINE
-ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (void)
+ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& ()
 {
   return qos_;
 }
@@ -135,13 +135,13 @@ ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (voi
 // ************************************************************
 
 ACE_INLINE const RtecEventChannelAdmin::SupplierQOS&
-ACE_SupplierQOS_Factory::get_SupplierQOS (void)
+ACE_SupplierQOS_Factory::get_SupplierQOS ()
 {
   return qos_;
 }
 
 ACE_INLINE
-ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (void)
+ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& ()
 {
   return qos_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index e07bb62982e..029d297772d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -36,13 +36,11 @@ class TAO_FT_ClientORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register FTCORBA policy factories.
   void register_policy_factories (
          PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 697bfb25d95..1c03d5c3e2b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -10,7 +10,6 @@ TAO_FT_ClientPolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &val)
 {
-
   if (type ==  FT::REQUEST_DURATION_POLICY)
     return TAO_FT_Request_Duration_Policy::create (val);
   else if (type == FT::HEARTBEAT_POLICY)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 77af6b0532a..23c63bfb18e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -39,7 +39,6 @@ class TAO_FT_ClientPolicyFactory
   , public ::CORBA::LocalObject
 {
 public:
-
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index f3203343855..26f075f4eb2 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -11,7 +11,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 379bc6d240b..4067c0f5236 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -45,7 +45,6 @@ class TAO_FT_Request_Duration_Policy
     public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_FT_Request_Duration_Policy (const TimeBase::TimeT& relative_expiry);
 
@@ -60,7 +59,7 @@ public:
   virtual TAO_FT_Request_Duration_Policy *clone () const;
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_policy_value (void);
+  virtual TimeBase::TimeT request_duration_policy_value ();
 
   virtual CORBA::PolicyType policy_type ();
 
@@ -90,7 +89,6 @@ class TAO_FT_Heart_Beat_Policy
     public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_FT_Heart_Beat_Policy (const CORBA::Boolean boolean,
                             const TimeBase::TimeT &interval,
@@ -107,7 +105,7 @@ public:
   virtual TAO_FT_Heart_Beat_Policy *clone () const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void);
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value ();
 
   virtual CORBA::PolicyType policy_type ();
 
@@ -120,7 +118,6 @@ public:
                        const TimeBase::TimeT &timebase);
 
 private:
-
   // The attributes
   /// <heartbeat_> indicates whether heartbeating is enabled or not.
   CORBA::Boolean heartbeat_;
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/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 7545b9f3f2f..aadb44617cf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -70,14 +70,13 @@ namespace TAO
       public virtual ::CORBA::LocalObject
   {
   public:
-
-    FT_ClientRequest_Interceptor (void);
+    FT_ClientRequest_Interceptor ();
 
     /// Canonical name of the interceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -92,11 +91,9 @@ namespace TAO
     void ft_send_extended_sc (CORBA::Boolean send);
 
   protected:
-
-    ~FT_ClientRequest_Interceptor (void);
+    ~FT_ClientRequest_Interceptor ();
 
   private:
-
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri,
                                 IOP::TaggedComponent* tp);
 
@@ -105,7 +102,6 @@ namespace TAO
     TimeBase::TimeT request_expiration_time (CORBA::Policy *policy);
 
   private:
-
     /// Name of the interceptor
     const char *name_;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index 5ae34829868..943e53fa019 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -39,13 +39,12 @@ class TAO_Service_Callbacks;
  */
 class TAO_FT_ClientORB_Export TAO_FT_ClientService_Activate : public TAO_Services_Activate
 {
-
 public:
   /// Constructor
-  TAO_FT_ClientService_Activate (void);
+  TAO_FT_ClientService_Activate ();
 
   /// The destructor
-  virtual ~TAO_FT_ClientService_Activate (void);
+  virtual ~TAO_FT_ClientService_Activate ();
 
   /**
    * Create and activate the service callbacks into the orb.
@@ -55,7 +54,7 @@ public:
   virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb);
 
   /// Used to force the initialization.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index c940fcd66a2..fb87f562364 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -41,19 +41,17 @@ class TAO_FT_ClientORB_Export TAO_FT_Endpoint_Selector_Factory
   : public TAO_Endpoint_Selector_Factory
 {
 public:
-
   /// Constructor.
-  TAO_FT_Endpoint_Selector_Factory (void);
+  TAO_FT_Endpoint_Selector_Factory ();
 
   /// Destructor.
-  virtual ~TAO_FT_Endpoint_Selector_Factory (void);
+  virtual ~TAO_FT_Endpoint_Selector_Factory ();
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
-
   /// The possible endpoint selector strategies that can be
   /// returned by this factory
   TAO_FT_Invocation_Endpoint_Selector *ft_endpoint_selector_;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index fd5333e870b..2875d17ab83 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -64,7 +64,6 @@ TAO_FT_IOGR_Property::set_property (
 
   // Success
   return 1;
-
 }
 
 
@@ -83,7 +82,6 @@ CORBA::Object_ptr
 TAO_FT_IOGR_Property::get_primary (
     CORBA::Object_ptr ior)
 {
-
   TAO_Profile *pfile =
     this->get_primary_profile (ior);
 
@@ -139,7 +137,6 @@ TAO_FT_IOGR_Property::get_primary (
   stub = safe_stub.release ();
 
   return new_obj._retn ();
-
 }
 
 
@@ -275,7 +272,6 @@ TAO_FT_IOGR_Property::encode_properties (
        i != 0;
        i = i->cont ())
     {
-
       ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
       buf += i->length ();
     }
@@ -339,7 +335,6 @@ TAO_FT_IOGR_Property::get_tagged_component (
        i < mprofile.profile_count ();
        i++)
     {
-
       // Get the Tagged Components
       const TAO_Tagged_Components &pfile_tagged =
         mprofile.get_profile (i)->tagged_components ();
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 2030c2ce1e5..d3e6fdf8935 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -53,14 +53,13 @@ class TAO_FT_ORB_Utils_Export TAO_FT_IOGR_Property
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Our Constructor
   TAO_FT_IOGR_Property (FT::TagFTGroupTaggedComponent &ft_group);
 
-  TAO_FT_IOGR_Property (void);
+  TAO_FT_IOGR_Property ();
 
   /// Destructor
-  ~TAO_FT_IOGR_Property (void);
+  ~TAO_FT_IOGR_Property ();
 
   /// Set the property for the IOGR
   virtual CORBA::Boolean set_property (
@@ -92,7 +91,6 @@ public:
       FT::TagFTGroupTaggedComponent &ft_group) const;
 
 private:
-
   /// An helper function that gets the primary profile from the <ior>
   TAO_Profile *get_primary_profile (CORBA::Object_ptr ior);
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
index 2c4dfc673ce..26839c1ca0e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
@@ -10,13 +10,13 @@ TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (
 }
 
 ACE_INLINE
-TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void)
+TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ()
   :ft_group_tagged_component_ (0)
 {
 }
 
 ACE_INLINE
-TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void)
+TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index 13abc9d8c9c..66820908834 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -44,13 +44,12 @@ class TAO_Profile;
 class TAO_FT_ClientORB_Export TAO_FT_Invocation_Endpoint_Selector :
   public TAO_Default_Endpoint_Selector
 {
-
 public:
   /// Constructor.
-  TAO_FT_Invocation_Endpoint_Selector (void);
+  TAO_FT_Invocation_Endpoint_Selector ();
 
   /// Destructor.
-  virtual ~TAO_FT_Invocation_Endpoint_Selector (void);
+  virtual ~TAO_FT_Invocation_Endpoint_Selector ();
 
   /// Implementation for FT. Please refer to
   /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h  for details of
@@ -77,8 +76,6 @@ protected:
   /// Helper method that checks whether the profile is a primary or
   /// not.
   bool check_profile_for_primary (TAO_Profile *);
-
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index d01446d25ab..47b9b4adb03 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -37,13 +37,11 @@ class TAO_FT_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register FTCORBA policy factories.
   void register_policy_factories (
          PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index e6e78f463cf..fa88107faef 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -29,19 +29,16 @@ class TAO_FT_ServerORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register FTCORBA policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index 39bfddf8c53..599125a5802 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -11,7 +11,6 @@ TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &val)
 {
-
   if (type == FT::HEARTBEAT_ENABLED_POLICY)
     return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index 8955540c4d3..f11eb4fc675 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -39,7 +39,6 @@ class TAO_FT_ServerPolicyFactory
   , public ::CORBA::LocalObject
 {
 public:
-
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 195f5c2bdce..813e82221fa 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -10,7 +10,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 8c6351a7475..a63ae4c0db0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -33,7 +33,6 @@ class TAO_FT_Heart_Beat_Enabled_Policy
   , public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_FT_Heart_Beat_Enabled_Policy (const CORBA::Boolean boolean);
 
@@ -59,7 +58,6 @@ public:
   virtual void destroy ();
 
 private:
-
   /// indicates whether heartbeating is enabled or not.
   CORBA::Boolean heartbeat_enabled_value_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 9b9b73dcc7b..998229a9e3a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -50,12 +50,11 @@ namespace TAO
     , public virtual ::CORBA::LocalObject
   {
   public:
-
     /// Constructor.
-    FT_ServerRequest_Interceptor (void);
+    FT_ServerRequest_Interceptor ();
 
     /// Destructor.
-    ~FT_ServerRequest_Interceptor (void);
+    ~FT_ServerRequest_Interceptor ();
 
     /**
      * @name Methods Required by the Server Request Interceptor
@@ -67,9 +66,9 @@ namespace TAO
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -87,14 +86,12 @@ namespace TAO
         PortableInterceptor::ServerRequestInfo_ptr ri);
     //@}
   private:
-
     void check_iogr_version (const IOP::ServiceContext &svc);
 
     void update_iogr (
         PortableInterceptor::ServerRequestInfo_ptr ri);
 
   private:
-
     CORBA::ULong object_group_ref_version_;
 
     CORBA::Boolean is_primary_;
@@ -103,7 +100,6 @@ namespace TAO
 
     CORBA::ORB_var orb_;
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
index b6b3ed984b7..14c9d4e103f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
@@ -37,17 +37,15 @@ class TAO_Service_Callbacks;
 class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate
 : public ACE_Service_Object
 {
-
 public:
   /// Constructor
-  TAO_FT_ServerService_Activate (void);
+  TAO_FT_ServerService_Activate ();
 
   /// The destructor
-  virtual ~TAO_FT_ServerService_Activate (void);
+  virtual ~TAO_FT_ServerService_Activate ();
 
   /// Used to force the initialization.
-  static int Initializer (void);
-
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 3b584bae7fb..b5ffc6489bf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -10,11 +10,11 @@ static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Service_Activate::TAO_FT_Service_Activate (void)
+TAO_FT_Service_Activate::TAO_FT_Service_Activate ()
 {
 }
 
-TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void)
+TAO_FT_Service_Activate::~TAO_FT_Service_Activate ()
 {
 }
 
@@ -34,7 +34,7 @@ TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core)
 
 
 int
-TAO_FT_Service_Activate::Initializer (void)
+TAO_FT_Service_Activate::Initializer ()
 {
   if (initialized == false)
     {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 2e87871cfb0..9133eee20a7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -82,7 +82,6 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj)
 
   // If it reaches here then it should be nill
   return true;
-
 }
 
 TAO_Service_Callbacks::Profile_Equivalence
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index 12ab8f07bca..ff12b16364a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -45,7 +45,7 @@ public:
   TAO_FT_Service_Callbacks (TAO_ORB_Core *);
 
   /// Dtor
-  virtual ~TAO_FT_Service_Callbacks (void);
+  virtual ~TAO_FT_Service_Callbacks ();
 
   /// Select the profile from MProfile as the needs of the services
   /// may be. Return the profile in @a pfile
@@ -83,15 +83,13 @@ public:
       IOP::ServiceContextList &clist,
       TAO_Profile *profile);
 
-  static TimeBase::TimeT now (void);
+  static TimeBase::TimeT now ();
 
 private:
-
   /// Check whether the right flags are available so that we can issue a
   /// restart.
   CORBA::Boolean restart_policy_check (IOP::ServiceContextList &service_list,
                                        const TAO_Profile *profile);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index fadd913af80..700e13be529 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -45,9 +45,9 @@ public:
   virtual ~FTRT_ClientORB_Interceptor ();
 
   /// Canonical name of the interceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
index b3b7c97a97a..23f28cdca78 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
@@ -29,15 +29,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Core;
 
 namespace TAO_FTRT {
-
   class TAO_FTRT_Export FTRT_ClientORB_Loader : public ACE_Service_Object
   {
   public:
     /// Constructor.
-    FTRT_ClientORB_Loader (void);
+    FTRT_ClientORB_Loader ();
 
     /// Destructor.
-    virtual ~FTRT_ClientORB_Loader (void);
+    virtual ~FTRT_ClientORB_Loader ();
 
     /// Initialize the TransactionDepth loader hooks.
     virtual int init (int argc,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index 9ffd20d4a17..b18e86faabf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -42,9 +42,9 @@ public:
                                    const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
                           CORBA::ULong object_group_ref_version);
-  virtual int  acquire_read (void);
-  virtual int  acquire_write (void);
-  virtual int  release (void);
+  virtual int  acquire_read ();
+  virtual int  acquire_write ();
+  virtual int  release ();
   PortableServer::POA_ptr poa() { return poa_.in(); }
   CORBA::ORB_ptr orb() { return orb_.in();}
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 4fd7c56358b..79863015432 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -43,9 +43,9 @@ public:
                           CORBA::ULong object_group_ref_version);
   virtual Replication_Strategy* make_primary_strategy();
 
-  virtual int  acquire_read (void);
-  virtual int  acquire_write (void);
-  virtual int  release (void);
+  virtual int  acquire_read ();
+  virtual int  acquire_write ();
+  virtual int  release ();
 private:
   bool mt_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
index ce33c43dcef..040c75ff3b2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -33,7 +33,7 @@ public:
   Basic_Replication_Strategy(bool mt);
   ~Basic_Replication_Strategy();
 
-  virtual void check_validity(void);
+  virtual void check_validity();
 
   virtual void replicate_request(const FTRT::State& state,
     RollbackOperation rollback,
@@ -41,9 +41,9 @@ public:
   virtual void add_member(const FTRT::ManagerInfo & info,
                           CORBA::ULong object_group_ref_version);
 
-  virtual int  acquire_read (void);
-  virtual int  acquire_write (void);
-  virtual int  release (void);
+  virtual int  acquire_read ();
+  virtual int  acquire_write ();
+  virtual int  release ();
 
 private:
   FTRT::SequenceNumber sequence_num_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index cf79e91b2a7..9972e1140e4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template <ACE_PEER_STREAM_1>
 int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
 {
-
   ACE_TRACE("ConnectionAcceptHandler::open\n");
   ACE_INET_Addr addr;
 
@@ -30,7 +29,7 @@ int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
 }
 
 template <ACE_PEER_STREAM_1>
-void ConnectionAcceptHandler<ACE_PEER_STREAM_2>::destroy (void)
+void ConnectionAcceptHandler<ACE_PEER_STREAM_2>::destroy ()
 {
   // Remove ourselves from the reactor
   reactor_->remove_handler
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
index cf3b2612c9f..f9299545913 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
@@ -26,10 +26,9 @@ class ConnectionAcceptHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_N
 {
 public:
   virtual int open (void *);
-  virtual void destroy (void);
+  virtual void destroy ();
   virtual int close (u_long flags = 0);
 protected:
-
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE,
                             ACE_Reactor_Mask);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 608a387eb5d..66c7d5aa763 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -54,11 +54,11 @@ public:
   TAO_FTEC_ConsumerAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_FTEC_ConsumerAdmin (void);
+  virtual ~TAO_FTEC_ConsumerAdmin ();
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
 
   void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index a0d88dd93f7..a86235cd2a5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -198,7 +198,6 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle)
 }
 
 
-
 CORBA::Boolean
 TAO_FTEC_Event_Channel::start (
         FTRT::FaultListener_ptr listener,
@@ -271,7 +270,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier (
       )
 {
   return ec_impl_->connect_push_supplier(push_supplier, qos);
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index 11214925e1c..700dae63847 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -26,8 +26,6 @@ class TAO_FTRTEC_Export TAO_FTEC_Event_Channel
   : public POA_FtRtecEventChannelAdmin::EventChannel
 {
 public:
-
-
   TAO_FTEC_Event_Channel(CORBA::ORB_var orb,
                          PortableServer::POA_var poa);
 
@@ -62,12 +60,12 @@ public:
   /// RtecEventChannelAdmin::EventChannel Interface
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void);
+    for_suppliers ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer);
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 1a346c32385..b36fce844bf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -187,7 +187,6 @@ TAO_FTEC_Event_Channel_Impl::TAO_FTEC_Event_Channel_Impl(
     CORBA::Object::_duplicate (attributes.scheduler);
 
   this->create_strategies ();
-
 }
 
 TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl()
@@ -210,7 +209,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object (
   const FtRtecEventComm::ObjectId& supplier_admin_oid,
   const FtRtecEventComm::ObjectId& consumer_admin_oid)
 {
-
   iogr_maker_.init(orb.in());
 
   TAO_EC_Event_Channel_Base::activate();
@@ -221,7 +219,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object (
 }
 
 
-
 // = The RtecEventChannelAdmin::EventChannel methods...
 /// The default implementation is:
 ///    this->consumer_admin ()->_this ();
@@ -414,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/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index ce4067245dd..6df055746ff 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -46,11 +46,11 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void);
+      for_consumers ();
 
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void);
+      for_suppliers ();
 
   void get_state (FtRtecEventChannelAdmin::EventChannelState & s);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
index 2af1bb60584..df517e027b1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
@@ -23,7 +23,7 @@ class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory
 {
 public:
     /// Constructor
-  TAO_FTEC_Basic_Factory (void);
+  TAO_FTEC_Basic_Factory ();
   virtual TAO_EC_ConsumerAdmin*
       create_consumer_admin (TAO_EC_Event_Channel_Base*);
   virtual TAO_EC_SupplierAdmin*
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
index 621833f7ec4..98136c537d7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
@@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_FTEC_Fault_Listener
 {
 public:
-  virtual ~TAO_FTEC_Fault_Listener(){};
+  virtual ~TAO_FTEC_Fault_Listener() = default;
   virtual void connection_closed()=0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 7d74d1cd4fc..f7ea13c4b68 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -16,7 +16,6 @@ void
 FTEC_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   Request_Context_Repository().allocate_slots(info);
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index a2715144718..a3e7005a425 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -38,7 +38,7 @@ public:
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
   void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index c962ed0542a..9f10f46185c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -26,7 +26,6 @@ void
 TAO_FTEC_ProxyPushSupplier::activate (
        RtecEventChannelAdmin::ProxyPushSupplier_ptr &result)
 {
-
   result =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil();
   try{
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index 9e90fabda7e..3f628c1aef3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -38,9 +38,9 @@ public:
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  virtual void disconnect_push_supplier (void);
-  virtual void suspend_connection (void);
-  virtual void resume_connection (void);
+  virtual void disconnect_push_supplier ();
+  virtual void suspend_connection ();
+  virtual void resume_connection ();
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index ec5d82947ef..e6903983dfa 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -57,12 +57,12 @@ public:
   TAO_FTEC_SupplierAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_FTEC_SupplierAdmin (void);
+  virtual ~TAO_FTEC_SupplierAdmin ();
 
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
 
   void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj);
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index 6b2201c1c7d..ee21cd18f36 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -36,7 +36,6 @@ public:
   CORBA::Object_var reference() const;
 
 protected:
-
   PortableServer::ServantBase* servant_;
   /// Store the default POA.
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index a2734de4911..61c8466e3ca 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -38,7 +38,7 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr
-FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
+FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy ()
 {
   CORBA::Any_var any = Request_Context_Repository().get_cached_result();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index 321a9cf12ec..1139e6aba01 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -31,7 +31,7 @@ public:
   FT_ProxyAdmin(EC_PROXY_ADMIN* admin,
               PortableServer::POA_var poa);
 
-  ProxyInterface_ptr obtain_proxy (void);
+  ProxyInterface_ptr obtain_proxy ();
 
   /// this is used for updating the state
   void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
index a7e4893d49e..533295d0a34 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
@@ -42,7 +42,6 @@ private:
   virtual int parse_conf(int argc, ACE_TCHAR** argv);
 
 protected:
-
   class ReactorTask : public ACE_Task_Base
   {
   public:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 80f63e40ab1..8e464918e14 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -43,7 +43,7 @@ namespace FTRTEC {
     if (argc > 0 && ACE_OS::strcasecmp (argv[0], ACE_TEXT("sctp")) == 0)
     {
 #if (TAO_HAS_SCIOP == 1)
-      ACE_auto_ptr_reset(detector_, detector);
+      detector_.reset (detector);
 #else
       ORBSVCS_DEBUG ((LM_DEBUG,
                   "(%P|%t) SCTP not enabled. ",
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index 7a7ea02de09..376a16b4004 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -122,7 +122,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c
 }
 
 
-
 void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   IOP::ServiceContext_var service_context;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index 7c710ced244..9cc00e07e80 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -26,9 +26,9 @@ public:
   ForwardCtrlServerInterceptor();
   ~ForwardCtrlServerInterceptor();
 
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index aa5763720eb..9cb1ef8e12c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -33,7 +33,6 @@ CachedRequestTable::update(const ACE_CString& client_id,
 }
 
 
-
 CORBA::Any
 CachedRequestTable::get_result(const ACE_CString& client_id)
 {
@@ -97,7 +96,6 @@ retrieve_ft_request_context(
 
   if ((cdr >> ft_request_service_context) == 0)
     throw CORBA::BAD_PARAM ();
-
 }
 
 FTRT::TransactionDepth
@@ -227,7 +225,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
     Request_Context_Repository().set_ft_request_service_context(ri, service_context);
 
     try{
-
       FTRT::TransactionDepth transaction_depth =
         get_transaction_depth_context(ri);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 3d239d3d4f4..b114e41ded6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -52,9 +52,9 @@ public:
   ~FtEventServiceInterceptor();
 
   static FtEventServiceInterceptor* instance();
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 4e757109620..b9355cbcd72 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -15,7 +15,6 @@ GroupInfoPublisherBase::GroupInfoPublisherBase()
 }
 
 
-
 void
 GroupInfoPublisherBase::subscribe(TAO_FTEC_Become_Primary_Listener* listener)
 {
@@ -46,7 +45,6 @@ GroupInfoPublisherBase::successor() const
 }
 
 
-
 const GroupInfoPublisherBase::BackupList&
 GroupInfoPublisherBase::backups() const
 {
@@ -54,7 +52,6 @@ GroupInfoPublisherBase::backups() const
 }
 
 
-
 GroupInfoPublisherBase::Info*
 GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
                                    int my_position,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index f3cc27ee85e..cda7e49566e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -164,7 +164,6 @@ IOGR_Maker::copy_ft_group_component(CORBA::Object_ptr ior)
 
        if (pfile_tagged.get_component (tagged_components) == 1)
        {
-
           // Grab the object group version
           // @@ NOTE: This involves an allocation and a dellocation. This is
           // really bad.
@@ -234,7 +233,6 @@ IOGR_Maker::set_tag_components(
     iorm_->set_property (&prop,
                         merged);
 
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index b1ea8b8744e..cf10ef2f7c5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -6,7 +6,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTRTEC {
-
   namespace {
     Identification_Service* service;
     const char oid[] = "\xF8\xB3\xB1\xFE\xAC\xC6\x07\x11\x02\x0C\x02\x50\xEB\x05\x77\xD0";
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8835c3a1bce..278683fe287 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -25,15 +25,15 @@ public:
 
   virtual void start_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void create_group (void);
+  virtual void create_group ();
 
   virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void add_member (void);
+  virtual void add_member ();
 
   virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void set_state (void);
+  virtual void set_state ();
 
   virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder);
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 52656b42fba..124d4dfaad5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -68,7 +68,7 @@ namespace FTRTEC
       TAO_FTRTEC::Log(3, ACE_TEXT("Basic replication strategy\n"));
     }
 
-     ACE_auto_ptr_reset (replication_strategy, strategy);
+     replication_strategy.reset (strategy);
 
       try
       {
@@ -104,7 +104,7 @@ namespace FTRTEC
     ACE_ASSERT(strategy);
 
     if (replication_strategy.get() != strategy) {
-      ACE_auto_ptr_reset(replication_strategy, strategy);
+      replication_strategy.reset (strategy);
     }
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 962232eeb7c..b541ee3dd86 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -43,7 +43,7 @@ namespace FTRTEC
     /**
      * Used for checking if the incoming replication message is out of sequence.
      */
-    void check_validity(void);
+    void check_validity();
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
       (const FtRtecEventChannelAdmin::ObjectId&);
@@ -64,9 +64,9 @@ namespace FTRTEC
     void add_member(const FTRT::ManagerInfo & info,
                     CORBA::ULong object_group_ref_version);
 
-    int  acquire_read (void);
-    int  acquire_write (void);
-    int  release (void);
+    int  acquire_read ();
+    int  acquire_write ();
+    int  release ();
 
     int threads() const;
   };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index eb3548f0770..ac2b5d01431 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -35,7 +35,7 @@ public:
    * used for basic replication strategy. It throws FTRT::OutOfSequence when the
    * incoming request is not valid.
    */
-    virtual void check_validity(void);
+    virtual void check_validity();
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
       (const FtRtecEventChannelAdmin::ObjectId&);
@@ -60,10 +60,9 @@ public:
 
   virtual Replication_Strategy* make_primary_strategy();
 
-  virtual int  acquire_read (void)=0;
-  virtual int  acquire_write (void)=0;
-  virtual int  release (void)=0;
-
+  virtual int  acquire_read () = 0;
+  virtual int  acquire_write () = 0;
+  virtual int  release () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index f146aa999f0..6308a9fb6ed 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -104,7 +104,6 @@ Request_Context_Repository::get_object_id(
   CORBA::Any_var a = ri->get_slot(object_id_slot);
 
   return ::get_object_id(a);
-
 }
 
 void
@@ -235,7 +234,6 @@ Request_Context_Repository::get_transaction_depth(
   FTRT::TransactionDepth result=0;
   a >>= result;
   return result;
-
 }
 
 FTRT::TransactionDepth
@@ -249,7 +247,6 @@ Request_Context_Repository::get_transaction_depth()
   FTRT::TransactionDepth result=0;
   a >>= result;
   return result;
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 9bd5e7faa23..6fbf24ee38e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -45,7 +45,6 @@ namespace PortableInterceptor
 class Request_Context_Repository
 {
 public:
-
   void init(CORBA::ORB_ptr orb);
 
   /**
@@ -57,14 +56,14 @@ public:
 
   void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id);
   void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id);
-  FtRtecEventChannelAdmin::ObjectId_var get_object_id(void);
+  FtRtecEventChannelAdmin::ObjectId_var get_object_id();
   FtRtecEventChannelAdmin::ObjectId_var
     get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri);
 
   void set_cached_result(PortableInterceptor::ServerRequestInfo_ptr ri,
                          const CORBA::Any& result);
 
-  CORBA::Any_ptr get_cached_result(void);
+  CORBA::Any_ptr get_cached_result();
   bool is_executed_request();
 
   void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri,
@@ -73,7 +72,7 @@ public:
   void set_sequence_number(FTRT::SequenceNumber);
   FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  FTRT::SequenceNumber get_sequence_number(void);
+  FTRT::SequenceNumber get_sequence_number();
 
   void set_ft_request_service_context(
     PortableInterceptor::ServerRequestInfo_ptr ri,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index 569bc0bd463..554426a3701 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -44,10 +44,10 @@ public:
   virtual ~TAO_Set_Update_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index c62bf2a1164..6321701e459 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -31,7 +31,6 @@ FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate(
 }
 
 
-
 void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
 {
   PortableServer::Current_var current =
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index c2d71044d19..a3475e27e79 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -93,7 +93,7 @@ private:
   Interceptor_Destoryer();
   inline void do_it() {
     destroy_interceptors();
-  };
+  }
 };
 
 struct FTEC_Gateway_Impl
@@ -264,7 +264,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin()
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 FTEC_Gateway_ConsumerAdmin::obtain_push_supplier ()
 {
-
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
   ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY());
 
@@ -341,7 +340,6 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
   RtecEventComm::PushConsumer_ptr push_consumer,
   const RtecEventChannelAdmin::ConsumerQOS &qos)
 {
-
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
   *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index f4dbc0c5313..36488e0bbc6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -32,16 +32,16 @@ namespace TAO_FTRTEC
           (PortableServer::POA_ptr poa);
 
       RtecEventChannelAdmin::EventChannel_ptr
-        _this(void);
+        _this();
 
       //= The RtecEventChannelAdmin::EventChannel methods
       virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-        for_consumers (void);
+        for_consumers ();
 
       virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-        for_suppliers (void);
+        for_suppliers ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
 
       virtual RtecEventChannelAdmin::Observer_Handle
         append_observer (RtecEventChannelAdmin::Observer_ptr observer);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
index ac9edd8cd7a..2be05a261b6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
   ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
-    FTEC_Gateway::_this(void)
+    FTEC_Gateway::_this()
   {
     PortableServer::POA_var poa = _default_POA();
     return activate(poa.in());
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
index 56f1375fc9b..96234bbe088 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -10,7 +10,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
-
 unsigned int Log::log_level_;
 
 #ifndef NDEBUG
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
index 9c88345705f..44a5b6a5803 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
@@ -18,7 +18,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
-
   /**
    * A utility class for logging messages.
    */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 8e717c86814..a34987a965d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -11,7 +11,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO_FtRt
 {
-
 static union
 {
   struct
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index dc935b3e89e..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.
@@ -670,7 +669,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
   // the list of cached hostnames unless it is the only interface.
   size_t lo_cnt = 0;  // Loopback interface count
   for (size_t j = 0; j < if_cnt; ++j)
-    if (inet_addrs[j].get_ip_address () == INADDR_LOOPBACK)
+    if (inet_addrs[j].is_loopback ())
       lo_cnt++;
 
   // The instantiation for this template is in
@@ -705,7 +704,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
       // Ignore any loopback interface if there are other
       // non-loopback interfaces.
       if (if_cnt != lo_cnt &&
-          inet_addrs[i].get_ip_address() == INADDR_LOOPBACK)
+          inet_addrs[i].is_loopback ())
         continue;
 
       if (this->hostname_in_ior_ != 0)
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
index 8065b6d832a..4bd24ee4777 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
@@ -48,7 +48,6 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     // TAO HTIOP_Acceptor concrete call definition
 
     /**
@@ -67,14 +66,14 @@ namespace TAO
                 int is_inside);
 
       /// Destructor.
-      ~Acceptor (void);
+      ~Acceptor ();
 
       /// @@ Helper method for the implementation repository, should go
       ///    away
       const ACE::HTBP::Addr& address () const;
 
       /// Returns the array of endpoints in this acceptor
-      const ACE::HTBP::Addr *endpoints (void);
+      const ACE::HTBP::Addr *endpoints ();
 
       typedef TAO_Strategy_Acceptor<Completion_Handler, ACE_SOCK_ACCEPTOR> BASE_ACCEPTOR;
       typedef Creation_Strategy<Completion_Handler> CREATION_STRATEGY;
@@ -98,7 +97,7 @@ namespace TAO
                                 int version_minor,
                                 const char *options = 0);
 
-      virtual int close (void);
+      virtual int close ();
 
       virtual int create_profile (const TAO::ObjectKey &object_key,
                                   TAO_MProfile &mprofile,
@@ -106,7 +105,7 @@ namespace TAO
 
       virtual int is_collocated (const TAO_Endpoint *endpoint);
 
-      virtual CORBA::ULong endpoint_count (void);
+      virtual CORBA::ULong endpoint_count ();
 
       virtual int object_key (IOP::TaggedProfile &profile,
                               TAO::ObjectKey &key);
@@ -131,7 +130,6 @@ namespace TAO
                                   char *&host);
 
     protected:
-
       /**
        * Implement the common part of the open*() methods.  This method is
        * virtual to allow a derived class implementation to be invoked
@@ -172,7 +170,6 @@ namespace TAO
 
 
     protected:
-
       /// Array of ACE::HTBP::Addr instances, each one corresponding to a
       /// given network interface.
       ACE::HTBP::Addr *addrs_;
@@ -206,7 +203,6 @@ namespace TAO
       TAO_ORB_Core *orb_core_;
 
     private:
-
       /// the concrete acceptor, as a pointer to it's base class.
       BASE_ACCEPTOR base_acceptor_;
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
index 66763452d71..f35d706a1ba 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
@@ -15,7 +15,7 @@ TAO::HTIOP::Acceptor::address () const
 }
 
 ACE_INLINE const ACE::HTBP::Addr *
-TAO::HTIOP::Acceptor::endpoints (void)
+TAO::HTIOP::Acceptor::endpoints ()
 {
   ACE_ASSERT (this->addrs_ != 0);
 
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/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
index 057d7ebe609..0f10f16345e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
@@ -34,7 +34,6 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     /**
      * @class Completion_Handler
      *
@@ -52,7 +51,6 @@ namespace TAO
 
     class HTIOP_Export Completion_Handler : public COMPLETION_BASE
     {
-
     public:
       Completion_Handler (ACE_Thread_Manager* t = 0);
       /// Constructor.
@@ -60,7 +58,7 @@ namespace TAO
                           CORBA::Boolean = false);
 
       /// Destructor.
-      ~Completion_Handler (void);
+      ~Completion_Handler ();
 
       /// Called by the <Strategy_Acceptor> when the handler is completely
       /// connected. Argument is unused.
@@ -71,7 +69,7 @@ namespace TAO
        */
       virtual int handle_input (ACE_HANDLE);
 
-      virtual int resume_handler (void);
+      virtual int resume_handler ();
       virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index de51d760b7e..6fd2aad59b2 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -94,7 +94,6 @@ TAO::HTIOP::Connection_Handler::open (void*)
   if (local_addr.is_ip_equal (remote_addr)
       && local_addr.get_port_number () == remote_addr.get_port_number ())
     {
-
       if (TAO_debug_level > 0)
         {
           ACE_TCHAR remote_as_string[MAXHOSTNAMELEN + 16];
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
index e887ac94801..8922faf363a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -33,7 +33,6 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     /**
      * @class HTIOP_Connection_Handler
      *
@@ -47,16 +46,14 @@ namespace TAO
     class HTIOP_Export Connection_Handler : public SVC_HANDLER,
                                             public TAO_Connection_Handler
     {
-
     public:
-
       Connection_Handler (ACE_Thread_Manager* t = 0);
 
       /// Constructor.
       Connection_Handler (TAO_ORB_Core *orb_core);
 
       /// Destructor.
-      ~Connection_Handler (void);
+      ~Connection_Handler ();
 
       /// Called by the <Strategy_Acceptor> when the handler is completely
       /// connected.  Argument is unused.
@@ -88,8 +85,8 @@ namespace TAO
       //@{
       /** @name Event Handler overloads
        */
-      virtual int resume_handler (void);
-      virtual int close_connection (void);
+      virtual int resume_handler ();
+      virtual int close_connection ();
       virtual int handle_input (ACE_HANDLE);
       virtual int handle_output (ACE_HANDLE);
       virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -97,7 +94,7 @@ namespace TAO
       //@}
 
       /// Add ourselves to Cache.
-      int add_transport_to_cache (void);
+      int add_transport_to_cache ();
 
       /// Process the <listen_list>
       int process_listen_point_list (::HTIOP::ListenPointList &listen_list);
@@ -113,7 +110,7 @@ namespace TAO
       /**
        * @name TAO_Connection Handler overloads
        */
-      virtual int release_os_resources (void);
+      virtual int release_os_resources ();
       virtual int handle_write_ready (const ACE_Time_Value *timeout);
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index abe63a47620..653d2051a81 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -115,7 +115,6 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *,
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout)
 {
-
   /**
    * \par
    * Connector is used only in the processes inside the firewall
@@ -311,7 +310,6 @@ TAO::HTIOP::Connector::cancel_svc_handler (
     return 0;
 
   return -1;
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index 1e9bfc1fcb7..4c11caf7fa0 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -72,7 +72,7 @@ namespace TAO
       Connector (ACE::HTBP::Environment *ht_env);
 
       /// Destructor.
-      ~Connector (void);
+      ~Connector ();
 
       /// @}
 
@@ -81,7 +81,7 @@ namespace TAO
       /// Transport_Connector.h
       /// {@
       int open (TAO_ORB_Core *orb_core);
-      int close (void);
+      int close ();
 
       TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -91,7 +91,6 @@ namespace TAO
       /// @}
 
     protected:
-
       // = The TAO_Connector methods, please check the documentation on
       // Transport_Connector.h
       int set_validate_endpoint (TAO_Endpoint *ep);
@@ -103,7 +102,7 @@ namespace TAO
 
       /// More TAO_Connector methods, please check the documentation on
       /// Transport_Connector.h
-      virtual TAO_Profile *make_profile (void);
+      virtual TAO_Profile *make_profile ();
 
       /// Cancel the passed cvs handler from the connector
       /// Its not clear what it means to cancel in HTIOP, since there's no
@@ -111,7 +110,6 @@ namespace TAO
       virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
     private:
-
       /// Return the remote endpoint, a helper function
       Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
index 110885ef92e..ad085c87184 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
@@ -15,7 +15,6 @@ Connect_Creation_Strategy (ACE_Thread_Manager* t,
     orb_core_ (orb_core),
     arg_ (arg)
 {
-
 }
 
 template <class SVC_HANDLER> int
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
index 7369d51747d..f1fcfa313db 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
@@ -33,7 +33,6 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     /**
      * @class HTIOP_Connect_Creation_Strategy
      *
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
index 507990b5ffd..dfb459d35d7 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
@@ -32,7 +32,6 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     class Connection_Handler;
 
     /**
@@ -45,12 +44,11 @@ namespace TAO
     class HTIOP_Export Endpoint : public TAO_Endpoint
     {
     public:
-
       friend class Profile;
       friend class TAO_SSLIOP_Profile;
 
       /// Default constructor.
-      Endpoint (void);
+      Endpoint ();
 
       /// Constructor.  This is the most efficient constructor since it
       /// does not require any address resolution processing.
@@ -69,24 +67,24 @@ namespace TAO
                 const char *htid);
 
       /// Destructor.
-      ~Endpoint (void);
+      ~Endpoint ();
 
       // = Implementation of abstract TAO_Endpoint methods.  See
       // Endpoint.h for their documentation.
 
-      virtual TAO_Endpoint *next (void);
+      virtual TAO_Endpoint *next ();
       virtual int addr_to_string (char *buffer, size_t length);
-      virtual void reset_hint (void);
+      virtual void reset_hint ();
 
       /// Makes a copy of <this>
-      virtual TAO_Endpoint *duplicate (void);
+      virtual TAO_Endpoint *duplicate ();
 
       /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
       /// endpoints are equivalent if their port and host are the same.
       CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
       /// Return a hash value for this object.
-      CORBA::ULong hash (void);
+      CORBA::ULong hash ();
 
       // Allocates memory and returns a copy of <this>
 
@@ -117,11 +115,10 @@ namespace TAO
       /// This object maintains ownership of this string.
       const char *htid (const char *h);
 
-      //Connection_Handler *&hint (void);
+      //Connection_Handler *&hint ();
       // Access to our <hint_>.
 
     private:
-
       /// Helper method for setting INET_Addr.
       int set (const ACE::HTBP::Addr &addr,
                int use_dotted_decimal_addresses);
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
index 473fded9872..8111e75da0c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
@@ -38,12 +38,11 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     class HTIOP_Export Protocol_Factory : public TAO_Protocol_Factory
     {
     public:
-      Protocol_Factory (void);
-      virtual ~Protocol_Factory (void);
+      Protocol_Factory ();
+      virtual ~Protocol_Factory ();
 
       // = Service Configurator hooks.
       /// Dynamic linking hook
@@ -60,8 +59,8 @@ namespace TAO
       virtual char options_delimiter () const;
 
       // = Check Protocol_Factory.h for a description of these methods.
-      virtual TAO_Acceptor  *make_acceptor (void);
-      virtual TAO_Connector *make_connector  (void);
+      virtual TAO_Acceptor  *make_acceptor ();
+      virtual TAO_Connector *make_connector  ();
       virtual int requires_explicit_endpoint () const;
 
     private:
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 624829ef98d..a70b23bbf4b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -85,7 +85,6 @@ TAO::HTIOP::Profile::~Profile ()
 int
 TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr)
 {
-
   // Decode host and port into the <endpoint_>.
   if (cdr.read_string (this->endpoint_.host_.out ()) == 0
       || cdr.read_ushort (this->endpoint_.port_) == 0
@@ -316,7 +315,6 @@ TAO::HTIOP::Profile::to_string () const
 }
 
 
-
 const char *
 TAO::HTIOP::Profile::prefix ()
 {
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index 86f83a5222e..4fe2f1cb8e8 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -35,7 +35,6 @@ namespace TAO
 {
   namespace HTIOP
   {
-
     // TAO HTIOP_Profile concrete Profile definitions
     /**
      * @class HTIOP_Profile
@@ -54,7 +53,7 @@ namespace TAO
       virtual char object_key_delimiter () const;
 
       /// Return the char string prefix.
-      static const char *prefix (void);
+      static const char *prefix ();
 
       /// Profile constructor, same as above except the object_key has
       /// already been marshaled.
@@ -77,7 +76,7 @@ namespace TAO
       Profile (TAO_ORB_Core *orb_core);
 
       /// Destructor is to be called only through <_decr_refcnt>.
-      ~Profile (void);
+      ~Profile ();
 
       /**
        * Return a string representation for this profile.
@@ -93,10 +92,10 @@ namespace TAO
        * encapsulation of a sequence of structs, each representing a
        * single endpoint.  Data format is specified in iiop_endpoins.pidl.
        */
-      virtual int encode_endpoints (void);
+      virtual int encode_endpoints ();
 
       /// Return pointer to the head of this profile's endpoints list.
-      virtual TAO_Endpoint *endpoint (void);
+      virtual TAO_Endpoint *endpoint ();
 
       /// Return how many endpoints this profile contains.
       virtual CORBA::ULong endpoint_count () const;
@@ -112,16 +111,14 @@ namespace TAO
       virtual CORBA::ULong hash (CORBA::ULong max);
 
     protected:
-
       /// Template methods. Please see Profile.h for the documentation.
       virtual int decode_profile (TAO_InputCDR &cdr);
-      virtual int decode_endpoints (void);
+      virtual int decode_endpoints ();
       virtual void parse_string_i (const char *string);
       virtual void create_profile_body (TAO_OutputCDR &cdr) const;
       virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
     protected:
-
       /**
        * Head of this profile's list of endpoints.  This endpoint is not
        * dynamically allocated because a profile always contains at least
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 296db0bad23..b70102efeff 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -76,7 +76,6 @@ TAO::HTIOP::Transport::recv (char *buf,
       TAO_debug_level > 4 &&
       errno != ETIME)
     {
-
       ORBSVCS_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, ")
                   ACE_TEXT ("read failure - %m"),
@@ -304,7 +303,6 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list,
 
   if (local_addr.get_port_number() != 0)
     {
-
       // Note: Looks like there is no point in sending the list of
       // endpoints on interfaces on which this connection has not
       // been established. If this is wrong, please correct me.
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 90944576a3a..647a19e5ea3 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -59,25 +59,22 @@ namespace TAO
     class HTIOP_Export Transport : public TAO_Transport
     {
     public:
-
       /// Constructor.
       Transport (Connection_Handler *handler,
                  TAO_ORB_Core *orb_core);
 
       /// Default destructor.
-      ~Transport (void);
+      ~Transport ();
 
     protected:
-
       /** @name Overridden Template Methods
        *
        * Please check the documentation in "tao/Transport.h" for more
        * details.
        */
       //@{
-
-      virtual ACE_Event_Handler * event_handler_i (void);
-      virtual TAO_Connection_Handler * invalidate_event_handler_i (void);
+      virtual ACE_Event_Handler * event_handler_i ();
+      virtual TAO_Connection_Handler * invalidate_event_handler_i ();
 
       virtual ssize_t send (iovec *iov, int iovcnt,
                             size_t &bytes_transferred,
@@ -87,7 +84,7 @@ namespace TAO
                             size_t len,
                             const ACE_Time_Value *s = 0);
 
-      virtual int register_handler (void);
+      virtual int register_handler ();
 
 
     public:
@@ -108,12 +105,11 @@ namespace TAO
 
       virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
-      virtual TAO_Connection_Handler * connection_handler_i (void);
+      virtual TAO_Connection_Handler * connection_handler_i ();
 
       //@}
 
     private:
-
       /// Set the Bidirectional context info in the service context list
       void set_bidir_context_info (TAO_Operation_Details &opdetails);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index 592f64f9d89..d229c3442a3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -40,7 +40,7 @@ public:
   TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_AbstractInterfaceDef_i (void);
+  virtual ~TAO_AbstractInterfaceDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 8c4da3ce878..2a0338413c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -39,7 +39,7 @@ public:
   TAO_AliasDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_AliasDef_i (void);
+  virtual ~TAO_AliasDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index a653c332502..bfaa2f3261d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_ArrayDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ArrayDef_i (void);
+  virtual ~TAO_ArrayDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
index bbb11c6e549..12e6029905e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_AttributeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_AttributeDef_i (void);
+  virtual ~TAO_AttributeDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index 1ee5a6dbb29..580edb1b0c0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -42,7 +42,7 @@ class TAO_IFRService_Export TAO_ComponentContainer_i
 public:
   TAO_ComponentContainer_i (TAO_Repository_i *repo);
 
-  virtual ~TAO_ComponentContainer_i (void);
+  virtual ~TAO_ComponentContainer_i ();
 
   virtual CORBA::ComponentIR::ComponentDef_ptr create_component (
       const char *id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index f7b5e715e7a..1a3d97d2c5f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_ComponentDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ComponentDef_i (void);
+  virtual ~TAO_ComponentDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
@@ -158,4 +158,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #endif /* TAO_COMPONENTDEF_I_H */
 
 
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
index 3a752807881..8a68ae611c9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_ComponentModuleDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ComponentModuleDef_i (void);
+  virtual ~TAO_ComponentModuleDef_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index c07c5684322..5608424d62b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -60,11 +60,11 @@ public:
                              ACE_Configuration *config);
 
   /// Destructor.
-  virtual ~TAO_ComponentRepository_i (void);
+  virtual ~TAO_ComponentRepository_i ();
 
   /// We create a default servant servant for each IR Object
   /// type and its corresponding POA.
-  virtual int create_servants_and_poas (void);
+  virtual int create_servants_and_poas ();
 
   /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (CORBA::DefinitionKind def_kind) const;
@@ -75,7 +75,6 @@ public:
   virtual PortableServer::POA_ptr select_poa (CORBA::DefinitionKind def_kind) const;
 
 protected:
-
 #ifdef CONCRETE_IR_OBJECT_TYPES
 #undef CONCRETE_IR_OBJECT_TYPES
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
index 5268dffa24a..93d592e3e23 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -42,32 +42,32 @@ public:
     TAO_ConstantDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ConstantDef_i (void);
+  virtual ~TAO_ConstantDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
-  CORBA::TypeCode_ptr type_i (void);
+  CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::IDLType_ptr type_def (void);
+  virtual CORBA::IDLType_ptr type_def ();
 
-  CORBA::IDLType_ptr type_def_i (void);
+  CORBA::IDLType_ptr type_def_i ();
 
   virtual void type_def (CORBA::IDLType_ptr type_def);
 
   void type_def_i (CORBA::IDLType_ptr type_def);
 
-  virtual CORBA::Any *value (void);
+  virtual CORBA::Any *value ();
 
-  CORBA::Any *value_i (void);
+  CORBA::Any *value_i ();
 
   virtual void value (const CORBA::Any &value);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 1fc8dee5386..53b46eafed5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -41,10 +41,10 @@ public:
     TAO_ConsumesDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ConsumesDef_i (void);
+  virtual ~TAO_ConsumesDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index d3c07d80c08..85dc614ab9f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -44,7 +44,7 @@ public:
   TAO_Contained_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_Contained_i (void);
+  virtual ~TAO_Contained_i ();
 
   /// Remove the repository entry.
   virtual void destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index 52bdaaba2be..8277b00c6f0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -50,7 +50,7 @@ public:
   TAO_Container_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_Container_i (void);
+  virtual ~TAO_Container_i ();
 
   /// Remove our contents.
   virtual void destroy ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index f083df51766..cbf271df231 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -41,7 +41,7 @@ public:
     TAO_EmitsDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_EmitsDef_i (void);
+  virtual ~TAO_EmitsDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index 191eb294328..e3e5abaf48e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -39,20 +39,20 @@ public:
   TAO_EnumDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_EnumDef_i (void);
+  virtual ~TAO_EnumDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (void);
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::EnumMemberSeq *members (void);
+  virtual CORBA::EnumMemberSeq *members ();
 
-  CORBA::EnumMemberSeq *members_i (void);
+  CORBA::EnumMemberSeq *members_i ();
 
   virtual void members (const CORBA::EnumMemberSeq &members);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
index a26db003ccf..4df1ebfb039 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -44,7 +44,7 @@ public:
     TAO_EventDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_EventDef_i (void);
+  virtual ~TAO_EventDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index ac4e23933d0..41922082a7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -43,11 +43,11 @@ public:
   TAO_EventPortDef_i (TAO_Repository_i *repo);
 
   //// Destructor
-  virtual ~TAO_EventPortDef_i (void);
+  virtual ~TAO_EventPortDef_i ();
 
-  virtual CORBA::ComponentIR::EventDef_ptr event (void);
+  virtual CORBA::ComponentIR::EventDef_ptr event ();
 
-  CORBA::ComponentIR::EventDef_ptr event_i (void);
+  CORBA::ComponentIR::EventDef_ptr event_i ();
 
   virtual void event (CORBA::ComponentIR::EventDef_ptr event);
 
@@ -61,15 +61,15 @@ public:
   /// implemented here.
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
 private:
   /// Dummy method so we can consolidate derived class methods
   /// in this 'abstract' base class.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index 8ec38e961f6..f9558682b20 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_ExceptionDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExceptionDef_i (void);
+  virtual ~TAO_ExceptionDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index 22cfa105ce6..f62d6660d92 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -44,9 +44,9 @@ public:
   TAO_ExtAbstractInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtAbstractInterfaceDef_i (void);
+  virtual ~TAO_ExtAbstractInterfaceDef_i ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index 2472d2ce821..979310f36e4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -40,19 +40,19 @@ public:
   TAO_ExtAttributeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtAttributeDef_i (void);
+  virtual ~TAO_ExtAttributeDef_i ();
 
-  virtual CORBA::ExcDescriptionSeq *get_exceptions (void);
+  virtual CORBA::ExcDescriptionSeq *get_exceptions ();
 
-  CORBA::ExcDescriptionSeq *get_exceptions_i (void);
+  CORBA::ExcDescriptionSeq *get_exceptions_i ();
 
   virtual void get_exceptions (const CORBA::ExcDescriptionSeq &get_exceptions);
 
   void get_exceptions_i (const CORBA::ExcDescriptionSeq &get_exceptions);
 
-  virtual CORBA::ExcDescriptionSeq *set_exceptions (void);
+  virtual CORBA::ExcDescriptionSeq *set_exceptions ();
 
-  CORBA::ExcDescriptionSeq *set_exceptions_i (void);
+  CORBA::ExcDescriptionSeq *set_exceptions_i ();
 
   virtual void set_exceptions (
       const CORBA::ExcDescriptionSeq &set_exceptions);
@@ -60,9 +60,9 @@ public:
   void set_exceptions_i (
       const CORBA::ExcDescriptionSeq &set_exceptions);
 
-  virtual CORBA::ExtAttributeDescription *describe_attribute (void);
+  virtual CORBA::ExtAttributeDescription *describe_attribute ();
 
-  CORBA::ExtAttributeDescription *describe_attribute_i (void);
+  CORBA::ExtAttributeDescription *describe_attribute_i ();
 
   // Utility function that fills sequence elements for a
   // ComponentDescription.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
index 9469e0c6327..92348b91375 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
@@ -47,7 +47,7 @@ public:
   TAO_ExtInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtInterfaceDef_i (void);
+  virtual ~TAO_ExtInterfaceDef_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
index 813fea9382e..28001d8b896 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -46,7 +46,7 @@ public:
   TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtLocalInterfaceDef_i (void);
+  virtual ~TAO_ExtLocalInterfaceDef_i ();
 
   virtual void destroy ();
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
index a1f381abbe5..f647c198a61 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_ExtValueDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ExtValueDef_i (void);
+  virtual ~TAO_ExtValueDef_i ();
 
   virtual CORBA::ExtInitializerSeq *ext_initializers ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
index 39dfd6aaaf2..c2b5c2ee8b1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_FactoryDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_FactoryDef_i (void);
+  virtual ~TAO_FactoryDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind (    );
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
index f6296e13b07..4223e06b116 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_FinderDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_FinderDef_i (void);
+  virtual ~TAO_FinderDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
index af08c6e6d21..ada6a483f7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_FixedDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_FixedDef_i (void);
+  virtual ~TAO_FixedDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index 62ac705efae..57def2880f6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -46,39 +46,39 @@ public:
   TAO_HomeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_HomeDef_i (void);
+  virtual ~TAO_HomeDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual void destroy_i (void);
+  virtual void destroy_i ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (void);
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::ComponentIR::HomeDef_ptr base_home (void);
+  virtual CORBA::ComponentIR::HomeDef_ptr base_home ();
 
-  CORBA::ComponentIR::HomeDef_ptr base_home_i (void);
+  CORBA::ComponentIR::HomeDef_ptr base_home_i ();
 
   virtual void base_home (CORBA::ComponentIR::HomeDef_ptr base_home);
 
   void base_home_i (CORBA::ComponentIR::HomeDef_ptr base_home);
 
-  virtual CORBA::InterfaceDefSeq *supported_interfaces (void);
+  virtual CORBA::InterfaceDefSeq *supported_interfaces ();
 
-  CORBA::InterfaceDefSeq *supported_interfaces_i (void);
+  CORBA::InterfaceDefSeq *supported_interfaces_i ();
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces);
@@ -86,9 +86,9 @@ public:
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces);
 
-  virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (void);
+  virtual CORBA::ComponentIR::ComponentDef_ptr managed_component ();
 
-  CORBA::ComponentIR::ComponentDef_ptr managed_component_i (void);
+  CORBA::ComponentIR::ComponentDef_ptr managed_component_i ();
 
   virtual void managed_component (
       CORBA::ComponentIR::ComponentDef_ptr managed_component);
@@ -96,9 +96,9 @@ public:
   void managed_component_i (
       CORBA::ComponentIR::ComponentDef_ptr managed_component);
 
-  virtual CORBA::ValueDef_ptr primary_key (void);
+  virtual CORBA::ValueDef_ptr primary_key ();
 
-  CORBA::ValueDef_ptr primary_key_i (void);
+  CORBA::ValueDef_ptr primary_key_i ();
 
   virtual void primary_key (CORBA::ValueDef_ptr primary_key);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
index 85d58bb7496..dc01b97941c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
@@ -46,7 +46,7 @@ public:
   TAO_IDLType_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_IDLType_i (void);
+  virtual ~TAO_IDLType_i ();
   /// Defined in concrete classes.
   virtual CORBA::TypeCode_ptr type () = 0;
   /// Defined in concrete classes.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index de362c0991a..44dd965e51a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -30,12 +30,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader
 {
 public:
-
   // Constructor
-  TAO_IFR_Service_Loader (void);
+  TAO_IFR_Service_Loader ();
 
   // Destructor
-  ~TAO_IFR_Service_Loader (void);
+  ~TAO_IFR_Service_Loader ();
 
   // Called by the Service Configurator framework to initialize the
   // Event Service. Defined in <ace/Service_Config.h>
@@ -51,17 +50,14 @@ public:
                                            int argc,
                                            ACE_TCHAR *argv[]);
 
-
 protected:
   TAO_IFR_Server ifr_server_;
   // Instance of the TAO_IFR_Server
 
 private:
-
   // Disallowing copying/assignment.
   TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &);
   TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &);
-
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index b43dd6ac43a..2f7aa6950e4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -39,7 +39,7 @@ class TAO_Contained_i;
 class TAO_IFRService_Export TAO_IFR_Server
 {
 public:
-  TAO_IFR_Server (void);
+  TAO_IFR_Server ();
 
   /// Initialize the IFR Service with the command line arguments and
   /// the ORB.
@@ -56,25 +56,24 @@ public:
                      int use_multicast_server = 0);
 
   /// Destroy the child POA created in init_with_poa().
-  int fini (void);
+  int fini ();
 
   /// Destructor.
-  ~TAO_IFR_Server (void);
+  ~TAO_IFR_Server ();
 
 protected:
-
   /// Two persistent POAs, one using a servant locator.
-  int create_poa (void);
+  int create_poa ();
 
   /// Open an ACE_Configuration of the appropriate type.
-  int open_config (void);
+  int open_config ();
 
   /// Create and initialize the repository.
-  int create_repository (void);
+  int create_repository ();
 
   /// Enable the Interface Repository to answer multicast requests
   /// for its IOR.
-  int init_multicast_server (void);
+  int init_multicast_server ();
 
   /// Reference to our ORB.
   CORBA::ORB_var orb_;
@@ -98,9 +97,9 @@ protected:
 class TAO_IFR_Service_Utils
 {
 public:
-  TAO_IFR_Service_Utils (void);
+  TAO_IFR_Service_Utils ();
 
-  ~TAO_IFR_Service_Utils (void);
+  ~TAO_IFR_Service_Utils ();
 
   typedef int (*name_clash_checker)(const char *);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index 9fd8d8213c6..36288e8fdbb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -50,7 +50,7 @@ public:
   TAO_IRObject_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_IRObject_i (void);
+  virtual ~TAO_IRObject_i ();
 
   virtual CORBA::DefinitionKind def_kind ();
 
@@ -65,7 +65,7 @@ public:
 
 protected:
   /// Set our key from the object ID via POACurrent.
-  void update_key (void);
+  void update_key ();
 
 protected:
   /// Pointer to the repository we were constructed from.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index c92ad55b94b..50f7046b234 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -42,14 +42,14 @@ public:
   TAO_InterfaceAttrExtension_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_InterfaceAttrExtension_i (void);
+  virtual ~TAO_InterfaceAttrExtension_i ();
 
   virtual
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-  describe_ext_interface (void);
+  describe_ext_interface ();
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-  describe_ext_interface_i (void);
+  describe_ext_interface_i ();
 
   virtual CORBA::ExtAttributeDef_ptr create_ext_attribute (
       const char *id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index 07e5ee76451..e9e0722422b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -47,30 +47,30 @@ public:
   TAO_InterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_InterfaceDef_i (void);
+  virtual ~TAO_InterfaceDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual void destroy_i (void);
+  virtual void destroy_i ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (void);
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (void);
+  virtual CORBA::Contained::Description *describe_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (void);
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::InterfaceDefSeq *base_interfaces (void);
+  virtual CORBA::InterfaceDefSeq *base_interfaces ();
 
-  CORBA::InterfaceDefSeq *base_interfaces_i (void);
+  CORBA::InterfaceDefSeq *base_interfaces_i ();
 
   virtual void base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces);
 
@@ -82,7 +82,7 @@ public:
 
   virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface ();
 
-  CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (void);
+  CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i ();
 
   virtual CORBA::AttributeDef_ptr create_attribute (
       const char *id,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 6c9761888de..7f65fdc93d0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -43,10 +43,10 @@ public:
   TAO_LocalInterfaceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_LocalInterfaceDef_i (void);
+  virtual ~TAO_LocalInterfaceDef_i ();
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (void);
+  virtual CORBA::DefinitionKind def_kind ();
 
   virtual CORBA::Boolean is_a (const char *interface_id);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index d00eee81180..42a2e0e7c33 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -46,7 +46,7 @@ public:
   TAO_ModuleDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ModuleDef_i (void);
+  virtual ~TAO_ModuleDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index ed999dd2313..29c266b4c7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -39,7 +39,7 @@ public:
   TAO_NativeDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_NativeDef_i (void);
+  virtual ~TAO_NativeDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index 4d212255693..4122ecd1ba7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_OperationDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_OperationDef_i (void);
+  virtual ~TAO_OperationDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
@@ -104,7 +104,7 @@ public:
 
   void make_description (CORBA::OperationDescription &desc);
 
-  CORBA::TypeCode_ptr type_i (void);
+  CORBA::TypeCode_ptr type_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index 4fcd2a8a564..7f02e77681a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_PrimitiveDef_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_PrimitiveDef_i (void);
+  virtual ~TAO_PrimitiveDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index 322ed19661a..57b239b6db5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -42,7 +42,7 @@ public:
     TAO_ProvidesDef_i (TAO_Repository_i *repoy);
 
   /// Destructor
-  virtual ~TAO_ProvidesDef_i (void);
+  virtual ~TAO_ProvidesDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index a7c90886f93..dcd09899479 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -40,7 +40,7 @@ public:
     TAO_PublishesDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_PublishesDef_i (void);
+  virtual ~TAO_PublishesDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
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/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index f9b5317e35a..ea198eb3f08 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -76,7 +76,7 @@ public:
                     PortableServer::POA_ptr poa,
                     ACE_Configuration *config);
 
-  virtual ~TAO_Repository_i (void);
+  virtual ~TAO_Repository_i ();
 
   /// Accessor for the readonly attribute.
   virtual CORBA::DefinitionKind def_kind ();
@@ -134,10 +134,10 @@ public:
 
   /// We create a default servant servant for each IR Object
   /// type and its corresponding POA.
-  virtual int create_servants_and_poas (void);
+  virtual int create_servants_and_poas ();
 
   /// Create the top-level ACE_Configuration sections.
-  int create_sections (void);
+  int create_sections ();
 
   /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (
@@ -200,7 +200,7 @@ public:
    * destroy() method of the last thing to be destroyed
    * by the test code.
    */
-  void shutdown (void);
+  void shutdown ();
 
 protected:
   /// Reference to our ORB.
@@ -306,7 +306,6 @@ private:
 
   /// Return the number of entries in the CORBA::PrimitiveKind enum.
   u_int num_pkinds () const;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index a444fecd5e9..7ada0df65d6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_SequenceDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_SequenceDef_i (void);
+  virtual ~TAO_SequenceDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index f6f3f9547cd..1c279a30a75 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_StringDef_i (TAO_Repository_i *repoy);
 
   /// Destructor.
-  virtual ~TAO_StringDef_i (void);
+  virtual ~TAO_StringDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index 3f5c7bdd865..bea3e384469 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_StructDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_StructDef_i (void);
+  virtual ~TAO_StructDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index c1de5d76f7e..59791162862 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -45,7 +45,7 @@ public:
   TAO_TypedefDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_TypedefDef_i (void);
+  virtual ~TAO_TypedefDef_i ();
 
   /// From Contained_i's pure virtual function.
   virtual CORBA::Contained::Description *describe ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index 8361d300531..6905e058310 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -41,7 +41,7 @@ public:
   TAO_UnionDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_UnionDef_i (void);
+  virtual ~TAO_UnionDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
index 7b3947e2196..0ed3020fac6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -43,7 +43,7 @@ public:
     TAO_UsesDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_UsesDef_i (void);
+  virtual ~TAO_UsesDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index 3bfb1ad0be0..df2a4089f55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -40,7 +40,7 @@ public:
   TAO_ValueBoxDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ValueBoxDef_i (void);
+  virtual ~TAO_ValueBoxDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 55941ca3b18..86f155f465c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -46,7 +46,7 @@ public:
   TAO_ValueDef_i (TAO_Repository_i *repo);
 
   /// Destructor
-  virtual ~TAO_ValueDef_i (void);
+  virtual ~TAO_ValueDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index 76b2f62b9ce..92e031318bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -43,7 +43,7 @@ public:
   TAO_ValueMemberDef_i (TAO_Repository_i *repoy);
 
   /// Destructor
-  virtual ~TAO_ValueMemberDef_i (void);
+  virtual ~TAO_ValueMemberDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index 0e41a13bb3e..2755a5ec325 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -44,7 +44,7 @@ public:
   TAO_WstringDef_i (TAO_Repository_i *repo);
 
   /// Destructor.
-  virtual ~TAO_WstringDef_i (void);
+  virtual ~TAO_WstringDef_i ();
 
   /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ();
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index b077f2c05ef..bb42f9e451d 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -45,7 +45,7 @@ class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  TAO_IOR_Multicast (void);
+  TAO_IOR_Multicast ();
 
   /// Constructor taking the ior of the service.
   TAO_IOR_Multicast (const char *ior,
@@ -66,7 +66,7 @@ public:
             TAO_Service_ID service_id);
 
   /// Destructor.
-  virtual ~TAO_IOR_Multicast (void);
+  virtual ~TAO_IOR_Multicast ();
 
   /// Callback when input is received on the handle.
   virtual int handle_input (ACE_HANDLE n);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index 144f7c2c62c..fe2d1fe8b7f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -41,7 +41,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Load_Average_Monitor
   : public virtual POA_CosLoadBalancing::LoadMonitor
 {
 public:
-
   /// Constructor
   /**
    * If no location is supplied the hostname or IP address is used by
@@ -56,7 +55,6 @@ public:
    * Methods required by the CosLoadBalancing::LoadMonitor interface.
    */
   //@{
-
   /// Return the location at which the LoadMonitor resides.
   /**
    * The returned "Location" is a sequence of length 1.
@@ -75,19 +73,16 @@ public:
   //@}
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~TAO_LB_CPU_Load_Average_Monitor (void);
+  ~TAO_LB_CPU_Load_Average_Monitor ();
 
 private:
-
   /// The name of the location at which this LoadMonitor resides.
   CosLoadBalancing::Location location_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index 3b747934960..ecc76293e87 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -38,7 +38,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Utilization_Monitor
   : public virtual POA_CosLoadBalancing::LoadMonitor
 {
 public:
-
   /// Constructor
   /**
    * If no location is supplied the hostname or IP address is used by
@@ -53,7 +52,6 @@ public:
    * Methods required by the CosLoadBalancing::LoadMonitor interface.
    */
   //@{
-
   /// Return the location at which the LoadMonitor resides.
   /**
    * The returned "Location" is a sequence of length 1.
@@ -72,19 +70,16 @@ public:
   //@}
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~TAO_LB_CPU_Utilization_Monitor (void);
+  ~TAO_LB_CPU_Utilization_Monitor ();
 
 private:
-
   /// The name of the location at which this LoadMonitor resides.
   CosLoadBalancing::Location location_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 1786f209790..a9dbb38b525 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -48,7 +48,7 @@ public:
 
 protected:
   /// Register the LB_ClientComponent's ORBInitializer.
-  int register_orb_initializer (void);
+  int register_orb_initializer ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 1c26fd1104d..d8993eab02c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -55,7 +55,6 @@ class TAO_LB_ClientRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the Client Request Interceptor
    * Interface
@@ -66,9 +65,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
@@ -85,7 +84,6 @@ public:
   virtual void receive_other (
       PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 1212d11d11d..e1f9c2874fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -40,7 +40,6 @@ class TAO_LoadBalancing_Export TAO_LB_Component
   : public ACE_Service_Object
 {
 public:
-
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -48,12 +47,10 @@ public:
   virtual int fini ();
 
 protected:
-
   /// Register the LB_Component's ORBInitializer.
   int register_orb_initializer (const CORBA::StringSeq & object_groups,
                                 const CORBA::StringSeq & repository_ids,
                                 const char * location);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index a82d675db16..00d4a388a41 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -68,10 +68,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -92,7 +92,7 @@ public:
 
 private:
   /// Create and register the LoadAlert object with the LoadManager.
-  void register_load_alert (void);
+  void register_load_alert ();
 
 private:
   /// List of stringified object group references.
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_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 9dd963d8549..e536d120e14 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -84,7 +84,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -113,7 +113,7 @@ public:
 
 protected:
   /// Destructor.
-  ~TAO_LB_LeastLoaded (void);
+  ~TAO_LB_LeastLoaded ();
 
   /// Retrieve the least loaded location from the given list of
   /// locations.
@@ -138,7 +138,6 @@ protected:
                                CORBA::Float & value);
 
 private:
-
   /// This servant's default POA.
   PortableServer::POA_var poa_;
 
@@ -158,7 +157,6 @@ private:
    * Cached LeastLoaded load balancing strategy property values.
    */
   //@{
-
   /// The critical load threshold.
   /**
    * Load rebalancing/shedding will occur if loads at a given location
@@ -190,7 +188,6 @@ private:
   CORBA::Float per_balance_load_;
 
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index b95446f33db..703189fe58d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -29,7 +29,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert
 {
 public:
   /// Constructor.
-  TAO_LB_LoadAlert (void);
+  TAO_LB_LoadAlert ();
 
   /**
    * @name CosLoadBalancing::LoadAlert Methods
@@ -37,13 +37,12 @@ public:
    * Methods required by the CosLoadBalancing::LoadAlert interface.
    */
   //@{
-
   /// Forward requests back to the load manager via the object group
   /// reference.
-  virtual void enable_alert (void);
+  virtual void enable_alert ();
 
   /// Stop forwarding requests, and begin accepting them again.
-  virtual void disable_alert (void);
+  virtual void disable_alert ();
 
   //@}
 
@@ -52,13 +51,12 @@ public:
   CORBA::Boolean alerted () const;
 
 // protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  virtual ~TAO_LB_LoadAlert (void);
+  virtual ~TAO_LB_LoadAlert ();
 
 private:
   /// Has this LoadAlert servant been alerted of a high load condition
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 4dec5ef7044..bec4e72c38c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -34,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 struct TAO_LB_LoadAlertInfo
 {
   /// Constructor.
-  TAO_LB_LoadAlertInfo (void);
+  TAO_LB_LoadAlertInfo ();
 
   /// Reference to the LoadAlert object.
   CosLoadBalancing::LoadAlert_var load_alert;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index a35561a416b..3be5fba7503 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -40,18 +40,18 @@ class TAO_LB_LoadAlert_Handler
   : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler
 {
 public:
-  virtual void enable_alert (void);
+  virtual void enable_alert ();
 
   virtual void enable_alert_excep (::Messaging::ExceptionHolder *);
 
-  virtual void disable_alert (void);
+  virtual void disable_alert ();
 
   virtual void disable_alert_excep (::Messaging::ExceptionHolder *);
 
 protected:
   /// Protected destructor to enforce propery memory management
   /// through reference counting.
-  ~TAO_LB_LoadAlert_Handler (void);
+  ~TAO_LB_LoadAlert_Handler ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
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_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index a714607aeda..ef105405869 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -57,7 +57,6 @@ class TAO_LB_LoadAverage
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   TAO_LB_LoadAverage (PortableServer::POA_ptr poa);
 
@@ -67,7 +66,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -96,9 +95,8 @@ public:
   void init (const PortableGroup::Properties & props);
 
 protected:
-
   /// Destructor.
-  ~TAO_LB_LoadAverage (void);
+  ~TAO_LB_LoadAverage ();
 
   /// Return the effective load.
   CORBA::Float effective_load (CORBA::Float previous_load,
@@ -117,7 +115,6 @@ protected:
                                CORBA::Float & value);
 
 private:
-
   /// This servant's default POA.
   PortableServer::POA_var poa_;
 
@@ -137,7 +134,6 @@ private:
    * Cached LoadAverage load balancing strategy property values.
    */
   //@{
-
   ///
   CORBA::Float tolerance_;
 
@@ -150,7 +146,6 @@ private:
   //@}
 
   CosLoadBalancing::LoadList current_loads_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index b5fb4e0a12f..cd167477d94 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -1062,7 +1062,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info)
     }
   else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0)
     {
-
       if (info->props.length () == 0)
         {
           {
@@ -1104,7 +1103,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info)
     }
   else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0)
     {
-
       if (info->props.length () == 0)
         {
           {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index c49ca438234..0cbbbbc399b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -42,7 +42,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager
     public ACE_Task_Base
 {
 public:
-
   /// Constructor.
   TAO_LB_LoadManager (int ping_timeout,
                       int ping_interval);
@@ -55,7 +54,6 @@ public:
    * Methods required by the CosLoadBalancing::LoadManager interface.
    */
   //@{
-
   /// For the PUSH load monitoring style.
   virtual void push_loads (const PortableGroup::Location & the_location,
                            const CosLoadBalancing::LoadList & loads);
@@ -108,7 +106,6 @@ public:
    * Methods required by the PortableGroup::PropertyManager interface.
    */
   //@{
-
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
       const PortableGroup::Properties & props);
@@ -168,7 +165,6 @@ public:
    * interface.
    */
   //@{
-
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
   virtual PortableGroup::ObjectGroup_ptr create_member (
@@ -228,7 +224,6 @@ public:
    * Methods required by the PortableGroup::GenericFactory interface.
    */
   //@{
-
   /**
    * Create an object of the specified type that adheres to the
    * restrictions defined by the provided Criteria.  The out
@@ -263,7 +258,6 @@ public:
   CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid);
 
 public:
-
   /// Initialize the load balancer.  This will cause a child POA to be
   /// created with the appropriate policies to support ServantLocators
   /// (i.e. for the MemberLocator).
@@ -272,16 +266,14 @@ public:
                    PortableServer::POA_ptr root_poa);
 
 protected:
-
   /// Destructor.
   /**
    * Destructor is protected to enforce correct memory management
    * through reference counting.
    */
-  ~TAO_LB_LoadManager (void);
+  ~TAO_LB_LoadManager ();
 
 private:
-
   /// Extract the value of the InitialNumberReplicas property from
   /// the_criteria.
   int get_initial_number_replicas (
@@ -315,7 +307,6 @@ private:
     const CosLoadBalancing::StrategyInfo * info);
 
 private:
-
   CORBA::ORB_var orb_;
 
   /// Reactor used when pulling loads from registered load monitors.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 3f09e937742..da1c32d6dbb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -311,7 +311,6 @@ TAO_LB_LoadMinimum::analyze_loads (
             }
           else
             {
-
               CORBA::Float percent_diff =
                 (tmp[j].value / min_load) - 1;
 
@@ -408,7 +407,6 @@ TAO_LB_LoadMinimum::get_location (
 */
           if (load.value < min_load)
             {
-
               if (i > 0 && !ACE::is_equal (load.value, 0.0f))
                 {
                   /*
@@ -469,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_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index a95028fa71e..7e5c3d24ebc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -85,7 +85,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -114,7 +114,7 @@ public:
 
 protected:
   /// Destructor.
-  ~TAO_LB_LoadMinimum (void);
+  ~TAO_LB_LoadMinimum ();
 
   /// Retrieve the least loaded location from the given list of
   /// locations.
@@ -158,7 +158,6 @@ private:
    * Cached LoadMinimum load balancing strategy property values.
    */
   //@{
-
   ///
   CORBA::Float tolerance_;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index 773554be4ad..fe2a5bb6bbd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -41,7 +41,6 @@ class TAO_LB_MemberLocator
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor
   TAO_LB_MemberLocator (TAO_LB_LoadManager * load_balancer);
 
@@ -52,7 +51,6 @@ public:
    * interface.
    */
   //@{
-
   /// Clients requests are forwarded via the
   /// PortableServer::ForwardRequest exception thrown in this method.
   virtual PortableServer::Servant preinvoke (
@@ -72,10 +70,8 @@ public:
   //@}
 
 private:
-
   /// The load balancer/manager implementation.
   TAO_LB_LoadManager * load_manager_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index d99c2b30926..2d1e544e496 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -53,7 +53,6 @@ class TAO_LB_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_LB_ORBInitializer (const CORBA::StringSeq & object_groups,
                          const CORBA::StringSeq & repository_ids,
@@ -72,7 +71,6 @@ public:
   //@}
 
 private:
-
   /// List of stringified object group references.
   const CORBA::StringSeq object_groups_;
 
@@ -90,7 +88,6 @@ private:
    * used out of convencience.
    */
   TAO_LB_LoadAlert load_alert_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 31b974fd655..1585ccb22fa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -58,8 +58,6 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory ()
 {
   // No need to call CORBA::remove_ref() on this->old_orf_.  It is a
   // "_var" object, meaning that will be done automatically.
-
-
   if (!CORBA::is_nil (this->lm_.in ()))
     {
       const CORBA::ULong len = this->fcids_.size ();
@@ -132,7 +130,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/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 88168ce7e6e..2d2d522a8ce 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -58,7 +58,7 @@ class TAO_LB_ObjectReferenceFactory
     CORBA::ORB_ptr orb,
     CosLoadBalancing::LoadManager_ptr lm);
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   /**
    * @name PortableInterceptor::ObjectReferenceFactory Methods
@@ -88,7 +88,7 @@ protected:
    * Protected destructor to enforce proper memory management via
    * reference counting.
    */
-  ~TAO_LB_ObjectReferenceFactory (void);
+  ~TAO_LB_ObjectReferenceFactory ();
 
   /// Retrieve the object group reference for objects with the given
   /// RepositoryId.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
index 5bcb61e1235..088e39ddff3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
@@ -41,9 +41,8 @@ class TAO_LB_LoadManager;
 class TAO_LB_Pull_Handler : public ACE_Event_Handler
 {
 public:
-
   /// Constructor
-  TAO_LB_Pull_Handler (void);
+  TAO_LB_Pull_Handler ();
 
   /// Receive the timeout event.
   virtual int handle_timeout (const ACE_Time_Value &current_time,
@@ -54,14 +53,12 @@ public:
                    TAO_LB_LoadManager * load_manager);
 
 private:
-
   /// The table that contains all load monitors registered with the
   /// load balancer.
   TAO_LB_MonitorMap * monitor_map_;
 
   /// Pointer to the LoadManager servant.
   TAO_LB_LoadManager * load_manager_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 12dc31cc68b..58347a989c5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -11,7 +11,7 @@ static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern "C" void tao_lb_random_init_routine (void)
+extern "C" void tao_lb_random_init_routine ()
 {
   ACE_OS::srand (static_cast<unsigned int> (ACE_OS::time ()));
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 3ed1d705db3..ccc507c06fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -35,7 +35,6 @@ class TAO_LB_Random
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   /**
    * Seeds the OS' random number generator.
@@ -48,7 +47,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -85,13 +84,11 @@ public:
    * If supported by the platform, initialization code will only run
    * once for a given process.
    */
-  static void init (void);
+  static void init ();
 
 private:
-
   /// This servant's default POA.
   PortableServer::POA_var poa_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index cc3b966efb5..9099508075e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -40,7 +40,6 @@ class TAO_LB_RoundRobin
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   TAO_LB_RoundRobin (PortableServer::POA_ptr poa);
 
@@ -50,7 +49,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
   virtual CosLoadBalancing::Properties * get_properties ();
 
@@ -76,12 +75,10 @@ public:
     );
 
 protected:
-
   /// Destructor
-  ~TAO_LB_RoundRobin (void);
+  ~TAO_LB_RoundRobin ();
 
 private:
-
   /// Keep a copy of location list for verify if the list is changed
   /// in next next_member() call.
   void copy_locations (PortableGroup::Locations_var& locations);
@@ -107,7 +104,6 @@ private:
 
   /// Locations list retrieved in last next_member() call.
   ACE_Vector <PortableGroup::Location> last_locations_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index a3ad143d70b..e51b7e46121 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -60,9 +60,9 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -86,7 +86,7 @@ protected:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  ~TAO_LB_ServerRequestInterceptor (void);
+  ~TAO_LB_ServerRequestInterceptor ();
 
 private:
   TAO_LB_LoadAlert & load_alert_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index e6efc1c2dfa..66ce21238ba 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -46,7 +46,6 @@ class TAO_Log_Serv_Export TAO_BasicLogFactory_i :
   public TAO_LogMgr_i
 {
 public:
-
   //= Initialization and termination code.
 
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index b0b30c1bf4b..7db2db3649d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -34,7 +34,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 DsLogAdmin::Log_ptr
@@ -50,7 +49,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 9c523b70323..5e8f0cbf381 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -50,7 +50,6 @@ class TAO_Log_Serv_Export TAO_BasicLog_i :
   public POA_DsLogAdmin::BasicLog
 {
 public:
-
   /// Constructor.
   TAO_BasicLog_i (CORBA::ORB_ptr orb,
                   PortableServer::POA_ptr poa,
@@ -65,19 +64,17 @@ public:
   virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
-  void destroy (void);
+  void destroy ();
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~TAO_BasicLog_i (void);
+  ~TAO_BasicLog_i ();
 
 private:
-
   /// POA.
   PortableServer::POA_var poa_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index 86e3df16529..e6a88ae9fb8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -57,14 +57,14 @@ public:
   TAO_Event_LogConsumer (TAO_EventLog_i *log);
 
   /// Destructor.
-  ~TAO_Event_LogConsumer (void);
+  ~TAO_Event_LogConsumer ();
 
   /// Connect to EventLog.
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index abceed0cea7..e64ea0128b8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -50,11 +50,10 @@ class TAO_EventLog_Serv_Export TAO_EventLogFactory_i :
 
 {
 public:
-
   //= Initialization and termination code.
 
   /// Constructor.
-  TAO_EventLogFactory_i (void);
+  TAO_EventLogFactory_i ();
 
   /// Destructor.
   ~TAO_EventLogFactory_i ();
@@ -83,9 +82,9 @@ public:
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds);
 
   // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods.
-  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ();
 
-  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
+  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ();
 
 protected:
   virtual CORBA::RepositoryId create_repositoryid ();
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index 0a8c449c875..83dc3d14912 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -49,10 +49,10 @@ public:
   TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr);
 
   /// Destructor.
-  ~TAO_EventLogNotification (void);
+  ~TAO_EventLogNotification ();
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 protected:
   /// Used to connect this PushSupplier to the EventChannel
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 6ede219f2e6..1f386f9b1c5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -17,7 +17,6 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
     poa_(PortableServer::POA::_duplicate(poa)),
     log_poa_(PortableServer::POA::_duplicate(log_poa))
 {
-
   // Create an instance of the event channel.
   TAO_CEC_EventChannel_Attributes attr (this->poa_.in(),
                                         this->poa_.in());
@@ -48,7 +47,6 @@ TAO_EventLog_i::copy (DsLogAdmin::LogId &id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 DsLogAdmin::Log_ptr
@@ -64,7 +62,6 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id)
   this->copy_attributes (log.in ());
 
   return log._retn ();
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index cd0a25b6d27..54c1b6c0b66 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -73,21 +73,20 @@ public:
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void);
+  destroy ();
 
   /// Activate the EventLog.
   void
-  activate (void);
+  activate ();
 
   // = The CosEventChannelAdmin::EventChannel interface methods.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void);
+  for_consumers ();
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void);
+  for_suppliers ();
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
@@ -96,7 +95,6 @@ protected:
   ~TAO_EventLog_i ();
 
 private:
-
   /// The Event Channel that the log uses.
   TAO_CEC_EventChannel *event_channel_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 52daecf8ba0..6592d43e014 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -52,7 +52,7 @@ public:
                        CORBA::ULong max_rec_list_len);
 
   /// Destructor.
-  virtual ~TAO_Hash_Iterator_i (void);
+  virtual ~TAO_Hash_Iterator_i ();
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 93c5607b08d..dde3268fe83 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -627,7 +627,6 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci
 }
 
 
-
 DsLogAdmin::ForwardingState
 TAO_Hash_LogRecordStore::get_forwarding_state () const
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index 620ffc0f3fb..c9fd471bb60 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -68,13 +68,13 @@ public:
                            const DsLogAdmin::CapacityAlarmThresholdList* thresholds);
 
   /// Destructor.
-  virtual ~TAO_Hash_LogRecordStore (void);
+  virtual ~TAO_Hash_LogRecordStore ();
 
   /// Initialization.
-  virtual int open (void);
+  virtual int open ();
 
   /// Close the record store.
-  virtual int close (void);
+  virtual int close ();
 
 
   // = Log Parameters
@@ -135,7 +135,7 @@ public:
   virtual void set_max_size (CORBA::ULongLong size);
 
   /// Get the weekly scheduling parameters
-  virtual DsLogAdmin::WeekMask* get_week_mask (void);
+  virtual DsLogAdmin::WeekMask* get_week_mask ();
 
   /// Set the weekly scheduling parameters.
   virtual void set_week_mask (const DsLogAdmin::WeekMask & masks);
@@ -143,20 +143,20 @@ public:
   // = LogRecordStore status methods
 
   /// Gets the current size of the log data.
-  virtual CORBA::ULongLong get_current_size (void);
+  virtual CORBA::ULongLong get_current_size ();
 
   /// Get the number of records in the log right now.
-  virtual CORBA::ULongLong get_n_records (void);
+  virtual CORBA::ULongLong get_n_records ();
 
 
   // = LogRecordStore gauge
 
   /// Gets the current value of the "gauge" that measures the total
   /// size of the records written to the log.
-  virtual CORBA::ULongLong get_gauge(void);
+  virtual CORBA::ULongLong get_gauge();
 
   /// Resets the "gauge" to 0
-  virtual void reset_gauge(void);
+  virtual void reset_gauge();
 
   // = Record logging, retrieval, update and removal methods.
 
@@ -165,7 +165,7 @@ public:
   virtual int log (const DsLogAdmin::LogRecord &rec);
 
   /// Deletes "old" records from the store.
-  virtual int purge_old_records (void);
+  virtual int purge_old_records ();
 
   /// Set single record attributes.
   virtual void
@@ -186,7 +186,7 @@ public:
 
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure.
-  virtual int flush (void);
+  virtual int flush ();
 
   /// Returns all records in the log that match the given constraint
   /// <c>.
@@ -214,7 +214,7 @@ public:
   virtual CORBA::ULong
     delete_records_by_id (const DsLogAdmin::RecordIdList & ids);
 
-  virtual CORBA::ULong remove_old_records (void);
+  virtual CORBA::ULong remove_old_records ();
 
   /// Read-Write Lock
   virtual ACE_SYNCH_RW_MUTEX& lock();
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index a5b15400e25..bf0c9028696 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -49,11 +49,11 @@ public:
 
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
-    list_logs (void);
+    list_logs ();
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
-    list_logs_by_id (void);
+    list_logs_by_id ();
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 7e4882d8d0b..063318f6f5d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -48,14 +48,14 @@ public:
   TAO_Iterator_i (PortableServer::POA_ptr poa, ACE_Reactor* reactor);
 
   /// Destructor.
-  virtual ~TAO_Iterator_i (void);
+  virtual ~TAO_Iterator_i ();
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
                                        CORBA::ULong how_many) = 0;
 
   /// This destroys the iterator.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   /// POA
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index cd3f112fe4f..fe3e5e8df33 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -47,11 +47,11 @@ public:
 
   /// Lists all log object references.
   DsLogAdmin::LogList *
-    list_logs (void);
+    list_logs ();
 
   /// Lists all log ids.
   DsLogAdmin::LogIdList *
-    list_logs_by_id (void);
+    list_logs_by_id ();
 
   /// Returns a reference to the log with the supplied id.
   DsLogAdmin::Log_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 44054f36974..463f267f3ee 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -17,7 +17,6 @@ TAO_LogNotification::~TAO_LogNotification ()
 void
 TAO_LogNotification::object_creation (DsLogAdmin::LogId id)
 {
-
   CORBA::Any any;
   DsLogNotification::ObjectCreation event;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index a1d439676bb..0f0979fad60 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -37,14 +37,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Log_Serv_Export TAO_LogNotification
 {
-
 public:
-
   /// Constructor.
-  TAO_LogNotification (void);
+  TAO_LogNotification ();
 
   /// Destructor.
-  virtual ~TAO_LogNotification (void);
+  virtual ~TAO_LogNotification ();
 
   /// Event generated when a new log is created.
   void object_creation (DsLogAdmin::LogId id);
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index b942044cf4a..0390c50b5ed 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -37,13 +37,13 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 {
 public:
   /// Destructor.
-  virtual ~TAO_LogRecordStore (void);
+  virtual ~TAO_LogRecordStore ();
 
   /// Initialization.
-  virtual int open (void) = 0;
+  virtual int open () = 0;
 
   /// Close the record store.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
 
   // = Log Parameters
@@ -113,7 +113,7 @@ public:
 
   /// Get the weekly scheduling parameters
   virtual DsLogAdmin::WeekMask*
-    get_week_mask (void) = 0;
+    get_week_mask () = 0;
 
   /// Set the weekly scheduling parameters.
   virtual void
@@ -124,11 +124,11 @@ public:
 
   /// Gets the current size of the log data.
   virtual CORBA::ULongLong
-    get_current_size (void) = 0;
+    get_current_size () = 0;
 
   /// Get the number of records in the log right now.
   virtual CORBA::ULongLong
-    get_n_records (void) = 0;
+    get_n_records () = 0;
 
 
   // = LogRecordStore gauge
@@ -136,11 +136,11 @@ public:
   /// Gets the current value of the "gauge" that measures the total
   /// size of the records written to the log.
   virtual CORBA::ULongLong
-    get_gauge(void) = 0;
+    get_gauge() = 0;
 
   /// Resets the "gauge" to 0
   virtual void
-    reset_gauge(void) = 0;
+    reset_gauge() = 0;
 
 
   // = Record logging, retrieval, update and removal methods.
@@ -152,7 +152,7 @@ public:
 
   /// Deletes "old" records from the store.
   virtual int
-    purge_old_records (void) = 0;
+    purge_old_records () = 0;
 
   /// Set single record attributes.
   virtual void
@@ -174,7 +174,7 @@ public:
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure
   virtual int
-    flush (void) = 0;
+    flush () = 0;
 
 
   /// Returns all records in the log that match the given constraint
@@ -207,14 +207,14 @@ public:
 
 
   virtual CORBA::ULong
-    remove_old_records (void) = 0;
+    remove_old_records () = 0;
 
   /// Read-Write Lock
   virtual ACE_SYNCH_RW_MUTEX& lock() = 0;
 
 protected:
   /// Constructor.
-  TAO_LogRecordStore (void);
+  TAO_LogRecordStore ();
 
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
index 62abf1d6d8b..6a512fc412a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -35,11 +35,11 @@ public:
 
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
-    list_logs (void) = 0;
+    list_logs () = 0;
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
-    list_logs_by_id (void) = 0;
+    list_logs_by_id () = 0;
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index d6be0963003..ea7cccc3547 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -46,7 +46,7 @@ public:
   TAO_Log_Constraint_Interpreter (const char* constraints);
 
   /// Destructor.
-  ~TAO_Log_Constraint_Interpreter (void);
+  ~TAO_Log_Constraint_Interpreter ();
 
   /// Returns true if the constraint is evaluated successfully by
   /// the evaluator.
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index c5485ab1291..1f1475a2f9f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -694,7 +694,6 @@ int
 TAO_Log_Constraint_Visitor::visit_binary_expr (
     ETCL_Binary_Expr *binary_expr)
 {
-
   // Evaluate the constraint
   int bin_op_type = binary_expr->type ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index b1a15532092..6057d5822b9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -47,7 +47,6 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor :
   public ETCL_Constraint_Visitor
 {
 public:
-
   /// Constructor.
   TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec);
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 2acd7118833..35adee9ef1a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -46,9 +46,7 @@ class TAO_LogMgr_i;
  */
 class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log
 {
-
 public:
-
   /// Constructor.
   TAO_Log_i (CORBA::ORB_ptr orb,
              TAO_LogMgr_i& logmgr_i,
@@ -60,7 +58,7 @@ public:
   ~TAO_Log_i ();
 
   /// Initlialize the Log.
-  void init (void);
+  void init ();
 
   /**
    * @name DsLogAdmin::Log Methods
@@ -69,21 +67,21 @@ public:
    */
   //@{
   /// Return the factory of the log.
-  DsLogAdmin::LogMgr_ptr my_factory (void);
+  DsLogAdmin::LogMgr_ptr my_factory ();
 
   /// Return the id of the log.
-  DsLogAdmin::LogId id (void);
+  DsLogAdmin::LogId id ();
 
   /// Get the list of the QoS properties supported by the log.
   DsLogAdmin::QoSList*
-  get_log_qos (void);
+  get_log_qos ();
 
   /// Set the list of the QoS properties supported by the log.
   void set_log_qos (const DsLogAdmin::QoSList & qos);
 
   /// Get the record life in seconds (0 infinite).
   CORBA::ULong
-  get_max_record_life (void);
+  get_max_record_life ();
 
   /// Set the record life in seconds (0 infinite).
   void
@@ -91,7 +89,7 @@ public:
 
   /// Get the maximum size in octets.
   CORBA::ULongLong
-  get_max_size (void);
+  get_max_size ();
 
   /// Set the maximum size in octets.
   void
@@ -99,15 +97,15 @@ public:
 
   /// Get the current size of the log in octets.
   CORBA::ULongLong
-  get_current_size (void);
+  get_current_size ();
 
   /// Return the number of records in the log.
   CORBA::ULongLong
-  get_n_records (void);
+  get_n_records ();
 
   /// Get the action to be taken when the log reaches its maximum size.
   DsLogAdmin::LogFullActionType
-  get_log_full_action (void);
+  get_log_full_action ();
 
   /// Set the action to be taken when the log reaches its maximum size.
   void
@@ -115,7 +113,7 @@ public:
 
   /// Get the administrative state of the log.
   DsLogAdmin::AdministrativeState
-  get_administrative_state (void);
+  get_administrative_state ();
 
   /// Set the administrative state of the log.
   void
@@ -126,7 +124,7 @@ public:
   /// @@@ Of course!  get_forwarding_state() is virtual in the base
   ///     class dictated by the IDL!  -Ossama
   virtual DsLogAdmin::ForwardingState
-  get_forwarding_state (void);
+  get_forwarding_state ();
 
   /// Set the forwarding state of the log.
   /// @@ Note: is it ok to make this method virtual?
@@ -135,11 +133,11 @@ public:
 
   /// Get the operational state of the log.
   DsLogAdmin::OperationalState
-  get_operational_state (void);
+  get_operational_state ();
 
   /// Get the log duration
   DsLogAdmin::TimeInterval
-  get_interval (void);
+  get_interval ();
 
   /// Set the log duration.
   void
@@ -147,11 +145,11 @@ public:
 
   /// Get the availability status
   DsLogAdmin::AvailabilityStatus
-  get_availability_status (void);
+  get_availability_status ();
 
   /// Get the capacity alarm threshold
   DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (void);
+    get_capacity_alarm_thresholds ();
 
   /**
    * Set the capacity alarm threshold. Threshold values represent
@@ -167,7 +165,7 @@ public:
 
   /// Get the weekly scheduling parameters
   DsLogAdmin::WeekMask*
-  get_week_mask (void);
+  get_week_mask ();
 
   /// Set the weekly scheduling parameters.
   void
@@ -231,30 +229,30 @@ public:
   /// Causes all pending events to be written to storage. Raises
   /// DsLogAdmin::UnsupportedQos
   void
-  flush (void);
+  flush ();
   //@}
 
   /// Remove records that have exceeded max_record_life_.
-  void remove_old_records (void);
+  void remove_old_records ();
 
 protected:
   /// Get the availability status
   /// @note must be called with locks held
   DsLogAdmin::AvailabilityStatus
-  get_availability_status_i (void);
+  get_availability_status_i ();
 
   /// Tells if the Log is scheduled to run now.
   /// @note must be called with locks held
-  CORBA::Boolean scheduled (void);
+  CORBA::Boolean scheduled ();
 
   /// Copy the attributes of the log being passed.
   void copy_attributes (DsLogAdmin::Log_ptr log);
 
   /// Check if threshold reached.
-  void check_capacity_alarm_threshold (void);
+  void check_capacity_alarm_threshold ();
 
   /// Reset capacity alarm threshold.
-  void reset_capacity_alarm_threshold (void);
+  void reset_capacity_alarm_threshold ();
 
   /// Check that valid threshold values have been given.
   static CORBA::Boolean validate_capacity_alarm_thresholds (
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 9d46942ca69..ef709e6d6c9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -34,7 +34,6 @@ TAO_Notify_LogConsumer::connect (
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_any_push_consumer (objref.in ());
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index 5ec6e83e3b3..06360e8cd5c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -58,11 +58,11 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from NotifyLog.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
 protected:
   /// Destructor.
-  virtual ~TAO_Notify_LogConsumer (void);
+  virtual ~TAO_Notify_LogConsumer ();
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -73,7 +73,7 @@ protected:
   // = PushSupplier methods
   virtual void push (const CORBA::Any & event);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// ProxyPushSupplier used to connect to NotifyLog.
   CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 2b444c1a68b..cdf78e7637e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -12,7 +12,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i ()
 TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 : notify_factory_ (ecf)
 {
-
   CosNotifyChannelAdmin::ChannelID id;
   CosNotifyChannelAdmin::AdminID adminID = 0;
   CosNotification::QoSProperties initial_qos;
@@ -256,7 +255,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier (
 }
 
 
-
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_pull_supplier (
       )
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index 587648e575a..2e709068e88 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -48,7 +48,7 @@ public:
   //= Initialization and termination code.
 
   /// Constructor - default.
-  TAO_NotifyLogFactory_i (void);
+  TAO_NotifyLogFactory_i ();
 
   /// Constructor.
   TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf);
@@ -81,20 +81,20 @@ public:
 
 
   // = Methods from CosNotifyChannelAdmin::ConsumerAdmin.
-  CosNotifyChannelAdmin::AdminID MyID (void);
+  CosNotifyChannelAdmin::AdminID MyID ();
 
-  CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+  CosNotifyChannelAdmin::EventChannel_ptr MyChannel ();
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ();
 
-  CosNotifyFilter::MappingFilter_ptr priority_filter (void);
+  CosNotifyFilter::MappingFilter_ptr priority_filter ();
   void priority_filter (CosNotifyFilter::MappingFilter_ptr);
 
-  CosNotifyFilter::MappingFilter_ptr lifetime_filter (void);
+  CosNotifyFilter::MappingFilter_ptr lifetime_filter ();
   void lifetime_filter (CosNotifyFilter::MappingFilter_ptr);
 
-  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void);
-  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void);
+  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers ();
+  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers ();
 
   CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
     CosNotifyChannelAdmin::ProxyID proxy_id);
@@ -107,18 +107,18 @@ public:
     CosNotifyChannelAdmin::ClientType ctype,
     CosNotifyChannelAdmin::ProxyID& id);
 
-  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+  CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ();
 
-  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
+  CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ();
 
-  void destroy (void);
+  void destroy ();
 
   /// CosNotifyComm::NotifySubscribe.
   void subscription_change (const CosNotification::EventTypeSeq& added,
                             const CosNotification::EventTypeSeq& removed);
 
   /// CosNotification::QoSAdmin.
-  CosNotification::QoSProperties* get_qos (void);
+  CosNotification::QoSProperties* get_qos ();
   void set_qos (const CosNotification::QoSProperties&);
   void validate_qos (const CosNotification::QoSProperties&,
                      CosNotification::NamedPropertyRangeSeq_out);
@@ -127,8 +127,8 @@ public:
   CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr);
   void remove_filter (CosNotifyFilter::FilterID);
   CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID);
-  CosNotifyFilter::FilterIDSeq* get_all_filters (void);
-  void remove_all_filters (void);
+  CosNotifyFilter::FilterIDSeq* get_all_filters ();
+  void remove_all_filters ();
 
 protected:
   virtual CORBA::RepositoryId
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 725c4952af7..1aead3245ab 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -10,7 +10,6 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification (
   : TAO_LogNotification (),
     event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
 {
-
   CosNotifyComm::PushSupplier_var objref =
     this->_this ();
   ACE_ASSERT (!CORBA::is_nil (objref.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 808a17206f1..bc753492b4a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -48,7 +48,7 @@ public:
   TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr);
 
   /// Destructor.
-  ~TAO_NotifyLogNotification (void);
+  ~TAO_NotifyLogNotification ();
 
 protected:
   // = Helper methods
@@ -66,7 +66,7 @@ protected:
         const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-    virtual void disconnect_push_supplier (void);
+    virtual void disconnect_push_supplier ();
 
   /// Send the event on the event channel.
   virtual void send_notification (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 3cf48ab0234..6a508441855 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -15,7 +15,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
     notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
-
   CosNotifyChannelAdmin::ChannelID channel_id;
 
   CosNotification::QoSProperties initial_qos;
@@ -92,7 +91,6 @@ TAO_NotifyLog_i::destroy ()
 void
 TAO_NotifyLog_i::activate ()
 {
-
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 84fbe8cea0d..514a8e7286f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -73,29 +73,29 @@ public:
 
   /// Destroy the log object and all contained records.
   void
-  destroy (void);
+  destroy ();
 
   /// Activate the NotifyLog.
   void
-  activate (void);
+  activate ();
 
   // = Methods from CosNotifyChannelAdmin::EventChannel.
   CosNotifyFilter::Filter_ptr
-  get_filter (void);
+  get_filter ();
 
   void set_filter (CosNotifyFilter::Filter_ptr filter);
 
   CosNotifyChannelAdmin::EventChannelFactory_ptr
-  MyFactory (void);
+  MyFactory ();
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  default_consumer_admin (void);
+  default_consumer_admin ();
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  default_supplier_admin (void);
+  default_supplier_admin ();
 
   CosNotifyFilter::FilterFactory_ptr
-  default_filter_factory (void);
+  default_filter_factory ();
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
   new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
@@ -112,18 +112,18 @@ public:
   get_supplieradmin (CosNotifyChannelAdmin::AdminID id);
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_consumeradmins (void);
+  get_all_consumeradmins ();
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_supplieradmins (void);
+  get_all_supplieradmins ();
 
   CosNotification::AdminProperties*
-  get_admin (void);
+  get_admin ();
 
   void set_admin (const CosNotification::AdminProperties& admin);
 
   CosNotification::QoSProperties*
-  get_qos (void);
+  get_qos ();
 
   void set_qos (const CosNotification::QoSProperties&);
 
@@ -132,10 +132,10 @@ public:
 
   // = Methods from DsEventLogAdmin::EventLog.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (void);
+  for_consumers ();
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (void);
+  for_suppliers ();
 
 private:
   /// The PushConsumer that consumes the events and stores them
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/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index fb46ecdf537..a8baebcb5dc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -58,14 +58,14 @@ public:
   TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log);
 
   /// Destructor.
-  ~TAO_Rtec_LogConsumer (void);
+  ~TAO_Rtec_LogConsumer ();
 
   /// Connect to RTEventLog.
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 7b017277f5d..d513e0e3b27 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -52,7 +52,7 @@ public:
   //= Initialization and termination code.
 
   /// Constructor.
-  TAO_RTEventLogFactory_i (void);
+  TAO_RTEventLogFactory_i ();
 
   /// Destructor.
   ~TAO_RTEventLogFactory_i ();
@@ -65,7 +65,7 @@ public:
 
   /// Activate this servant
   RTEventLogAdmin::EventLogFactory_ptr
-  activate (void);
+  activate ();
 
   /// Used to create a RTEventLog.
   RTEventLogAdmin::EventLog_ptr create (
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index bbcc5c060af..4aab236323b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -25,7 +25,6 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification (
   : TAO_LogNotification (),
     event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
-
   obtainProxyConsumer ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index b7b58b6b1da..4c88e83e4f8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -51,17 +51,17 @@ public:
   TAO_RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr);
 
   /// Destructor.
-  ~TAO_RTEventLogNotification (void);
+  ~TAO_RTEventLogNotification ();
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 protected:
   // = Helper methods
 
   /// Used to connect this PushSupplier to the EventChannel
   /// that will log these events.
-  void obtainProxyConsumer (void);
+  void obtainProxyConsumer ();
 
   // Send the event on the event channel.
   virtual void send_notification (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index c63d99d4e41..661eed9e4f8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -29,7 +29,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb,
     poa_ (PortableServer::POA::_duplicate (poa)),
     log_poa_ (PortableServer::POA::_duplicate (log_poa))
 {
-
   TAO_EC_Event_Channel_Attributes attr (poa_.in(), poa_.in());
 
   ACE_NEW_THROW_EX (this->event_channel_,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index cbc5897acfa..8da3b060a26 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -73,15 +73,15 @@ public:
   virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id);
 
   /// Destroy the log object and all contained records.
-  void destroy (void);
+  void destroy ();
 
   /// Activate the RTEventLog.
-  void activate (void);
+  void activate ();
 
   // = The RtecEventChannelAdmin::EventChannel interface methods.
-  RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
-  RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 2266e5903fa..7314bc1c34e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -23,7 +23,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (
 }
 
 template <class ITERATOR, class TABLE_ENTRY>
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator ()
 {
   delete hash_iter_;
 
@@ -157,7 +157,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
 }
 
 template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy ()
 {
   // Check to make sure this object is still valid.
   if (this->destroyed_)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 22d6ac41ac9..fc2193ccb7e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -58,10 +58,10 @@ public:
                          PortableServer::POA_ptr poa);
 
   /// Destructor.
-  ~TAO_Bindings_Iterator (void);
+  ~TAO_Bindings_Iterator ();
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   // = Idl methods.
 
@@ -78,7 +78,7 @@ public:
                          CosNaming::BindingList_out bl);
 
   /// This operation destroys the iterator.
-  void destroy (void);
+  void destroy ();
 
   // = Helper method.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index c3250e3e6f4..e619665c582 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_IntId
 {
 public:
   /// Constructor.
-  TAO_IntId (void);
+  TAO_IntId ();
 
   /// Constructor.
   TAO_IntId (CORBA::Object_ptr obj,
@@ -51,7 +51,7 @@ public:
   TAO_IntId (const TAO_IntId & rhs);
 
   /// Destructor.
-  ~TAO_IntId (void);
+  ~TAO_IntId ();
 
   /// Assignment operator (does copy memory).
   void operator= (const TAO_IntId & rhs);
@@ -121,10 +121,10 @@ public:
   // = Accessors
 
   /// Return id_ in a const char * format.
-  const char * id (void);
+  const char * id ();
 
   /// Return kind_ in a const char * format.
-  const char * kind (void);
+  const char * kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 4a3c0bafc58..8d86516f2a9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -314,7 +314,6 @@ void
 TAO_FT_Naming_Manager::set_default_properties (
     const PortableGroup::Properties & props)
 {
-
   this->properties_support_.set_default_properties (props);
   //@@ validate properties?
 }
@@ -364,7 +363,6 @@ TAO_FT_Naming_Manager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Properties & overrides)
 {
-
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
@@ -451,7 +449,6 @@ TAO_FT_Naming_Manager::add_member (
   if (this->group_factory_.find_group (object_group, group))
   {
     try {
-
       group->add_member (the_location,
                          member);
     }
@@ -464,7 +461,6 @@ TAO_FT_Naming_Manager::add_member (
     }
 
     result = group->reference ();
-
   }
   else
   {
@@ -567,7 +563,6 @@ PortableGroup::ObjectGroupId
 TAO_FT_Naming_Manager::get_object_group_id (
     PortableGroup::ObjectGroup_ptr object_group)
 {
-
   if (CORBA::is_nil (object_group))
     {
       ORBSVCS_DEBUG ((LM_DEBUG,
@@ -661,7 +656,6 @@ TAO_FT_Naming_Manager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
 {
-
   if (CORBA::is_nil (object_group))
     {
       ORBSVCS_DEBUG ((LM_DEBUG,
@@ -743,7 +737,6 @@ TAO_FT_Naming_Manager::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id)
 {
-
   PortableGroup::ObjectGroupId group_id = 0;
   if (factory_creation_id >>= group_id)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
index ae7868261e6..182737db5d7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
@@ -33,7 +33,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -59,9 +58,8 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager
     public ACE_Task_Base
 {
 public:
-
   /// Constructor.
-  TAO_FT_Naming_Manager (void);
+  TAO_FT_Naming_Manager ();
 
   void set_replicator (TAO_FT_Naming_Replication_Manager *repl);
 
@@ -109,7 +107,6 @@ public:
    * Methods required by the PortableGroup::PropertyManager interface.
    */
   //@{
-
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
       const PortableGroup::Properties & props);
@@ -169,7 +166,6 @@ public:
    * interface.
    */
   //@{
-
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
   virtual PortableGroup::ObjectGroup_ptr create_member (
@@ -232,7 +228,6 @@ public:
    * Methods required by the PortableGroup::GenericFactory interface.
    */
   //@{
-
   /**
    * Create an object of the specified type that adheres to the
    * restrictions defined by the provided Criteria.  The out
@@ -286,7 +281,7 @@ public:
   void set_global_strategy (const ACE_TCHAR *strat_name);
 
   /// Destructor.
-  ~TAO_FT_Naming_Manager (void);
+  ~TAO_FT_Naming_Manager ();
 
 private:
   /// A utility to ensure we can access the latest object reference for
@@ -323,7 +318,6 @@ private:
    * and Random are supported.
    */
   //@{
-
   /// The "RoundRobin" load balancing strategy.
   TAO_FT_Round_Robin round_robin_;
   /// The "Random" load balancing strategy.
@@ -340,10 +334,8 @@ private:
   PortableGroup::Name built_in_balancing_strategy_name_;
 
   PortableGroup::Name object_group_property_name_;
-
 };
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
index ae18aa384f8..82966a97945 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
@@ -163,7 +163,6 @@ TAO_FT_Naming_Replication_Manager::svc ()
     }
   try
     {
-
       this->orb_->run ();
     }
   catch (const CORBA::SystemException &ex)
@@ -349,7 +348,6 @@ TAO_FT_Naming_Replication_Manager::send_context_update (const ACE_CString & name
 void
 TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs)
 {
-
   if (TAO_debug_level > 1)
     {
       ORBSVCS_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
index 6bf7d63ff8a..a841cff7d9e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
@@ -70,12 +70,12 @@ public:
 
   TAO_FT_Naming_Replication_Manager (TAO_FT_Naming_Server &owner);
 
-  virtual ~TAO_FT_Naming_Replication_Manager(void);
+  virtual ~TAO_FT_Naming_Replication_Manager();
 
   virtual int svc ();
   virtual int handle_exception (ACE_HANDLE );
 
-  void stop (void);
+  void stop ();
   void send_context_update (const ACE_CString &ctx,
                             FT_Naming::ChangeType update);
   void send_objgrp_update (PortableGroup::ObjectGroupId id,
@@ -88,8 +88,8 @@ public:
   void send_registration (bool use_combo);
   bool update_peer_registration ();
 
-  bool peer_available (void);
-  char * ior (void);
+  bool peer_available ();
+  char * ior ();
 
 private:
   Replica_var me_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index e3ce8be3321..91496594ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -126,7 +126,6 @@ TAO_FT_Naming_Server::update_info_i ()
 void
 TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos)
 {
-
   CORBA::ULong count = infos.length();
   FT_Naming::UpdateInfo* guts = infos.get_buffer(true);
   FT_Naming::UpdateInfoSeq_var block = 0;
@@ -322,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)
     {
@@ -412,7 +410,6 @@ TAO_FT_Naming_Server::init_replication_pairing ()
 void
 TAO_FT_Naming_Server::no_replica ()
 {
-
   if (this->server_role_ == BACKUP)
     {
       this->recover_iors ();
@@ -559,9 +556,9 @@ TAO_FT_Naming_Server::parse_args (int argc,
               break;
             }
         }
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
-        // fallthrough
+        ACE_FALLTHROUGH;
       default:
         ORBSVCS_ERROR ((LM_ERROR,ACE_TEXT ("Unknown arg %c\n"), c ));
         ORBSVCS_ERROR_RETURN ((LM_ERROR,
@@ -931,7 +928,6 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt
         }
       else
         {
-
           this->assign (combo, false, iorm->add_profiles (peer,
                                                          this->iors_[local].ref_.in ()));
         }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
index 0b80de5dd72..e24e86bfcae 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
@@ -34,7 +34,7 @@ class TAO_FTNS_Notifier : public ACE_Event_Handler
 public:
   TAO_FTNS_Notifier (TAO_FT_Naming_Server &owner, bool iors);
 
-  virtual int handle_exception (ACE_HANDLE );
+  int handle_exception (ACE_HANDLE) override;
 
   TAO_FT_Naming_Server &owner_;
   bool iors_;
@@ -57,7 +57,7 @@ class TAO_FtNaming_Export TAO_FT_Naming_Server : public TAO_Naming_Server
 public:
   friend class TAO_FTNS_Notifier;
 
-  TAO_FT_Naming_Server (void);
+  TAO_FT_Naming_Server ();
 
   /// Initialize the Naming Service and Object Group Manager with the command line
   /// arguments and the ORB. Overrridden from TAO_Naming_Server
@@ -85,11 +85,11 @@ public:
   /// Returns 0 on successful pairing with peer.
   /// Returns 1 if peer IOR file is present, but peer is not responding
   /// Returns -1 if pairing is not possible.
-  void init_replication_pairing (void);
+  void init_replication_pairing ();
 
-  void no_replica (void);
+  void no_replica ();
 
-  //  TAO_FTNS_Notifier &notifier (void);
+  //  TAO_FTNS_Notifier &notifier ();
 
   /// Overridden parse operation. Only allows options supported by the FT_Naming_Server
   /// and adds options for the object group manager
@@ -104,7 +104,7 @@ public:
   /// Factory method to create a naming context factory for use with
   /// the -f option.
   virtual TAO_Persistent_Naming_Context_Factory *
-    persistent_naming_context_factory (void);
+    persistent_naming_context_factory ();
 
   /// Returns the IOR of the replication manager.
   char* replicator_ior ();
@@ -138,7 +138,6 @@ public:
   void update_iors_i ();
 
 protected:
-
   enum FT_IOR_Indexes {
     PEER_ROOT = 1,
     FT_ROOT,
@@ -149,7 +148,7 @@ protected:
     IOR_ARRAY_SIZE
   };
 
-  int recover_iors (void);
+  int recover_iors ();
 
   /// The object that implements the ObjectGroupManager, PropertyManager,
   /// and GenericFactory interfaces.
@@ -199,9 +198,7 @@ protected:
   ACE_Unbounded_Queue<FT_Naming::UpdateInfoSeq*> u_infos_;
   TAO_SYNCH_MUTEX ior_lock_;
   TAO_SYNCH_MUTEX info_lock_;
-
-
- };
+};
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
index bdc14eeb0f2..227f5130fcc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
@@ -18,15 +18,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::FT_PG_Group_Factory::FT_PG_Group_Factory()
-  : replicator_ (0)
-{
-}
-
-TAO::FT_PG_Group_Factory::~FT_PG_Group_Factory()
-{
-}
-
 void
 TAO::FT_PG_Group_Factory::set_replicator (TAO_FT_Naming_Replication_Manager *repl)
 {
@@ -49,14 +40,15 @@ TAO::FT_PG_Group_Factory::set_object_group_stale (
             {
               ACE_CString change_type_str ("created");
               if (group_info.change_type == FT_Naming::DELETED)
-                change_type_str = "deleted";
-                ORBSVCS_DEBUG ((LM_DEBUG,
+                {
+                  change_type_str = "deleted";
+                }
+              ORBSVCS_DEBUG ((LM_DEBUG,
                             ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory: ")
                             ACE_TEXT ("Setting list store as stale "),
                             ACE_TEXT ("because of group with ID %lld "),
                             ACE_TEXT ("was %C\n"),
-                            group_id, change_type_str.c_str ()
-                            ));
+                            group_id, change_type_str.c_str ()));
             }
           this->list_store_->stale(true);
         }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h
index 1945dffda5c..430d1ffbe34 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h
@@ -33,19 +33,17 @@ class TAO_FT_Naming_Replication_Manager;
 
 namespace TAO
 {
-
   /**
    * class FT_PG_Group_Factory
    */
   class TAO_FtNaming_Export FT_PG_Group_Factory : public PG_Group_Factory
   {
   public:
-
     /// Constructor.
-    FT_PG_Group_Factory ();
+    FT_PG_Group_Factory () = default;
 
     /// Destructor.
-    ~FT_PG_Group_Factory ();
+    ~FT_PG_Group_Factory () override = default;
 
     /**
      * indicate the object group state is stale.
@@ -56,8 +54,7 @@ namespace TAO
     void set_replicator (TAO_FT_Naming_Replication_Manager *repl);
 
   protected:
-
-    virtual PG_Object_Group_Storable * create_persistent_group (
+    PG_Object_Group_Storable * create_persistent_group (
       CORBA::ORB_ptr orb,
       PortableGroup::FactoryRegistry_ptr factory_registry,
       TAO::PG_Object_Group_Manipulator & manipulator,
@@ -66,16 +63,16 @@ namespace TAO
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       const TAO::PG_Property_Set_var & type_properties,
-      TAO::Storable_Factory & storable_factory);
+      TAO::Storable_Factory & storable_factory) override;
 
-    virtual PG_Object_Group_Storable * restore_persistent_group (
+    PG_Object_Group_Storable * restore_persistent_group (
       PortableGroup::ObjectGroupId group_id,
       CORBA::ORB_ptr orb,
       PortableGroup::FactoryRegistry_ptr factory_registry,
       TAO::PG_Object_Group_Manipulator & manipulator,
-      TAO::Storable_Factory & storable_factory);
+      TAO::Storable_Factory & storable_factory) override;
 
-    TAO_FT_Naming_Replication_Manager *replicator_;
+    TAO_FT_Naming_Replication_Manager *replicator_ {};
   };
 } // namespace TAO
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
index 97a7f9cf109..c6bf9106ab9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -52,10 +52,6 @@ TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable
 {
 }
 
-TAO::FT_PG_Object_Group_Storable::~FT_PG_Object_Group_Storable ()
-{
-}
-
 void
 TAO::FT_PG_Object_Group_Storable::stale (bool is_stale)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h
index d63f0878507..da4e7389261 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h
@@ -41,11 +41,7 @@ namespace TAO
   class TAO_FtNaming_Export FT_PG_Object_Group_Storable
     : public PG_Object_Group_Storable
   {
-
-    /////////////////////
-    // Construct/Destruct
   public:
-
     /**
      * This constructor is suitable for creating an object group from
      * scratch.
@@ -75,18 +71,13 @@ namespace TAO
       TAO_FT_Naming_Replication_Manager *replicator);
 
     /// Destructor
-    virtual ~FT_PG_Object_Group_Storable ();
-
-    /////////////////
-    // public methods
+    virtual ~FT_PG_Object_Group_Storable () = default;
 
   public:
-
     virtual void stale (bool is_stale);
     virtual bool stale ();
 
   protected:
-
     virtual void state_written ();
 
     virtual bool is_obsolete (time_t stored_time);
@@ -97,16 +88,11 @@ namespace TAO
       CORBA::Object_ptr member);
 
   private:
-
-    /////////////////////////
-    // Forbidden methods
-    FT_PG_Object_Group_Storable ();
-    FT_PG_Object_Group_Storable (const FT_PG_Object_Group_Storable & rhs);
-    FT_PG_Object_Group_Storable & operator = (
-      const FT_PG_Object_Group_Storable & rhs);
+    FT_PG_Object_Group_Storable () = delete;
+    FT_PG_Object_Group_Storable (const FT_PG_Object_Group_Storable &) = delete;
+    FT_PG_Object_Group_Storable & operator = (const FT_PG_Object_Group_Storable &) = delete;
 
     /// Replication persistence support
-
     bool stale_;
 
     /// Track if the persistent file used for storage has been created yet
@@ -124,7 +110,6 @@ namespace TAO
      * resolution.
      */
     int propagate_update_notification (FT_Naming::ChangeType change_type);
-
   };
 } // namespace TAO
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
index 5ef67c277eb..b1fbdc028a0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -27,13 +27,6 @@ TAO_FT_Persistent_Naming_Context::TAO_FT_Persistent_Naming_Context (
                                    map,
                                    counter)
 {
-
-}
-
-
-TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context ()
-{
-  // Perform appropriate cleanup based on the destruction level specified.
 }
 
 
@@ -57,7 +50,6 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n)
   // Get the locations of the object group members and we will use them to
   // do the load balancing
   try {
-
     // Make sure object is an object group.
     // We will return the object reference all the way back out to the client
     // if not
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
index e1833019aaa..4d793870ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
@@ -8,14 +8,13 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_FT_PERSISTENT_NAMING_CONTEXT_H
 #define TAO_FT_PERSISTENT_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/Naming/Persistent_Naming_Context.h"
 #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
 #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -47,7 +46,7 @@ public:
                                     ACE_UINT32 *counter = 0);
 
   /// Destructor.
-  virtual ~TAO_FT_Persistent_Naming_Context (void);
+  virtual ~TAO_FT_Persistent_Naming_Context () = default;
 
   /**
    * Override the resolve operation to support load balancing using
@@ -61,7 +60,6 @@ public:
 
 protected:
   static TAO_FT_Naming_Manager *naming_manager_impl_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
index 1a399836ca8..a7c834216c0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
@@ -3,20 +3,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/// Constructor.
-TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory ()
-: TAO_Persistent_Naming_Context_Factory ()
-{
-
-}
-
-/// Destructor.  Does not deallocate the hash map: if an instance of
-/// this class goes out of scope, its hash_map remains in persistent storage.
-TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory ()
-{
-}
-
-
 /// Factory method for creating an implementation object for naming contexts
 TAO_Persistent_Naming_Context*
 TAO_FT_Persistent_Naming_Context_Factory::create_naming_context_impl (
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h
index 251e5b4a2b8..acded3c4894 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h
@@ -30,19 +30,19 @@ class TAO_FtNaming_Export TAO_FT_Persistent_Naming_Context_Factory
 {
 public:
   /// Constructor.
-  TAO_FT_Persistent_Naming_Context_Factory (void);
+  TAO_FT_Persistent_Naming_Context_Factory () = default;
 
   /// Destructor.  Does not deallocate the hash map: if an instance of
   /// this class goes out of scope, its hash_map remains in persistent storage.
-  virtual ~TAO_FT_Persistent_Naming_Context_Factory (void);
+  ~TAO_FT_Persistent_Naming_Context_Factory () override = default;
 
   /// Factory method for creating an implementation object for naming contexts
-  virtual TAO_Persistent_Naming_Context* create_naming_context_impl (
+  TAO_Persistent_Naming_Context* create_naming_context_impl (
     PortableServer::POA_ptr poa,
     const char *poa_id,
     TAO_Persistent_Context_Index *context_index,
     HASH_MAP * map = 0,
-    ACE_UINT32 *counter = 0);
+    ACE_UINT32 *counter = 0) override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
index 7c2cf1a2134..5d1612290f8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
@@ -9,14 +9,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Random::TAO_FT_Random ()
-{
-}
-
-TAO_FT_Random::~TAO_FT_Random ()
-{
-}
-
 bool
 TAO_FT_Random::next_location (
       PortableGroup::ObjectGroup_ptr object_group,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.h
index 28a20ef67d2..76c71a3f562 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.h
@@ -45,12 +45,11 @@ class TAO_FT_Naming_Manager;
 class TAO_FtNaming_Export TAO_FT_Random
 {
 public:
-
   /// Constructor.
-  TAO_FT_Random (void);
+  TAO_FT_Random () = default;
 
   /// Destructor
-  virtual ~TAO_FT_Random (void);
+  virtual ~TAO_FT_Random () = default;
 
   /// This function obtains the next object's location as it is bound
   /// within the object group.
@@ -65,7 +64,6 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       TAO_FT_Naming_Manager *naming_manager,
       PortableGroup::Location& location);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
index d4246736ab0..d9d4636b779 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
@@ -15,11 +15,6 @@ TAO_FT_Round_Robin::TAO_FT_Round_Robin ()
 {
 }
 
-TAO_FT_Round_Robin::~TAO_FT_Round_Robin ()
-{
-}
-
-
 bool
 TAO_FT_Round_Robin::next_location (
       PortableGroup::ObjectGroup_ptr object_group,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h
index 6076c463443..91458e1c36b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h
@@ -22,7 +22,6 @@
 
 #include "orbsvcs/Naming/FaultTolerant/FT_Location_Index_Map.h"
 
-
 #include "orbsvcs/CosLoadBalancingS.h"
 #include "ace/Vector_T.h"
 #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
@@ -45,9 +44,8 @@ class TAO_FT_Naming_Manager;
 class TAO_FtNaming_Export TAO_FT_Round_Robin
 {
 public:
-
   /// Constructor.
-  TAO_FT_Round_Robin (void);
+  TAO_FT_Round_Robin ();
 
   /// This function obtains the next object's location as it is bound
   /// within the object group.
@@ -64,10 +62,9 @@ public:
       PortableGroup::Location& location);
 
   /// Destructor
-  virtual ~TAO_FT_Round_Robin (void);
+  virtual ~TAO_FT_Round_Robin () = default;
 
 private:
-
   /// Lock used to ensure atomic access to state retained by this
   /// class.
   TAO_SYNCH_MUTEX lock_;
@@ -83,7 +80,6 @@ private:
    * to be returned from the Strategy::next_member() method.
    */
   TAO_FT_Location_Index_Map location_index_map_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index aaba0319349..a7e0034a1f9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -31,16 +31,8 @@ TAO_FT_Storable_Naming_Context::TAO_FT_Storable_Naming_Context (CORBA::ORB_ptr o
     stale_ (false),
     replicator_ (((TAO_FT_Storable_Naming_Context_Factory *)cxt_factory)->replicator())
 {
-
-}
-
-
-TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context ()
-{
-  // Perform appropriate cleanup based on the destruction level specified.
 }
 
-
 CORBA::Boolean
 TAO_FT_Storable_Naming_Context::is_object_group (CORBA::Object_ptr obj) const
 {
@@ -62,7 +54,6 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
   CORBA::Object_var resolved_ref = TAO_Storable_Naming_Context::resolve(n);
 
   try {
-
     // Make sure object is an object group.
     // We will return the object reference as is all the way back
     // out to the client if not
@@ -129,7 +120,6 @@ TAO_FT_Storable_Naming_Context::stale ()
   return stale_;
 }
 
-
 void
 TAO_FT_Storable_Naming_Context::context_written ()
 {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
index af00704fb9b..84f16595d30 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
@@ -9,14 +9,13 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_FT_STORABLE_NAMING_CONTEXT_H
 #define TAO_FT_STORABLE_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/Naming/Storable_Naming_Context.h"
 #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
 #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
 #include "orbsvcs/FT_NamingReplicationC.h"
 
@@ -49,7 +48,7 @@ public:
                                   TAO::Storable_Factory *factory);
 
   /// Destructor.
-  virtual ~TAO_FT_Storable_Naming_Context (void);
+  virtual ~TAO_FT_Storable_Naming_Context () = default;
 
   /**
    * Override the resolve operation to support load balancing using
@@ -81,13 +80,13 @@ public:
    */
   virtual void stale (bool is_stale);
 
-  virtual bool stale (void);
+  virtual bool stale ();
 
   /**
    * An internal utility used to signal that this context was updated.
    * Check the last_changed_ attribute for the time of the write.
    */
-  void context_written (void);
+  void context_written ();
 
   /**
    * An internal callback invoked by the File_Open_Lock_and_Check
@@ -97,11 +96,9 @@ public:
   virtual bool is_obsolete (time_t stored_time);
 
 protected:
-
   static TAO_FT_Naming_Manager *naming_manager_;
   bool stale_;
   TAO_FT_Naming_Replication_Manager *replicator_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
index 648ec3a7654..a3fb4a85845 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
@@ -22,13 +22,6 @@ TAO_FT_Storable_Naming_Context_Factory (size_t hash_table_size,
 {
 }
 
-  /// Destructor.  Does not deallocate the hash map: if an instance of
-  /// this class goes out of scope, its hash_map remains in persistent storage.
-TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory ()
-{
-}
-
-
 TAO_FT_Naming_Replication_Manager *
 TAO_FT_Storable_Naming_Context_Factory::replicator ()
 {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
index d59ccf32af4..0777beee44e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
@@ -45,9 +45,9 @@ public:
 
   /// Destructor.  Does not deallocate the hash map: if an instance of
   /// this class goes out of scope, its hash_map remains in persistent storage.
-  virtual ~TAO_FT_Storable_Naming_Context_Factory (void);
+  virtual ~TAO_FT_Storable_Naming_Context_Factory () = default;
 
-  TAO_FT_Naming_Replication_Manager * replicator (void);
+  TAO_FT_Naming_Replication_Manager * replicator ();
 
   /// Factory method for creating an implementation object for naming contexts.
   /// If an existing naming context implementation is being rebuilt,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
index 4af5d580395..800b09cbb2f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
@@ -12,8 +12,7 @@
 #include "orbsvcs/Naming/FaultTolerant/nsgroup_svc.h"
 #include "ace/OS_NS_strings.h"
 
-
-NS_group_svc::NS_group_svc (bool quiet )
+NS_group_svc::NS_group_svc (bool quiet)
   : quiet_ (quiet)
 {
 }
@@ -41,7 +40,6 @@ NS_group_svc::determine_policy_string (const ACE_TCHAR *policy,
 int
 NS_group_svc::set_orb( CORBA::ORB_ptr orb)
 {
-
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -60,7 +58,6 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb)
 int
 NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm)
 {
-
   this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm);
 
   if (CORBA::is_nil (this->naming_manager_.in ()))
@@ -78,7 +75,6 @@ NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm)
 int
 NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc)
 {
-
   this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc);
 
   if (CORBA::is_nil (this->name_service_.in ()))
@@ -236,7 +232,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name,
 
   try
     {
-
       PortableGroup::ObjectGroup_var group_var =
         this->naming_manager_->get_object_group_ref_from_name
            (ACE_TEXT_ALWAYS_CHAR(group_name));
@@ -255,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& )
     {
@@ -371,7 +365,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path)
     }
   catch (const CORBA::Exception& )
     {
-
       if (TAO_debug_level > 2)
         {
           ORBSVCS_ERROR ((LM_ERROR,
@@ -391,7 +384,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path)
 int
 NS_group_svc::group_list ()
 {
-
   // KCS: The group list is independent of locations. I created a new operation in the
   // naming manager IDL to support requesting the group list - which is a list of names
 
@@ -436,7 +428,6 @@ NS_group_svc::display_load_policy_group(FT_Naming::LoadBalancingStrategyValue st
                           display_label));
           if ( list->length () > 0 )
             {
-
               for (unsigned int i = 0; i < list->length (); ++i)
                 {
                   CORBA::String_var s = CORBA::string_dup (list[i]);
@@ -622,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&)
     {
@@ -842,7 +832,6 @@ NS_group_svc::member_show (const ACE_TCHAR* group_name,
     }
   catch (const PortableGroup::ObjectGroupNotFound&)
     {
-
       if (TAO_debug_level > 2)
         {
           ORBSVCS_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h
index 16d2e19a642..47d139210bd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h
@@ -25,7 +25,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class  TAO_FtNaming_Intf_Export NS_group_svc
 {
 public:
-
   /**
    *  Constructor
    */
@@ -67,7 +66,7 @@ public:
    *
    *  @return 0 on success, -1 on failure, -2 on bad argument.
    */
-  int group_list (void);
+  int group_list ();
 
   /**
    *  The naming service shall provide a command line utility to modify the load
@@ -159,9 +158,8 @@ public:
   int set_name_context( CosNaming::NamingContextExt_ptr value);
 
 private:
-
   /**
-   *  determine stategy based on policy string
+   *  determine strategy based on policy string
    *
    *  @param const ACE_TCHAR *policy ["round"]
    *  @param FT_Naming::LoadBalancingStrategyValue& value
@@ -179,14 +177,12 @@ private:
     const ACE_TCHAR *display_label);
 
 private:
-
   FT_Naming::NamingManager_var naming_manager_;
 
   CosNaming::NamingContextExt_var name_service_;
 
   CORBA::ORB_var orb_;
   bool quiet_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 100612561c0..464f46def2e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -48,15 +48,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Naming_Serv_Export TAO_Bindings_Map
 {
-
 public:
-
   /// Destructor.
-  virtual ~TAO_Bindings_Map (void);
+  virtual ~TAO_Bindings_Map ();
 
   /// Return current number of entries (name bindings) in the
   /// underlying hash map.
-  virtual size_t current_size (void) = 0;
+  virtual size_t current_size () = 0;
 
   /**
    * Add a binding with the specified parameters to the table.
@@ -94,7 +92,6 @@ public:
                     const char * kind,
                     CORBA::Object_ptr & obj,
                     CosNaming::BindingType &type) = 0;
-
 };
 
 /**
@@ -122,20 +119,20 @@ public:
   void interface (TAO_Naming_Context *i);
 
   /// Destructor.
-  virtual ~TAO_Hash_Naming_Context (void);
+  virtual ~TAO_Hash_Naming_Context ();
 
   // = Accessors.
 
   /// Get the pointer to our interface.
-  TAO_Naming_Context *interface (void);
+  TAO_Naming_Context *interface ();
 
   /// Returns true if this Naming Context is a root Naming Context for
   /// the server, and false otherwise.
-  int root (void);
+  int root ();
 
   /// Returns true if this context had <destroy> operation invoked on
   /// it, and false otherwise.
-  int destroyed (void);
+  int destroyed ();
 
   // = CosNaming::NamingContext idl interface methods.
 
@@ -208,12 +205,12 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
-  TAO_SYNCH_RW_MUTEX &lock (void);
+  TAO_SYNCH_RW_MUTEX &lock ();
 
 protected:
   // = Helper method used by other methods.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
index e09e93c265d..545608747af 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
@@ -39,7 +39,7 @@ class TAO_Naming_Export TAO_Naming_Client
 {
 public:
   /// Default constructor.
-  TAO_Naming_Client (void);
+  TAO_Naming_Client ();
 
   /**
    * Look for a Naming Service for a period of @a timeout using
@@ -49,7 +49,7 @@ public:
   int init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout = 0);
 
   /// Destructor.
-  ~TAO_Naming_Client (void);
+  ~TAO_Naming_Client ();
 
   /// Returns a pointer to the root Naming Context.
   CosNaming::NamingContext_ptr operator-> () const;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 11858f0ece8..2d0f3187ff1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -166,7 +166,6 @@ TAO_Naming_Context::to_string (const CosNaming::Name &n)
   // Stringify the name
   for (i=0; i < n.length (); ++i)
     {
-
       // Stringify Id
       //
       const char *id = n[i].id.in ();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 3a89382918a..4b011f7bf15 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -49,7 +49,7 @@ public:
   TAO_Naming_Context (TAO_Naming_Context_Impl *impl);
 
   /// Destructor.
-  ~TAO_Naming_Context (void);
+  ~TAO_Naming_Context ();
 
   // = CosNaming::NamingContext idl interface methods.
 
@@ -131,7 +131,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -180,7 +180,7 @@ public:
   void stale (bool value);
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   enum Hint
@@ -226,7 +226,6 @@ private:
                                                   const char *sn);
 
 protected:
-
   /// A concrete implementor of the NamingContext functions.
   TAO_Naming_Context_Impl *impl_;
 };
@@ -242,11 +241,9 @@ protected:
  */
 class TAO_Naming_Serv_Export TAO_Naming_Context_Impl
 {
-
 public:
-
   /// Destructor.
-  virtual ~TAO_Naming_Context_Impl (void);
+  virtual ~TAO_Naming_Context_Impl ();
 
   // = CosNaming::NamingContext idl interface methods.
 
@@ -308,7 +305,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void) = 0;
+  virtual CosNaming::NamingContext_ptr new_context () = 0;
 
   /**
    * This operation creates a new context and binds it to the name
@@ -326,7 +323,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void) = 0;
+  virtual void destroy () = 0;
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -339,7 +336,7 @@ public:
                      CosNaming::BindingIterator_out &bi) = 0;
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void) = 0;
+  virtual PortableServer::POA_ptr _default_POA () = 0;
 
   /**
    * Set the stale flag for replicated persistence support.
@@ -350,7 +347,7 @@ public:
    * Query if the the implementation is stale for replicated
    * persistence support.
    */
-  virtual bool stale (void);
+  virtual bool stale ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 31cf92cecab..38c54893402 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -79,7 +79,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
                                   int argc,
                                   ACE_TCHAR *argv[])
 {
-
   if (this->naming_server_ == 0)
     {
       ORBSVCS_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 59e27d91b76..c6634e80d49 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -260,7 +260,7 @@ TAO_Naming_Server::parse_args (int argc,
         this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case '?':
-        // fallthrough
+        ACE_FALLTHROUGH;
       default:
 #if !defined (ACE_NLOGGING)
         const ACE_TCHAR *reqNonMinCorba=
@@ -572,7 +572,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         // Initialize Persistent Naming Service.
         //
         {
-
           // Create Naming Context Implementation Factory to be used for the creation of
           // naming contexts by the TAO_Persistent_Context_Index
           TAO_Persistent_Naming_Context_Factory *naming_context_factory =
@@ -608,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)
@@ -787,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&)
     {
@@ -908,7 +905,6 @@ TAO_Naming_Server::bundle_at(size_t ndx) const
   }
 
 
-
 int
 TAO_Naming_Server::write(size_t ndx) const
 {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index a01b6ba4aaf..58645108b88 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -128,10 +128,10 @@ public:
   virtual int fini ();
 
   /// Destructor.
-  virtual ~TAO_Naming_Server (void);
+  virtual ~TAO_Naming_Server ();
 
   /// Returns the IOR of the naming service.
-  char * naming_service_ior (void);
+  char * naming_service_ior ();
 
   /// Returns a <NamingContext_ptr> for the root Naming Context.
   CosNaming::NamingContext_ptr operator-> () const;
@@ -188,7 +188,7 @@ protected:
    * the -f option.
    */
   virtual TAO_Persistent_Naming_Context_Factory *
-    persistent_naming_context_factory (void);
+    persistent_naming_context_factory ();
 
   /// The ior_multicast event handler.
   TAO_IOR_Multicast *ior_multicast_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
index babe95ecbab..09f4e02918c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
@@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node)
 
 template <class T>
-ACE_NS_Node<T>::~ACE_NS_Node (void)
+ACE_NS_Node<T>::~ACE_NS_Node ()
 {
 }
 
@@ -85,7 +85,7 @@ ACE_Unbounded_List<T>::insert_tail (const T &item)
 }
 
 template <class T> void
-ACE_Unbounded_List<T>::reset (void)
+ACE_Unbounded_List<T>::reset ()
 {
   ACE_TRACE ("reset");
 
@@ -125,7 +125,7 @@ ACE_Unbounded_List<T>::copy_nodes (const ACE_Unbounded_List<T> &us)
 }
 
 template <class T> void
-ACE_Unbounded_List<T>::delete_nodes (void)
+ACE_Unbounded_List<T>::delete_nodes ()
 {
   ACE_NS_Node<T> *curr = this->head_->next_;
 
@@ -147,7 +147,7 @@ ACE_Unbounded_List<T>::delete_nodes (void)
 }
 
 template <class T>
-ACE_Unbounded_List<T>::~ACE_Unbounded_List (void)
+ACE_Unbounded_List<T>::~ACE_Unbounded_List ()
 {
   // ACE_TRACE ("ACE_Unbounded_List<T>::~ACE_Unbounded_List");
 
@@ -246,14 +246,14 @@ ACE_Unbounded_List<T>::remove (const T &item)
 }
 
 template <class T> ACE_Unbounded_List_Iterator<T>
-ACE_Unbounded_List<T>::begin (void)
+ACE_Unbounded_List<T>::begin ()
 {
   // ACE_TRACE ("ACE_Unbounded_List<T>::begin");
   return ACE_Unbounded_List_Iterator<T> (*this);
 }
 
 template <class T> ACE_Unbounded_List_Iterator<T>
-ACE_Unbounded_List<T>::end (void)
+ACE_Unbounded_List<T>::end ()
 {
   // ACE_TRACE ("ACE_Unbounded_List<T>::end");
   return ACE_Unbounded_List_Iterator<T> (*this, 1);
@@ -277,7 +277,7 @@ ACE_Unbounded_List_Iterator<T>::ACE_Unbounded_List_Iterator (ACE_Unbounded_List<
 }
 
 template <class T> int
-ACE_Unbounded_List_Iterator<T>::advance (void)
+ACE_Unbounded_List_Iterator<T>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::advance");
   this->current_ = this->current_->next_;
@@ -285,7 +285,7 @@ ACE_Unbounded_List_Iterator<T>::advance (void)
 }
 
 template <class T> int
-ACE_Unbounded_List_Iterator<T>::first (void)
+ACE_Unbounded_List_Iterator<T>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::first");
   this->current_ = this->set_->head_->next_;
@@ -326,9 +326,9 @@ ACE_Unbounded_List_Iterator<T>::operator++ (int)
 }
 
 template <class T> ACE_Unbounded_List_Iterator<T>&
-ACE_Unbounded_List_Iterator<T>::operator++ (void)
+ACE_Unbounded_List_Iterator<T>::operator++ ()
 {
-  // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator++ (void)");
+  // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator++ ()");
 
   // prefix operator
 
@@ -337,7 +337,7 @@ ACE_Unbounded_List_Iterator<T>::operator++ (void)
 }
 
 template <class T> T&
-ACE_Unbounded_List_Iterator<T>::operator* (void)
+ACE_Unbounded_List_Iterator<T>::operator* ()
 {
   //ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator*");
   T *retv = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index df514f3a72a..8897a02cde2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -44,7 +44,7 @@ public:
   friend class ACE_Unbounded_List<T>;
   friend class ACE_Unbounded_List_Iterator<T>;
 
-  ~ACE_NS_Node (void);
+  ~ACE_NS_Node ();
 
 private:
   ACE_NS_Node (const T &i, ACE_NS_Node<T> *n);
@@ -76,11 +76,11 @@ public:
 
   /// Move forward by one element in the List.  Returns 0 when all the
   /// items in the List have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the List.  Returns 0 if the
   /// List is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
   int done () const;
@@ -94,10 +94,10 @@ public:
   ACE_Unbounded_List_Iterator<T> operator++ (int);
 
   /// Prefix advance.
-  ACE_Unbounded_List_Iterator<T>& operator++ (void);
+  ACE_Unbounded_List_Iterator<T>& operator++ ();
 
   /// Returns a reference to the interal element <this> is pointing to.
-  T& operator* (void);
+  T& operator* ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Unbounded_List_Iterator<T> &) const;
@@ -144,7 +144,7 @@ public:
   void operator= (const ACE_Unbounded_List<T> &);
 
   /// Destructor.
-  ~ACE_Unbounded_List (void);
+  ~ACE_Unbounded_List ();
 
   // = Check boundary conditions.
 
@@ -177,11 +177,11 @@ public:
   void dump () const;
 
   /// Reset the <ACE_Unbounded_List> to be empty.
-  void reset (void);
+  void reset ();
 
   // = STL-styled unidirectional iterator factory.
-  ACE_Unbounded_List_Iterator<T> begin (void);
-  ACE_Unbounded_List_Iterator<T> end (void);
+  ACE_Unbounded_List_Iterator<T> begin ();
+  ACE_Unbounded_List_Iterator<T> end ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -192,7 +192,7 @@ private:
   int insert_tail (const T &item);
 
   /// Delete all the nodes in the List.
-  void delete_nodes (void);
+  void delete_nodes ();
 
   /// Copy nodes into this set.
   void copy_nodes (const ACE_Unbounded_List<T> &);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 896f31bc96f..d042436d088 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -144,7 +144,6 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     // CASE 1:there are no Naming Contexts registered.  We need to create
     // one.
     {
-
       this->root_context_ =
         TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
                                                          TAO_ROOT_NAMING_CONTEXT,
@@ -222,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/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index 82aba1c6c65..dda89d4974a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -99,7 +99,7 @@ public:
    * not deleted, since we want it to keep the state of the Naming
    * Service until the next run.
    */
-  ~TAO_Persistent_Context_Index (void);
+  ~TAO_Persistent_Context_Index ();
 
   // = Methods for adding/removing entries.
 
@@ -117,14 +117,14 @@ public:
   // = Accessors.
 
   /// Return allocator.
-  ACE_Allocator *allocator (void);
+  ACE_Allocator *allocator ();
 
   /// Return orb pointer.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Return a pointer to the root Naming Context (returns a copy - must be
   /// deallocated by the user).
-  CosNaming::NamingContext_ptr root_context (void);
+  CosNaming::NamingContext_ptr root_context ();
 
 private:
   /// Helper for the <init> method.  Iterates over <index_>, and
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index e2d89857f97..69bcbc26986 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_IntId
 {
 public:
   /// Constructor.
-  TAO_Persistent_IntId (void);
+  TAO_Persistent_IntId ();
 
   /// Constructor.
   TAO_Persistent_IntId (char * obj_ref,
@@ -51,7 +51,7 @@ public:
   TAO_Persistent_IntId (const TAO_Persistent_IntId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_IntId (void);
+  ~TAO_Persistent_IntId ();
 
   /// Assignment operator.
   void operator= (const TAO_Persistent_IntId & rhs);
@@ -83,7 +83,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_ExtId
 {
 public:
   /// Constructor.
-  TAO_Persistent_ExtId (void);
+  TAO_Persistent_ExtId ();
 
   /// Constructor.
   TAO_Persistent_ExtId (const char *id,
@@ -93,7 +93,7 @@ public:
   TAO_Persistent_ExtId (const TAO_Persistent_ExtId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_ExtId (void);
+  ~TAO_Persistent_ExtId ();
 
   // = Assignment and comparison methods.
 
@@ -122,8 +122,8 @@ public:
 
   // Accessors.
 
-  const char * id (void);
-  const char * kind (void);
+  const char * id ();
+  const char * kind ();
 };
 
 /**
@@ -143,7 +143,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId
 {
 public:
   /// Constructor.
-  TAO_Persistent_Index_IntId (void);
+  TAO_Persistent_Index_IntId ();
 
   /// Constructor.
   TAO_Persistent_Index_IntId (ACE_UINT32 *counter,
@@ -154,7 +154,7 @@ public:
   TAO_Persistent_Index_IntId (const TAO_Persistent_Index_IntId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_Index_IntId (void);
+  ~TAO_Persistent_Index_IntId ();
 
   /// Assignment operator (does copy memory).
   void operator= (const TAO_Persistent_Index_IntId & rhs);
@@ -186,7 +186,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId
 {
 public:
   /// Constructor.
-  TAO_Persistent_Index_ExtId (void);
+  TAO_Persistent_Index_ExtId ();
 
   /// Constructor.
   TAO_Persistent_Index_ExtId (const char *poa_id);
@@ -195,7 +195,7 @@ public:
   TAO_Persistent_Index_ExtId (const TAO_Persistent_Index_ExtId & rhs);
 
   /// Destructor.
-  ~TAO_Persistent_Index_ExtId (void);
+  ~TAO_Persistent_Index_ExtId ();
 
   // = Assignment and comparison methods.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index ca8c7300426..deb839039e8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -178,7 +178,7 @@ public:
                                  ACE_UINT32 *counter = 0);
 
   /// Destructor.
-  virtual ~TAO_Persistent_Naming_Context (void);
+  virtual ~TAO_Persistent_Naming_Context ();
 
   // = Utility methods.
   /**
@@ -200,7 +200,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void);
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * Returns at most the requested number of bindings @a how_many in
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
index 771c2bed9c2..bbb96410dba 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Constructor.
 TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory ()
 {
-
 }
 
 /// Destructor.  Does not deallocate the hash map: if an instance of
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 9b113af9710..abb5b1edd81 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -307,7 +307,6 @@ bool
 TAO_Storable_Naming_Context::
 File_Open_Lock_and_Check::object_obsolete ()
 {
-
   // Query the underlying context if it is obsolete with respect
   // to the provided file last-changed time
   return (context_->is_obsolete (fl_->last_changed ()));
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 62735014be3..ef6222589ed 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -37,7 +37,7 @@ class TAO_Naming_Serv_Export TAO_Storable_IntId
 {
 public:
   /// Constructor.
-  TAO_Storable_IntId (void);
+  TAO_Storable_IntId ();
 
   /// Constructor.
   TAO_Storable_IntId (/* in */ const char * ior,
@@ -47,7 +47,7 @@ public:
   TAO_Storable_IntId (const TAO_Storable_IntId & rhs);
 
   /// Destructor.
-  ~TAO_Storable_IntId (void);
+  ~TAO_Storable_IntId ();
 
   /// Assignment operator.
   void operator= (const TAO_Storable_IntId & rhs);
@@ -65,7 +65,7 @@ class TAO_Naming_Serv_Export TAO_Storable_ExtId
 {
 public:
   /// Constructor.
-  TAO_Storable_ExtId (void);
+  TAO_Storable_ExtId ();
 
   /// Constructor.
   TAO_Storable_ExtId (/* in */ const char *id,
@@ -75,7 +75,7 @@ public:
   TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs);
 
   /// Destructor.
-  ~TAO_Storable_ExtId (void);
+  ~TAO_Storable_ExtId ();
 
   // = Assignment and comparison methods.
 
@@ -105,9 +105,8 @@ public:
   // Accessors.
   // follow the mapping rules!
 
-  const char * id (void);
-  const char * kind (void);
-
+  const char * id ();
+  const char * kind ();
 };
 
 
@@ -132,19 +131,19 @@ public:
   TAO_Storable_Bindings_Map (size_t hash_table_size, CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_Storable_Bindings_Map (void);
+  virtual ~TAO_Storable_Bindings_Map ();
 
   // = Accessors.
 
   /// Get a reference to the underlying hash map.
-  HASH_MAP &map (void);
+  HASH_MAP &map ();
 
   /// Return the size of the underlying hash table.
-  size_t total_size (void);
+  size_t total_size ();
 
   /// Return current number of entries (name bindings) in the
   /// underlying hash map.
-  virtual size_t current_size (void);
+  virtual size_t current_size ();
 
   // = Name bindings manipulation methods.
 
@@ -188,7 +187,6 @@ public:
                     CosNaming::BindingType &type);
 
 private:
-
   /// Helper: factors common code from <bind> and <rebind>.
   int shared_bind (const char *id,
                    const char *kind,
@@ -200,7 +198,6 @@ private:
   HASH_MAP map_;
 
   CORBA::ORB_var orb_;
-
 };
 
 /**
@@ -231,7 +228,7 @@ public:
                                size_t hash_table_size = ACE_DEFAULT_MAP_SIZE);
 
   /// Destructor.
-  virtual ~TAO_Storable_Naming_Context (void);
+  virtual ~TAO_Storable_Naming_Context ();
 
   // = Utility methods.
   /**
@@ -267,7 +264,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void);
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -345,15 +342,14 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
-
   /**
    * A helper function to ensure the current object was not destroyed by raising
    * an exception if it was. Uses the lock as a Reader.
    */
-  void verify_not_destroyed (void);
+  void verify_not_destroyed ();
 
   /**
    * A helper function to validate the name argument and return a final context
@@ -368,7 +364,7 @@ protected:
    * This will have been done after the file is closed. Check the
    * last_changed_ attribute for the time of the write.
    */
-  virtual void context_written (void);
+  virtual void context_written ();
 
   /**
    * An internal callback invoked by the File_Open_Lock_and_Check
@@ -433,7 +429,6 @@ class TAO_Naming_Serv_Export File_Open_Lock_and_Check :
 public TAO::Storable_File_Guard
 {
 public:
-
   /// Constructor
   File_Open_Lock_and_Check (TAO_Storable_Naming_Context * context,
                             Method_Type method_type,
@@ -442,15 +437,14 @@ public:
   ~File_Open_Lock_and_Check ();
 
 protected:
-
   /// Check if the guarded object is current with the last
   /// update which could have been performed independently of
   /// the owner of this object.
-  virtual bool object_obsolete (void);
+  virtual bool object_obsolete ();
 
   /// Mark the object as current with respect to the
   /// file to which it was persisted.
-  virtual void mark_object_current (void);
+  virtual void mark_object_current ();
 
   /// Mark the time at which the object was modified and
   virtual void set_object_last_changed (const time_t & time);
@@ -467,10 +461,9 @@ protected:
 
 private:
   /// Default constructor
-  File_Open_Lock_and_Check(void);
+  File_Open_Lock_and_Check();
 
   TAO_Storable_Naming_Context * context_;
-
 }; // end of embedded class File_Open_Lock_and_Check
 
   friend class File_Open_Lock_and_Check;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index f4f20070e81..b98b23b428c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -40,7 +40,6 @@ TAO_Storable_Naming_Context_Activator::incarnate (
     const PortableServer::ObjectId &oid,
     PortableServer::POA_ptr poa)
 {
-
   // Make sure complete initialization has been done
   ACE_ASSERT (persistence_factory_ != 0);
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h
index 934790c6548..9ace464e04d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h
@@ -44,7 +44,7 @@ public:
 
   /// Destructor.  Does not deallocate the hash map: if an instance of
   /// this class goes out of scope, its hash_map remains in persistent storage.
-  virtual ~TAO_Storable_Naming_Context_Factory (void);
+  virtual ~TAO_Storable_Naming_Context_Factory ();
 
   /// Factory method for creating an implementation object for naming contexts.
   /// If an existing naming context implementation is being rebuilt, the map
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
index 05a80e20651..ec3195f1a1f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
@@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global
     }
 
   global.counter(counter);
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
index b2f20ec58af..5bd4a7ebc8a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
@@ -36,7 +36,6 @@ class TAO_NS_Persistence_Global;
 class TAO_Storable_Naming_Context_ReaderWriter
 {
 public:
-
   TAO_Storable_Naming_Context_ReaderWriter (TAO::Storable_Base & stream);
 
   int read (TAO_Storable_Naming_Context & context);
@@ -47,7 +46,6 @@ public:
   void read_global (TAO_NS_Persistence_Global & global);
 
 private:
-
   void write_header (const TAO_NS_Persistence_Header & header);
   void read_header (TAO_NS_Persistence_Header & header);
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 0836bd43139..4f725cbb11e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -12,7 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index b3f7fa3db5b..5bf39fd6f03 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -43,19 +43,19 @@ public:
   TAO_Transient_Bindings_Map (size_t hash_table_size);
 
   /// Destructor.
-  virtual ~TAO_Transient_Bindings_Map (void);
+  virtual ~TAO_Transient_Bindings_Map ();
 
   // = Accessors.
 
   /// Get a reference to the underlying hash map.
-  HASH_MAP &map (void);
+  HASH_MAP &map ();
 
   /// Return the size of the underlying hash table.
-  size_t total_size (void);
+  size_t total_size ();
 
   /// Return current number of entries (name bindings) in the
   /// underlying hash map.
-  virtual size_t current_size (void);
+  virtual size_t current_size ();
 
   // = Name bindings manipulation methods.
 
@@ -100,7 +100,6 @@ public:
                     CosNaming::BindingType &type);
 
 private:
-
   /// Helper: factors common code from <bind> and <rebind>.
   int shared_bind (const char *id,
                    const char *kind,
@@ -138,7 +137,7 @@ public:
                                 = ACE_DEFAULT_MAP_SIZE);
 
   /// Destructor.
-  virtual ~TAO_Transient_Naming_Context (void);
+  virtual ~TAO_Transient_Naming_Context ();
 
   // = Utility methods.
   /**
@@ -159,7 +158,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (void);
+  virtual CosNaming::NamingContext_ptr new_context ();
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -172,7 +171,6 @@ public:
                      CosNaming::BindingIterator_out &bi);
 
 protected:
-
   /// Counter used for generation of POA ids for children Naming
   /// Contexts.
   ACE_UINT32 counter_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 0ad5f026dc3..d369a3af82e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -62,7 +62,6 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent)
   this->proxy_container_.reset (proxy_container);
 
   this->proxy_container().init ();
-
 }
 
 void
@@ -223,5 +222,4 @@ TAO_Notify_Admin::validate ()
 }
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index ae81025fe23..accd1590bc8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -57,14 +57,14 @@ public:
                       bool experienced_timeout);
 
   /// Access Admin FilterAdmin.
-  TAO_Notify_FilterAdmin& filter_admin (void);
+  TAO_Notify_FilterAdmin& filter_admin ();
 
   /// Set Filter operator
   void filter_operator (
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator);
 
   /// Access Filter operator
-  CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator ();
 
   /// Obtain the Admin's subscribed types.
   void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
@@ -72,12 +72,12 @@ public:
   TAO_Notify_EventChannel * event_channel () const;
 
   /// Shutdown
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
     CORBA::Long id, const TAO_Notify::NVPList& attrs);
-  virtual void reconnect (void);
+  virtual void reconnect ();
 
   virtual void validate ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
index db6dd43b5bf..e83f0799973 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
@@ -10,7 +10,7 @@ TAO_Notify_Admin::event_channel () const
 
 
 ACE_INLINE TAO_Notify_FilterAdmin&
-TAO_Notify_Admin::filter_admin (void)
+TAO_Notify_Admin::filter_admin ()
 {
   return this->filter_admin_;
 }
@@ -22,7 +22,7 @@ TAO_Notify_Admin::filter_operator (CosNotifyChannelAdmin::InterFilterGroupOperat
 }
 
 ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_Admin::filter_operator (void)
+TAO_Notify_Admin::filter_operator ()
 {
   return this->filter_operator_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index 79b5819ec45..5040b44ac20 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -40,7 +40,7 @@ class TAO_Notify_Serv_Export TAO_Notify_AdminProperties
 public:
   typedef ACE_Strong_Bound_Ptr<TAO_Notify_AdminProperties, TAO_SYNCH_MUTEX> Ptr;
   /// Constructor
-  TAO_Notify_AdminProperties (void);
+  TAO_Notify_AdminProperties ();
 
   /// Destructor
   virtual ~TAO_Notify_AdminProperties ();
@@ -58,21 +58,21 @@ public:
   const TAO_Notify_Property_Boolean& reject_new_events () const;
 
   // = Non-const accessors
-  TAO_Notify_Property_Long & max_global_queue_length (void);
-  TAO_Notify_Property_Long & max_consumers (void);
-  TAO_Notify_Property_Long & max_suppliers (void);
-  TAO_Notify_Property_Boolean & reject_new_events (void);
+  TAO_Notify_Property_Long & max_global_queue_length ();
+  TAO_Notify_Property_Long & max_consumers ();
+  TAO_Notify_Property_Long & max_suppliers ();
+  TAO_Notify_Property_Boolean & reject_new_events ();
 
-  CORBA::Long& global_queue_length (void);
-  TAO_SYNCH_MUTEX& global_queue_lock (void);
-  TAO_SYNCH_CONDITION& global_queue_not_full (void);
+  CORBA::Long& global_queue_length ();
+  TAO_SYNCH_MUTEX& global_queue_lock ();
+  TAO_SYNCH_CONDITION& global_queue_not_full ();
 
-  TAO_Notify_Atomic_Property_Long& consumers (void);
-  TAO_Notify_Atomic_Property_Long& suppliers (void);
+  TAO_Notify_Atomic_Property_Long& consumers ();
+  TAO_Notify_Atomic_Property_Long& suppliers ();
 
   // = Helper method
   /// Returns true if Queue is full
-  CORBA::Boolean queue_full (void);
+  CORBA::Boolean queue_full ();
 
 protected:
   // @@ Pradeep can you explain why there is any maximum for these
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
index 7ef751cc024..c35e3bf6748 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
@@ -8,7 +8,7 @@ TAO_Notify_AdminProperties::max_global_queue_length () const
 }
 
 ACE_INLINE TAO_Notify_Property_Long&
-TAO_Notify_AdminProperties::max_global_queue_length (void)
+TAO_Notify_AdminProperties::max_global_queue_length ()
 {
   return this->max_global_queue_length_;
 }
@@ -20,7 +20,7 @@ TAO_Notify_AdminProperties::max_consumers () const
 }
 
 ACE_INLINE TAO_Notify_Property_Long&
-TAO_Notify_AdminProperties::max_consumers (void)
+TAO_Notify_AdminProperties::max_consumers ()
 {
   return this->max_consumers_;
 }
@@ -32,7 +32,7 @@ TAO_Notify_AdminProperties::max_suppliers () const
 }
 
 ACE_INLINE TAO_Notify_Property_Long&
-TAO_Notify_AdminProperties::max_suppliers (void)
+TAO_Notify_AdminProperties::max_suppliers ()
 {
   return this->max_suppliers_;
 }
@@ -44,37 +44,37 @@ TAO_Notify_AdminProperties::reject_new_events () const
 }
 
 ACE_INLINE TAO_Notify_Property_Boolean&
-TAO_Notify_AdminProperties::reject_new_events (void)
+TAO_Notify_AdminProperties::reject_new_events ()
 {
   return this->reject_new_events_;
 }
 
 ACE_INLINE CORBA::Long&
-TAO_Notify_AdminProperties::global_queue_length (void)
+TAO_Notify_AdminProperties::global_queue_length ()
 {
   return this->global_queue_length_;
 }
 
 ACE_INLINE TAO_SYNCH_MUTEX&
-TAO_Notify_AdminProperties::global_queue_lock (void)
+TAO_Notify_AdminProperties::global_queue_lock ()
 {
   return this->global_queue_lock_;
 }
 
 ACE_INLINE TAO_SYNCH_CONDITION&
-TAO_Notify_AdminProperties::global_queue_not_full(void)
+TAO_Notify_AdminProperties::global_queue_not_full()
 {
   return this->global_queue_not_full_;
 }
 
 ACE_INLINE TAO_Notify_Atomic_Property_Long&
-TAO_Notify_AdminProperties::consumers (void)
+TAO_Notify_AdminProperties::consumers ()
 {
   return this->consumers_;
 }
 
 ACE_INLINE TAO_Notify_Atomic_Property_Long&
-TAO_Notify_AdminProperties::suppliers (void)
+TAO_Notify_AdminProperties::suppliers ()
 {
   return this->suppliers_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
index 92043029904..11b9c28a74e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
@@ -11,7 +11,6 @@
 //#define DEBUG_MEMORY_USE
 #if defined(_MSC_VER) && defined (_DEBUG) && defined (DEBUG_MEMORY_USE)
 namespace CRT{
-
 /// \brief dump heap allocation stats
 ///
 /// This works only on microsoft/windows compilers
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index a0877cc5bee..c3cdf00cbbc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -77,7 +77,6 @@ protected:
   virtual TAO_Notify_Event * copy () const;
 
 protected:
-
   // This must be a pointer rather than a reference, because the derived
   // class needs to redirect it to a new copy
   const CORBA::Any* event_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index e5f29255b3f..1d2b83ce29d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -38,7 +38,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer
  friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_CosEC_ProxyPushConsumer (void);
+  TAO_Notify_CosEC_ProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_CosEC_ProxyPushConsumer ();
@@ -55,10 +55,10 @@ protected:
 
   virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 31456ab5d13..f4fc3f72dee 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -16,7 +16,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier ()
 void
 TAO_Notify_CosEC_ProxyPushSupplier::release ()
 {
-
   delete this;
   //@@ inform factory
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 3657bc830e0..19b45226506 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -43,7 +43,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier
   friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_CosEC_ProxyPushSupplier (void);
+  TAO_Notify_CosEC_ProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_CosEC_ProxyPushSupplier ();
@@ -61,7 +61,7 @@ public:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 425e4f150bc..0d6730ff9d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer
  friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_ProxyPushConsumer (void);
+  TAO_Notify_ProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_ProxyPushConsumer ();
@@ -54,17 +54,17 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void push (const CORBA::Any & data);
 
   virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier);
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index a20b22359f3..2ac03308b09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -110,5 +110,4 @@ TAO_Notify_ProxyPushSupplier::configure(
 }
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 28291efd0f2..af9df23e8f8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -45,7 +45,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier
   friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_ProxyPushSupplier (void);
+  TAO_Notify_ProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_ProxyPushSupplier ();
@@ -57,7 +57,7 @@ public:
   virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   // = Interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_any_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer);
@@ -66,7 +66,7 @@ public:
 
 private:
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index 6af79236b79..1a03411b4a9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -55,15 +55,14 @@ public:
     TAO_Notify_Consumer* old_consumer);
 
 protected:
-
-  virtual CORBA::Object_ptr get_consumer (void);
+  virtual CORBA::Object_ptr get_consumer ();
 
   /// The Consumer
   CosEventComm::PushConsumer_var push_consumer_;
 
 private:
   /// TAO_Notify_Destroy_Callback methods.
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index ccb3d90c259..efff6bcbe5f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -43,15 +43,14 @@ public:
   virtual ACE_CString get_ior () const;
 
 protected:
-
-  virtual CORBA::Object_ptr get_supplier (void);
+  virtual CORBA::Object_ptr get_supplier ();
 
   /// The Supplier
   CosEventComm::PushSupplier_var push_supplier_;
 
 private:
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
index 34098fab019..0d1ff9bd3a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
@@ -4,7 +4,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 Bit_Vector::Bit_Vector()
   : size_(0)
   , first_set_bit_(0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
index 2408b2e918f..e23a1fd7713 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
@@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 /// \brief Simple bit vector.
 ///
 /// Written to support block allocation from persistent storage.
@@ -43,7 +42,6 @@ class TAO_Notify_Serv_Export Bit_Vector
     BPW_LOG_2 = 5
   };
 public:
-
   /// The constructor.
   Bit_Vector();
   /// The destructor.
@@ -70,7 +68,6 @@ private:
   size_t first_set_bit_;
   size_t first_cleared_bit_;
 };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 8721836d7e6..d92430161ad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -361,5 +361,4 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* met
 }
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index e3c51285da5..c7c04d1cac5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -62,17 +62,17 @@ public:
                const ACE_Time_Value *abstime);
 
   /// Shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// Provide the time value of the oldest event in the queue.
-  ACE_Time_Value oldest_event (void);
+  ACE_Time_Value oldest_event ();
 
   /// This interface allows tracking of the queue size
   class TAO_Notify_Serv_Export Tracker
   {
   public:
-    Tracker (void);
-    virtual ~Tracker (void);
+    Tracker ();
+    virtual ~Tracker ();
     virtual void update_queue_count (size_t count) = 0;
     virtual void count_queue_overflow (bool local_overflow, bool global_overflow) = 0;
     void register_child (Tracker * child);
@@ -85,7 +85,6 @@ public:
   void set_tracker (Tracker* tracker);
 
 private:
-
   /// Apply the Order Policy and queue. return -1 on error.
   int queue (TAO_Notify_Method_Request_Queueable* method_request);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 4ba1ea9207d..f7071a9edf3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -90,7 +90,6 @@ public:
 
     return proxy;
   }
-
 };
 
 // define the ProxyConsumer Builders.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index cb371343c37..e3d1907496a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -43,7 +43,7 @@ class TAO_Notify_Object;
 class TAO_Notify_Serv_Export TAO_Notify_Builder
 {
 public:
-  TAO_Notify_Builder (void);
+  TAO_Notify_Builder ();
 
   virtual ~TAO_Notify_Builder ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 3df0b425864..bacb92f417f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -40,7 +40,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Consumer
   : public TAO_Notify_Peer
   , public ACE_Event_Handler    // to support timer
 {
-
 public:
   /// Status returned from dispatch attempts
   enum DispatchStatus {
@@ -52,7 +51,6 @@ public:
   };
 
 public:
-
 typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
 
   /// Constructor
@@ -62,14 +60,14 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
   virtual ~TAO_Notify_Consumer ();
 
   /// This method sigantures deliberately match the RefCounting methods required for ESF Proxy
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   /// Access Specific Proxy.
-  TAO_Notify_ProxySupplier* proxy_supplier (void);
+  TAO_Notify_ProxySupplier* proxy_supplier ();
 
   /// Access Base Proxy.
-  virtual TAO_Notify_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy ();
 
   /// Dispatch Event to consumer
   void deliver (TAO_Notify_Method_Request_Event * request);
@@ -87,19 +85,19 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
   DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch);
 
   /// Dispatch the pending events
-  void dispatch_pending (void);
+  void dispatch_pending ();
 
   /// Is the connection suspended?
-  CORBA::Boolean is_suspended (void);
+  CORBA::Boolean is_suspended ();
 
   /// Suspend Connection
-  void suspend (void);
+  void suspend ();
 
   /// Resume Connection
-  void resume (void);
+  void resume ();
 
   /// Shutdown the consumer
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// On reconnect we need to move events from the old consumer
   /// to the new one
@@ -120,13 +118,12 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr;
   ///
   /// The estimate does not include events queued at the admin level which
   /// have not been passed to this consumer for delivery yet.
-  size_t pending_count (void);
+  size_t pending_count ();
 
 protected:
-
   /// This method is called by the is_alive() method.  It should provide
   /// the connected consumer or nil if there is none.
-  virtual CORBA::Object_ptr get_consumer (void) = 0;
+  virtual CORBA::Object_ptr get_consumer () = 0;
 
   typedef ACE_Unbounded_Queue<TAO_Notify_Method_Request_Event_Queueable *> Request_Queue;
 
@@ -161,7 +158,7 @@ protected:
                                    const CosNotification::EventTypeSeq& removed);
 
   /// Get the shared Proxy Lock
-  TAO_SYNCH_MUTEX* proxy_lock (void);
+  TAO_SYNCH_MUTEX* proxy_lock ();
 
 protected:
   virtual int handle_timeout (const ACE_Time_Value& current_time,
@@ -172,7 +169,7 @@ protected:
   void schedule_timer (bool is_error = false);
 
   /// Cancel timer
-  void cancel_timer (void);
+  void cancel_timer ();
 
   ///= Protected Data Members
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index 474fe1e0229..e241c7cbb43 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -10,19 +10,19 @@ TAO_Notify_Consumer::pending_events()
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_Consumer::is_suspended (void)
+TAO_Notify_Consumer::is_suspended ()
 {
   return this->is_suspended_;
 }
 
 ACE_INLINE void
-TAO_Notify_Consumer::suspend (void)
+TAO_Notify_Consumer::suspend ()
 {
   this->is_suspended_ = 1;
 }
 
 ACE_INLINE size_t
-TAO_Notify_Consumer::pending_count (void)
+TAO_Notify_Consumer::pending_count ()
 {
   return this->pending_events_->size();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 56b93b5206f..881d397d4ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -43,7 +43,6 @@ TAO_Notify_ConsumerAdmin::get_admin_type_name () const
 }
 
 
-
 TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index dbc7ab8725b..3ba2c54517e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -41,7 +41,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin :
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_ConsumerAdmin > Ptr;
   /// Constructor
-  TAO_Notify_ConsumerAdmin (void);
+  TAO_Notify_ConsumerAdmin ();
 
   /// Destructor
   virtual ~TAO_Notify_ConsumerAdmin ();
@@ -50,8 +50,8 @@ public:
   void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   virtual const char * get_admin_type_name () const;
 
@@ -65,7 +65,7 @@ public:
       size_t position);
 
   /// TAO_Notify_Container_T requires a destroy method
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   TAO_Notify::Topology_Object *load_proxy (
@@ -80,23 +80,23 @@ protected:
                                               const CosNotification::QoSProperties & initial_qos);
 
   /// = CosNotifyChannelAdmin::ConsumerAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (void);
+  virtual CosNotifyChannelAdmin::AdminID MyID ();
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ();
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ();
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (void);
+  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter ();
 
   virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter);
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void);
+  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter ();
 
   virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter);
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers ();
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ();
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id);
 
@@ -108,7 +108,7 @@ protected:
   obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                      CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
-  virtual ::CosNotification::QoSProperties * get_qos (void);
+  virtual ::CosNotification::QoSProperties * get_qos ();
 
   virtual void set_qos (const CosNotification::QoSProperties & qos);
 
@@ -124,18 +124,17 @@ protected:
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter);
 
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters ();
 
-  virtual void remove_all_filters (void);
+  virtual void remove_all_filters ();
 
-  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void);
+  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ();
 
-  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void);
+  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ();
 
 private:
-
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index 0e7c3617a1f..ac31053b549 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Container_T<TYPE>::Destroyer::work (TYPE* type)
 }
 
 template<class TYPE>
-TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void)
+TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T ()
   : collection_ (0)
 {
 }
@@ -35,7 +35,7 @@ TAO_Notify_Container_T<TYPE>::~TAO_Notify_Container_T ()
 }
 
 template <class TYPE> void
-TAO_Notify_Container_T<TYPE>::shutdown (void)
+TAO_Notify_Container_T<TYPE>::shutdown ()
 {
   TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
 
@@ -43,7 +43,7 @@ TAO_Notify_Container_T<TYPE>::shutdown (void)
 }
 
 template <class TYPE> void
-TAO_Notify_Container_T<TYPE>::destroy (void)
+TAO_Notify_Container_T<TYPE>::destroy ()
 {
   Destroyer destroyer;
   this->collection_->for_each (&destroyer);
@@ -62,7 +62,7 @@ TAO_Notify_Container_T<TYPE>::remove (TYPE* type)
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::init (void)
+TAO_Notify_Container_T<TYPE>::init ()
 {
   // get the factory
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 54b6bd38fb5..cd231d5ba81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -31,15 +31,14 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
 {
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
  public:
-
   /// Constructor
-  TAO_Notify_Container_T (void);
+  TAO_Notify_Container_T ();
 
   /// Destructor
   virtual ~TAO_Notify_Container_T ();
 
   /// Init this object.
-  void init (void);
+  void init ();
 
   /// Insert object to this container.
   virtual void insert (TYPE* type);
@@ -48,13 +47,13 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
   virtual void remove (TYPE* type);
 
   /// Shutdown
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Call destroy on each contained object
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Collection
-  COLLECTION* collection (void);
+  COLLECTION* collection ();
 
 protected:
   /// The collection data structure that we add objects to.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
index 5a1c4a268cf..1133b56d995 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE> ACE_INLINE typename TAO_Notify_Container_T<TYPE>::COLLECTION*
-TAO_Notify_Container_T<TYPE>:: collection (void)
+TAO_Notify_Container_T<TYPE>:: collection ()
 {
   return this->collection_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
index 6bb7d7f993d..2c4136e708d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
@@ -28,7 +28,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosNotify_Initializer
 {
 public:
   /// Constructor
-  TAO_Notify_CosNotify_Initializer (void);
+  TAO_Notify_CosNotify_Initializer ();
 };
 
 static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer;
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/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index f1c0781b4c8..1509d8e2949 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service
 {
 public:
   /// Constructor
-  TAO_CosNotify_Service (void);
+  TAO_CosNotify_Service ();
 
   /// Destructor
   virtual ~TAO_CosNotify_Service ();
@@ -68,12 +68,11 @@ protected:
   virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb);
 
 private:
-
   /// Create the Factory for Notify objects.
-  virtual TAO_Notify_Factory* create_factory (void);
+  virtual TAO_Notify_Factory* create_factory ();
 
   /// Create the Builder for Notify objects.
-  virtual TAO_Notify_Builder* create_builder (void);
+  virtual TAO_Notify_Builder* create_builder ();
 
   /// Set thread options on @a qos.
   void set_threads (CosNotification::QoSProperties &qos, int threads);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index 6f2084f7412..a92de9f4a3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -28,7 +28,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Fact
 {
 public:
   /// Constructor
-  TAO_Notify_Default_Factory (void);
+  TAO_Notify_Default_Factory ();
 
   /// Destructor
   virtual ~TAO_Notify_Default_Factory ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
index 3bec07b367b..94592d57ea7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 ///////////////////
 // Delivery_Request
 Delivery_Request::Delivery_Request (const Routing_Slip_Ptr & routing_slip, size_t request_id)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index 1117bda47e9..aa677a67791 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -20,7 +20,6 @@ class TAO_Notify_ProxySupplier;
 
 namespace TAO_Notify
 {
-
 // Forward declarations of TAO_Notify classes/pointers/collections declared
 // in this header
 class Delivery_Request;
@@ -120,7 +119,6 @@ private:
   ACE_CDR::Octet delivery_type_;
   IdVec destination_id_;
 };
-
 } // namespace
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index 63a375d9120..417c6ae8d87 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -93,7 +93,6 @@ TAO_Notify_Constraint_Expr::release ()
 }
 
 
-
 TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (PortableServer::POA_ptr poa,
                                                 const char *constraint_grammar,
                                                 const TAO_Notify_Object::ID& id)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 9f48f5d8031..b59bf46cc6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -35,10 +35,9 @@ class TAO_Notify_ETCL_Filter;
 class TAO_Notify_Constraint_Expr : public TAO_Notify::Topology_Object
 {
 public:
-
   friend class TAO_Notify_ETCL_Filter;
 
-  TAO_Notify_Constraint_Expr (void);
+  TAO_Notify_Constraint_Expr ();
   virtual ~TAO_Notify_Constraint_Expr ();
 
   void save_persistent (
@@ -56,7 +55,7 @@ public:
 
 private:
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   // = DESCRIPTION
   //   Structure for associating ConstraintInfo with an interpreter.
@@ -84,7 +83,7 @@ public:
                           const TAO_Notify_Object::ID& id);
 
   /// Destructor
-  virtual ~TAO_Notify_ETCL_Filter (void);
+  virtual ~TAO_Notify_ETCL_Filter ();
 
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   void load_attrs(const TAO_Notify::NVPList& attrs);
@@ -92,7 +91,7 @@ public:
     CORBA::Long id, const TAO_Notify::NVPList& attrs);
 
 protected:
-  virtual char * constraint_grammar (void);
+  virtual char * constraint_grammar ();
 
   virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
@@ -101,11 +100,11 @@ protected:
 
   virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ();
 
-  virtual void remove_all_constraints (void);
+  virtual void remove_all_constraints ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
 
@@ -117,12 +116,11 @@ protected:
 
   virtual void detach_callback (CosNotifyFilter::CallbackID callback);
 
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ();
 
 private:
-
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq);
   void add_constraint_i (const CosNotifyFilter::ConstraintInfo& constraint,
@@ -131,7 +129,7 @@ private:
   TAO_Notify_Constraint_Expr*
     add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id);
 
-  void remove_all_constraints_i (void);
+  void remove_all_constraints_i ();
 
   /// Lock to serialize access to data members.
   TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index a5daa3611b9..7040b2eb878 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -29,7 +29,6 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory ()
   }
 
   this->filters_.unbind_all ();
-
 }
 
 CosNotifyFilter::FilterFactory_ptr
@@ -320,5 +319,4 @@ TAO_Notify_ETCL_FilterFactory::find_filter_id (CosNotifyFilter::Filter_ptr filte
 }
 
 
-
 ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 9cbe025e225..6f0086bd3cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -42,7 +42,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory :
 {
 public:
   /// Constructor
-  TAO_Notify_ETCL_FilterFactory (void);
+  TAO_Notify_ETCL_FilterFactory ();
 
   /// Destructor
   virtual ~TAO_Notify_ETCL_FilterFactory ();
@@ -52,7 +52,7 @@ public:
   virtual CosNotifyFilter::FilterFactory_ptr create (
       PortableServer::POA_ptr filter_poa);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   ///= CosNotifyFilter::FilterFactory methods
 
@@ -82,7 +82,6 @@ public:
 
 
 protected:
-
   CosNotifyFilter::Filter_ptr
     create_filter (const char *constraint_grammar,
                    const TAO_Notify_Object::ID& id,
@@ -92,7 +91,7 @@ protected:
   CosNotifyFilter::Filter_ptr find_filter (const TAO_Notify_Object::ID& id);
 
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   /// The POA in which to activate the Filters.
   PortableServer::POA_var filter_poa_;
@@ -106,7 +105,6 @@ protected:
 
   FILTERMAP filters_;
   TAO_SYNCH_MUTEX mtx_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 8a7a61cf680..398f95d1d9e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -47,7 +47,7 @@ public:
   // Codes to distinguish marshaled events in persistent storage
   enum {MARSHAL_ANY=1,MARSHAL_STRUCTURED=2};
   /// Constructor
-  TAO_Notify_Event (void);
+  TAO_Notify_Event ();
 
   /// Destructor
   virtual ~TAO_Notify_Event ();
@@ -122,7 +122,7 @@ private:
   /// Return a pointer to a copy of this event on the heap
   virtual TAO_Notify_Event* copy () const = 0;
 
-  virtual void release (void);
+  virtual void release ();
 
   mutable Ptr clone_;
   bool        is_on_heap_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 35445ee3fcf..4301182362c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -627,5 +627,4 @@ TAO_Notify_EventChannel::validate ()
 }
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index f77ff8334f9..498032c2783 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -54,7 +54,7 @@ public:
   typedef CosNotifyChannelAdmin::ChannelIDSeq_var SEQ_VAR;
 
   /// Constructor
-  TAO_Notify_EventChannel (void);
+  TAO_Notify_EventChannel ();
 
   /// Destructor
   virtual ~TAO_Notify_EventChannel ();
@@ -74,8 +74,8 @@ public:
   void remove (TAO_Notify_SupplierAdmin* supplier_admin);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   // TAO_Notify::Topology_Parent
 
@@ -83,7 +83,7 @@ public:
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
                                                    const TAO_Notify::NVPList& attrs);
-  virtual void reconnect (void);
+  virtual void reconnect ();
   virtual void validate ();
 
   virtual TAO_Notify_Object::ID get_id () const {return id();}
@@ -97,11 +97,11 @@ public:
                               bool experienced_timeout);
 
   /// Shutdown
-  virtual int shutdown (void);
+  virtual int shutdown ();
   virtual void load_attrs(const TAO_Notify::NVPList& attrs);
 
   /// TAO_Notify_Container_T requires a destroy method
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// This is public to allow TAO_MonitorConsumerAdmin access.
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -136,11 +136,11 @@ protected:
 
   virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ();
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (void);
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin ();
 
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (void);
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin ();
 
-  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void);
+  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory ();
 
   virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                                                         CosNotifyChannelAdmin::AdminID_out id);
@@ -148,24 +148,24 @@ protected:
   virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                                                         CosNotifyChannelAdmin::AdminID_out id);
 
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void);
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins ();
 
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void);
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins ();
 
-  virtual ::CosNotification::QoSProperties * get_qos (void);
+  virtual ::CosNotification::QoSProperties * get_qos ();
 
   virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
                              CosNotification::NamedPropertyRangeSeq_out available_qos);
 
-  virtual ::CosNotification::AdminProperties * get_admin (void);
+  virtual ::CosNotification::AdminProperties * get_admin ();
 
   virtual void set_admin (const CosNotification::AdminProperties & admin);
 
-  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
+  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ();
 
-  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
+  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ();
 
 private:
   TAO_Notify_ConsumerAdmin_Container& ca_container();
@@ -181,7 +181,7 @@ private:
   CosNotifyFilter::FilterFactory_var default_filter_factory_;
   TAO_Notify_FilterFactory * default_filter_factory_servant_;
 
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index d14af24693c..9541518d2b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -55,7 +55,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_EventChannelFactory > Ptr;
 
   /// Constructor
-  TAO_Notify_EventChannelFactory (void);
+  TAO_Notify_EventChannelFactory ();
 
   /// Init the factory
   void init (PortableServer::POA_ptr poa);
@@ -64,8 +64,8 @@ public:
   virtual ~TAO_Notify_EventChannelFactory ();
 
   /// = ServantBase  Methods
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   /// Remove @a channel from the <ec_container_>
   virtual void remove (TAO_Notify_EventChannel* channel);
@@ -85,7 +85,7 @@ public:
   /// Use the registered Topology_Factory to create a loader, and
   /// load the topology. If no Topology_Factory is registered
   /// then nothing will be loaded.
-  void load_topology (void);
+  void load_topology ();
 
   /// Use the passed in saver factory to generate topology saver objects.
   /// Does not take ownership.
@@ -96,23 +96,23 @@ public:
   virtual bool is_persistent () const;
 
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
-  virtual bool change_to_parent (void);
+  virtual bool change_to_parent ();
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
                                                    const TAO_Notify::NVPList& attrs);
-  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void);
-  virtual void reconnect (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self ();
+  virtual void reconnect ();
   virtual void validate ();
 
   /// at shutdown time, this causes the validator thread to exit.
-  void stop_validator (void);
+  void stop_validator ();
 
   /// Handle change notifications
-  bool handle_change (void);
+  bool handle_change ();
 
-  void load_event_persistence (void);
+  void load_event_persistence ();
 
-  virtual void save_topology (void);
+  virtual void save_topology ();
 
   TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
   TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
@@ -120,14 +120,13 @@ public:
   virtual TAO_Notify_Object::ID get_id () const;
 
 private:
-
   /// = Data Members
 
   /// = NotifyExt methods
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// shutdown
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   virtual
   NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
@@ -136,7 +135,7 @@ private:
   virtual void unregister_callback (
       NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
 protected:
   /// = CosNotifyChannelAdmin Methods
@@ -145,7 +144,7 @@ protected:
       const CosNotification::AdminProperties & initial_admin,
       CosNotifyChannelAdmin::ChannelID_out id);
 
-  virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (void);
+  virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ();
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
       CosNotifyChannelAdmin::ChannelID id);
@@ -171,7 +170,7 @@ private:
   Routing_Slip_Set routing_slip_restart_set_;
 
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   ACE_Auto_Ptr <TAO_Notify_validate_client_Task> validate_client_task_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index cb8d189001d..6dfd2180884 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -140,7 +140,6 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs)
     result = true;
   }
   return result;
-
 }
 
   // TAO_Notify::Topology_Object
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index b91b3fae433..767fcfa60ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventType : public TAO_Notify::Topology_
 {
 public:
   /// Constructor
-  TAO_Notify_EventType (void);
+  TAO_Notify_EventType ();
   TAO_Notify_EventType (const char* domain_name, const char* type_name);
   TAO_Notify_EventType (const CosNotification::EventType& event_type);
   // Constructor
@@ -58,7 +58,7 @@ public:
   bool operator!=(const TAO_Notify_EventType& notify_event_type) const;
 
   /// Return the special event type.
-  static TAO_Notify_EventType special (void);
+  static TAO_Notify_EventType special ();
 
   /// Is this the special event (accept everything).
   CORBA::Boolean is_special () const;
@@ -77,14 +77,13 @@ public:
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
 
 protected:
-
   friend class TAO_Notify_Constraint_Interpreter;
 
   /// Init this object.
   void init_i (const char* domain_name, const char* type_name);
 
   /// Recompute the hash value.
-  void recompute_hash (void);
+  void recompute_hash ();
 
   bool domain_is_wildcard (const char* domain) const;
   bool type_is_wildcard (const char* type) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index 5ecbd009ffc..f832e1b0b21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq
 
 public:
   /// Constructor
-  TAO_Notify_EventTypeSeq (void);
+  TAO_Notify_EventTypeSeq ();
   TAO_Notify_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq);
   TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs);
   TAO_Notify_EventTypeSeq & operator = (const TAO_Notify_EventTypeSeq & rhs);
@@ -73,8 +73,7 @@ public:
     const TAO_Notify::NVPList& attrs);
 
 private:
-
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index 10844c15661..517733dbc09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -55,7 +55,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Event_Manager : public TAO_Notify_Refcou
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Event_Manager > Ptr;
   /// Constructor
-  TAO_Notify_Event_Manager (void);
+  TAO_Notify_Event_Manager ();
 
   /// Destructor
   virtual ~TAO_Notify_Event_Manager ();
@@ -63,10 +63,10 @@ public:
   void release();
 
   /// Init
-  void init (void);
+  void init ();
 
   /// Init
-  void shutdown (void);
+  void shutdown ();
 
   /// Connect ProxySupplier
   void connect (TAO_Notify_ProxySupplier* proxy_supplier);
@@ -81,8 +81,8 @@ public:
   void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Map accessors.
-  TAO_Notify_Consumer_Map& consumer_map (void);
-  TAO_Notify_Supplier_Map& supplier_map (void);
+  TAO_Notify_Consumer_Map& consumer_map ();
+  TAO_Notify_Supplier_Map& supplier_map ();
 
   /// Offer change received on <proxy_consumer>.
   void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 4703cff5773..da4ebceab06 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY>
-TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T ()
   : collection_ (0), count_ (0), usage_count_ (1)
 {
 }
@@ -26,7 +26,7 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::~TAO_Notify_Event_Map_Entry_T ()
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::init (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::init ()
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index d143715a3a0..fbab796366f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -39,13 +39,13 @@ public:
   typedef TAO_ESF_Proxy_Collection<PROXY> COLLECTION;
 
   /// Constructor
-  TAO_Notify_Event_Map_Entry_T (void);
+  TAO_Notify_Event_Map_Entry_T ();
 
   /// Destructor
-  ~TAO_Notify_Event_Map_Entry_T (void);
+  ~TAO_Notify_Event_Map_Entry_T ();
 
   /// Init - Allocates collection
-  void init (void);
+  void init ();
 
   /// Connect
   void connected (PROXY* proxy);
@@ -54,17 +54,17 @@ public:
   void disconnected (PROXY* proxy);
 
   /// Collection accessor
-  COLLECTION* collection (void);
+  COLLECTION* collection ();
 
   /// Count accessor
-  int count (void);
+  int count ();
 
   ///= Reference counting methods.
   // Incr the ref count.
-  CORBA::ULong _incr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
 
   // Decr the ref count. This object is destroyed when the count is 0.
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _decr_refcnt ();
 
 protected:
   /// The Collection
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
index b472c831377..4417f2df506 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
@@ -3,24 +3,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY> ACE_INLINE typename
 TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
-TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) {
+TAO_Notify_Event_Map_Entry_T<PROXY>::collection () {
   return collection_;
 }
 
 template <class PROXY> ACE_INLINE int
-TAO_Notify_Event_Map_Entry_T<PROXY>::count (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::count ()
 {
   return this->count_;
 }
 
 template <class PROXY> ACE_INLINE CORBA::ULong
-TAO_Notify_Event_Map_Entry_T<PROXY>::_incr_refcnt (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::_incr_refcnt ()
 {
   return ++this->usage_count_;
 }
 
 template <class PROXY> ACE_INLINE CORBA::ULong
-TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt ()
 {
   return --this->usage_count_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 09478a46c01..9b414efb769 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -14,10 +14,9 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY, class ACE_LOCK>
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T ()
   :proxy_count_ (0)
 {
-
 }
 
 template <class PROXY, class ACE_LOCK>
@@ -26,7 +25,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::~TAO_Notify_Event_Map_T ()
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init ()
 {
   this->broadcast_entry_.init ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 8a9a026f93d..29f60d16ce0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -32,18 +32,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class PROXY, class ACE_LOCK>
 class TAO_Notify_Event_Map_T
 {
-
 public:
   typedef  TAO_Notify_Event_Map_Entry_T<PROXY> ENTRY;
 
   /// Constructor
-  TAO_Notify_Event_Map_T (void);
+  TAO_Notify_Event_Map_T ();
 
   /// Destructor
   ~TAO_Notify_Event_Map_T ();
 
   /// Init
-  void init (void);
+  void init ();
 
   /// Connect a PROXY
   void connect (PROXY* proxy);
@@ -66,19 +65,19 @@ public:
   ENTRY* find (const TAO_Notify_EventType& event_type);
 
   /// Find the default broadcast list.
-  typename ENTRY::COLLECTION* broadcast_collection (void);
+  typename ENTRY::COLLECTION* broadcast_collection ();
 
   /// Find the update list. This is all the PROXYS connected to this Map.
-  typename ENTRY::COLLECTION* updates_collection (void);
+  typename ENTRY::COLLECTION* updates_collection ();
 
   /// Release the usage count on this entry.
   void release (ENTRY* entry);
 
   /// Access all the event types available
-  const TAO_Notify_EventTypeSeq& event_types (void);
+  const TAO_Notify_EventTypeSeq& event_types ();
 
   /// Access number of proxys connected in all.
-  int proxy_count (void);
+  int proxy_count ();
 
 protected:
   /// The Map that stores eventtype to entry mapping.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index 9332d886ace..94554016bff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -48,25 +48,25 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::release (ENTRY* entry)
 }
 
 template <class PROXY, class ACE_LOCK>  ACE_INLINE  typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection ()
 {
   return this->broadcast_entry_.collection ();
 }
 
 template <class PROXY, class ACE_LOCK>  ACE_INLINE  typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::updates_collection (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::updates_collection ()
 {
   return this->updates_entry_.collection ();
 }
 
 template <class PROXY, class ACE_LOCK> ACE_INLINE int
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::proxy_count (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::proxy_count ()
 {
   return this->proxy_count_;
 }
 
 template <class PROXY, class ACE_LOCK> ACE_INLINE const TAO_Notify_EventTypeSeq&
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types ()
 {
   return this->event_types_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
index dd2c770b435..c2207438b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
@@ -33,14 +33,12 @@ namespace TAO_Notify
   class TAO_Notify_Serv_Export Event_Persistence_Strategy: public ACE_Service_Object
   {
   public:
-
     // get the current factory, creating it if necessary
     virtual Event_Persistence_Factory * get_factory () = 0;
 
     // release the current factory so a new one can be created
     virtual void reset () = 0;
   };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 9ab170a5295..b30ffbb825c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -36,13 +36,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
   : public TAO_Notify::Topology_Object
 {
-
  public:
   /// Constructor
-  TAO_Notify_FilterAdmin (void);
+  TAO_Notify_FilterAdmin ();
 
   /// Destructor
-  virtual ~TAO_Notify_FilterAdmin (void);
+  virtual ~TAO_Notify_FilterAdmin ();
 
   // = match operation on all the filters
   /// See if any of the filters match.
@@ -58,9 +57,9 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter);
 
-  virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+  virtual CosNotifyFilter::FilterIDSeq * get_all_filters ();
 
-  virtual void remove_all_filters (void);
+  virtual void remove_all_filters ();
 
 
   // TAO_Notify::Topology_Object
@@ -74,7 +73,7 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
  private:
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, ACE_SYNCH_NULL_MUTEX> FILTER_LIST;
 
-  virtual void release (void);
+  virtual void release ();
 
   /// Mutex to serialize access to data members.
   TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index d6652dd1526..62d581e63ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -32,12 +32,11 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterFactory
   : public ACE_Service_Object, public TAO_Notify::Topology_Object
 {
 public:
-
   /// Factory method to create a FilterFactory reference
   /// The Factory is activated in the default POA. The filters created are activated in the <filter_poa>.
   virtual CosNotifyFilter::FilterFactory_ptr create (
       PortableServer::POA_ptr filter_poa) = 0;
-  virtual void destroy (void) = 0;
+  virtual void destroy () = 0;
 
   virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter) = 0;
   virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index f4225943a3a..2b4e9bd9b19 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION>
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T (void)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T ()
   :id_ (0), result_ (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index 0f22e06f52a..1c5fd4a61d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -35,7 +35,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TY
 
 public:
   /// Constructor
-  TAO_Notify_Find_Worker_T (void);
+  TAO_Notify_Find_Worker_T ();
 
   /// Find the Type.
   TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index 2faafacb001..265a77b00e6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -31,12 +31,12 @@ class TAO_Notify_Serv_Export TAO_Notify_ID_Factory
 {
 public:
   /// Constructor
-  TAO_Notify_ID_Factory (void);
+  TAO_Notify_ID_Factory ();
 
   /// Destructor
   ~TAO_Notify_ID_Factory ();
 
-  TAO_Notify_Object::ID id (void);
+  TAO_Notify_Object::ID id ();
 
   void set_last_used (const TAO_Notify_Object::ID id);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
index 331851c2d48..66e46ddd2e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Notify_Object::ID
-TAO_Notify_ID_Factory::id (void)
+TAO_Notify_ID_Factory::id ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mtx_, 0);
   return ++seed_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index d8a1ba1ffad..8698a7124fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -36,11 +36,11 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request
 {
 public:
   /// Destructor.
-  virtual ~TAO_Notify_Method_Request (void);
+  virtual ~TAO_Notify_Method_Request ();
 
   /// Execute the Request
-  virtual int execute (void) = 0;
-  virtual TAO_Notify_Method_Request_Queueable* copy (void) = 0;
+  virtual int execute () = 0;
+  virtual TAO_Notify_Method_Request_Queueable* copy () = 0;
 };
 
 /***********************************************************************/
@@ -60,7 +60,7 @@ public:
   TAO_Notify_Method_Request_Queueable();
   TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event);
 
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
   void init (const TAO_Notify_Event * event);
 
   /// The creation time of the event to which this request corresponds.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 0e24d3fb53c..083ed21d808 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Execute the dispatch operation.
-  int execute_i (void);
+  int execute_i ();
 
 protected:
   /// The Proxy
@@ -115,7 +115,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Dispatch_Queueable ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   TAO_Notify_Event::Ptr event_var_;
@@ -144,10 +144,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
   /// Create a copy of this method request
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
 };
 
 /*****************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 5d52cc0334e..fdc0895dade 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -55,7 +55,6 @@ public:
   bool should_retry ();
 
 protected:
-
   /// The Event
   const TAO_Notify_Event * event_;
 
@@ -89,7 +88,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Event_Queueable ();
 
   /// satisfy the pure virtual method.  Should never be called.
-  virtual int execute (void);
+  virtual int execute ();
 private:
   TAO_Notify_Event::Ptr event_var_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index 264f4ede97c..30af7a40e46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -155,7 +155,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal (
     }
   }
   return result;
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 60ed941594e..004cfd69492 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -39,7 +39,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup
   , public TAO_Notify_Method_Request_Event
 {
 public:
-
   /// an arbitrary code (Octet) to identify this type of request in persistent storage
   enum {persistence_code = 2};
 
@@ -60,13 +59,12 @@ protected:
   TAO_Notify_Method_Request_Lookup (const TAO_Notify::Delivery_Request_Ptr& delivery, TAO_Notify_ProxyConsumer * proxy);
 
   /// Execute the dispatch operation.
-  int execute_i (void);
+  int execute_i ();
 
   ///= TAO_ESF_Worker method
   virtual void work (TAO_Notify_ProxySupplier* proxy_supplier);
 
 protected:
-
   /// The Proxy
   TAO_Notify_ProxyConsumer* proxy_consumer_;
 };
@@ -97,7 +95,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Lookup_Queueable ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   TAO_Notify_Event::Ptr event_var_;
@@ -125,10 +123,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Lookup_No_Copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index d30cd2dfb95..8665360a5e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -37,10 +37,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Shutdown ();
 
   /// Create a copy of this object.
-  TAO_Notify_Method_Request_Queueable* copy (void);
+  TAO_Notify_Method_Request_Queueable* copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   // Task to shutdown
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index db70c6eea23..db876a4728c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -46,7 +46,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 /*****************************************************************************/
@@ -74,10 +74,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates_No_Copy ();
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request_Queueable* copy (void);
+  virtual TAO_Notify_Method_Request_Queueable* copy ();
 
   /// Execute the Request
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index 57074f426fb..9ca4a06f167 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -44,7 +44,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates_T ();
 
   /// Execute the Request
-  int execute_i (void);
+  int execute_i ();
 
 protected:
   /// Update Added
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index 7c185eca11d..c4cfefc11f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (void)
+TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i ()
 {
   if (this->proxy_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
index 7ff8ac5455d..f115e8dae29 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h"
+#include "orbsvcs/Notify/MonitorControl/Control.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
index 5a1457bab05..a34dd62bcf2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
@@ -21,7 +21,7 @@ class TAO_Notify_MC_Export TAO_NS_Control
 {
 public:
   /// This is here due to virtual functions.
-  virtual ~TAO_NS_Control (void);
+  virtual ~TAO_NS_Control ();
 
   /// Return the name of this control object.
   const ACE_CString& name () const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
index 71b48b13451..e99e21d80cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
@@ -7,7 +7,7 @@
 
 #include "tao/Monitor/Monitor.h"
 
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h"
+#include "orbsvcs/Notify/MonitorControl/Control.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
@@ -39,10 +39,10 @@ public:
   };
 
   /// Return the singleton instance of the registry
-  static TAO_Control_Registry* instance (void);
+  static TAO_Control_Registry* instance ();
 
   /// Empty out the map of objects
-  ~TAO_Control_Registry (void);
+  ~TAO_Control_Registry ();
 
   /// Adds an object to the map.
   /// Throws Map_Error if the object is null or if there
@@ -57,7 +57,7 @@ public:
   bool remove (const ACE_CString& name);
 
   /// Returns a list of names stored in the registry
-  const NameList& names (void);
+  const NameList& names ();
 
   /// Gets an object from the map
   /// Returns the object if it is successfully located.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
index 86f21431161..7998cd8974d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
@@ -33,7 +33,7 @@ public:
   /// method is expected to call the receive base class method. This
   /// method isn't pure virtual in Monitor_Base, but we reintroduce
   /// it here to force all subclasses to implement it.
-  virtual void update (void) = 0;
+  virtual void update () = 0;
 
 protected:
   TYPE* interf_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index 60c9758d246..f12d4b426b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -22,7 +22,7 @@ class TAO_Notify_MC_Export TAO_MonitorManager : public ACE_Service_Object
 {
 public:
   /// Perform member initialization
-  TAO_MonitorManager (void);
+  TAO_MonitorManager ();
 
   virtual int init (int argc, ACE_TCHAR* argv[]);
   virtual int fini ();
@@ -30,20 +30,20 @@ public:
   /// Start the ORB task which includes initializtion of the ORB,
   /// creation of the monitor servant and activation.
   /// If run is called more than once, it will silently perform a no-op.
-  int run (void);
+  int run ();
 
   /// This will call the run() method.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Get the dynamic instance of the TAO_MonitorManager and
   /// shut it down
-  static void shutdown (void);
+  static void shutdown ();
 
 private:
   class ORBTask: public ACE_Task_Base
   {
   public:
-    ORBTask (void);
+    ORBTask ();
     virtual int svc ();
 
     TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
index e5ca866f620..d8806831e2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
@@ -1,6 +1,6 @@
 #include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/Log_Macros.h"
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h"
+#include "orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h"
 
 #include "tao/Monitor/Monitor_Impl.h"
 #include "ace/Auto_Ptr.h"
@@ -9,7 +9,7 @@
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h"
+#include "orbsvcs/Notify/MonitorControl/Control_Registry.h"
 
 using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
index 779db3ac50f..b2cab713a74 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
@@ -34,7 +34,7 @@ public:
   NotificationServiceMonitor_i (CORBA::ORB_ptr orb = 0);
 
   /// Get a list of statistic names
-  virtual Monitor::NameList* get_statistic_names (void);
+  virtual Monitor::NameList* get_statistic_names ();
 
   /// Get the data from a single statistic
   virtual Monitor::Data*
@@ -68,7 +68,7 @@ public:
   virtual void remove_supplieradmin (const char* name);
 
   /// Call shutdown() on the ORB if one was provided during construction
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   void send_control_command (const char* name, const char* cmd);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
index 348dedc6c8d..0ff57ebd2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h"
+#include "orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h"
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
index b93e4150e2a..7c091ba5e10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
@@ -14,7 +14,7 @@
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h"
+#include "orbsvcs/Notify/MonitorControl/notify_mc_export.h"
 
 using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h
index 7bcbc93b879..85267b8eb5d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h
@@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_MC_Ext_Export TAO_MC_Notify_Service: public TAO_CosNotify_Service
 {
 public:
-  virtual ~TAO_MC_Notify_Service (void);
+  virtual ~TAO_MC_Notify_Service ();
 
 protected:
   virtual void init_i (CORBA::ORB_ptr orb);
@@ -38,7 +38,7 @@ protected:
                  CosNotifyChannelAdmin::EventChannelFactory_ptr factory);
 
 private:
-  virtual TAO_Notify_Factory* create_factory (void);
+  virtual TAO_Notify_Factory* create_factory ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
index 5d9275a1412..e599a5491cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
@@ -247,7 +247,6 @@ TAO_MonitorConsumerAdmin::remove ()
 }
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
index 37ef14ab0b6..da16b21f071 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
@@ -40,10 +40,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorConsumerAdmin
 {
 public:
   /// Construct a monitor supplier admin.
-  TAO_MonitorConsumerAdmin (void);
+  TAO_MonitorConsumerAdmin ();
 
   /// Remove the statistics for this event channel.
-  virtual ~TAO_MonitorConsumerAdmin (void);
+  virtual ~TAO_MonitorConsumerAdmin ();
 
   /// Register our statistic and control objects.
   void register_stats_controls (TAO_MonitorEventChannel* mec,
@@ -63,7 +63,7 @@ public:
 
   TAO_MonitorEventChannel* get_ec () const;
 
-  const ACE_CString & stat_name (void)const;
+  const ACE_CString & stat_name () const;
 
 
   /// Receive the queue count and store the approximated queue size in
@@ -72,11 +72,10 @@ public:
 
   virtual void count_queue_overflow (bool local_overflow, bool global_overflow);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
-
-  virtual void remove (void);
+  virtual void remove ();
 
   ACE_CString stat_name_;
   ACE_CString queue_size_stat_name_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
index bbf50f47875..646932ea068 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
@@ -45,7 +45,7 @@ public:
   TAO_MonitorEventChannel (const char* name);
 
   /// Remove the statistics for this event channel.
-  ~TAO_MonitorEventChannel (void);
+  ~TAO_MonitorEventChannel ();
 
   /// Return the name of this event channel.
   const ACE_CString& name () const;
@@ -110,7 +110,7 @@ private:
   TAO_Notify_ThreadPool_Task* get_threadpool_task (
                                 CosNotifyChannelAdmin::AdminID id);
   size_t calculate_queue_size (bool count);
-  double get_oldest_event (void);
+  double get_oldest_event ();
   void determine_slowest_consumer (Monitor_Control_Types::NameList* names);
   bool destroy_consumer (CosNotifyChannelAdmin::ProxyID id);
   bool destroy_supplier (CosNotifyChannelAdmin::ProxyID id);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
index 311fb73d097..fe512ec5696 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
@@ -32,7 +32,7 @@ public:
   TAO_MonitorEventChannelFactory (const char* name);
 
   /// Remove the factory name from the factory names statistic
-  ~TAO_MonitorEventChannelFactory (void);
+  ~TAO_MonitorEventChannelFactory ();
 
   /// Create a named event channel and associate various statistic
   /// objects with it in the statistic registry
@@ -70,8 +70,8 @@ private:
   public:
     Unbinder (Map& map,
               const ACE_CString& name);
-    ~Unbinder (void);
-    void release (void);
+    ~Unbinder ();
+    void release ();
 
   private:
     Map& map_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
index 2bc12122e6d..b4d36658e6b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
@@ -17,7 +17,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename ProxyPushSupplier>
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::TAO_MonitorProxySupplier_T (void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::TAO_MonitorProxySupplier_T ()
   : queue_item_stat_name_ ()
   , overflow_stat_name_ ()
   , queue_item_count_ (0)
@@ -28,7 +28,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::TAO_MonitorProxySupplier_T (void)
 }
 
 template <typename ProxyPushSupplier>
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::~TAO_MonitorProxySupplier_T (void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::~TAO_MonitorProxySupplier_T ()
 {
   if (this->admin_ != 0)
     {
@@ -146,7 +146,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::configure(
 
 template <typename ProxyPushSupplier>
 ACE_CString &
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::queue_item_stat_name(void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::queue_item_stat_name()
 {
   return this->queue_item_stat_name_;
 }
@@ -154,7 +154,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::queue_item_stat_name(void)
 
 template <typename ProxyPushSupplier>
 ACE_CString &
-TAO_MonitorProxySupplier_T<ProxyPushSupplier>::overflow_stat_name(void)
+TAO_MonitorProxySupplier_T<ProxyPushSupplier>::overflow_stat_name()
 {
   return this->overflow_stat_name_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
index 3ca80ef6ee4..9bfe7ee793c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
@@ -41,10 +41,10 @@ class TAO_MonitorProxySupplier_T
 {
 public:
   /// Construct a monitor supplier admin
-  TAO_MonitorProxySupplier_T (void);
+  TAO_MonitorProxySupplier_T ();
 
   /// Remove the statistics for this event channel
-  virtual ~TAO_MonitorProxySupplier_T (void);
+  virtual ~TAO_MonitorProxySupplier_T ();
 
   /// Configure the statistics after construction
   /// @param admin the parent admin for this proxy
@@ -58,10 +58,10 @@ public:
   virtual void count_queue_overflow (bool local_overflow, bool global_overflow);
 
   /// Access to Statistics Name
-  ACE_CString & queue_item_stat_name (void);
+  ACE_CString & queue_item_stat_name ();
 
   /// Access to Statistics Name
-  ACE_CString & overflow_stat_name (void);
+  ACE_CString & overflow_stat_name ();
 
 private:
   ACE_CString base_stat_name_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
index 568e731f16e..c780647e817 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
@@ -23,10 +23,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorSupplierAdmin:
 {
 public:
   /// Construct a monitor supplier admin
-  TAO_MonitorSupplierAdmin (void);
+  TAO_MonitorSupplierAdmin ();
 
   /// Remove the statistics for this event channel
-  ~TAO_MonitorSupplierAdmin (void);
+  ~TAO_MonitorSupplierAdmin ();
 
   /// Register our statistic and control objects
   void register_stats_controls (TAO_MonitorEventChannel* mec,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index 51748c154a7..3102babfcc8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -37,10 +37,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Constraint_Interpreter
   : public ETCL_Interpreter
 {
 public:
-  TAO_Notify_Constraint_Interpreter (void);
+  TAO_Notify_Constraint_Interpreter ();
 
   /// Destructor
-  virtual ~TAO_Notify_Constraint_Interpreter (void);
+  virtual ~TAO_Notify_Constraint_Interpreter ();
 
   /**
    * This method builds an expression tree representing the
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index 664061b9b38..0e5e5680b8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor
 {
 public:
   /// Constructor.
-  TAO_Notify_Constraint_Visitor (void);
+  TAO_Notify_Constraint_Visitor ();
 
   /// Put the event data into our hash map.
   int bind_structured_event (const CosNotification::StructuredEvent &s_event);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
index 894fd60a041..a9fe48f25a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -34,8 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
-
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index 3bfa6e95452..e222ca1496d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -31,10 +31,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory
 {
 public:
-
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index ea0474a021c..0d8aa7ac272 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
index b5cc7b4373c..ce23da5d868 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory
 public:
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svc (void);
+  static int init_svc ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 8f5b994ecb4..4132736d229 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -49,7 +49,7 @@ public:
   typedef CORBA::Long ID;
 
   /// Destructor
-  virtual ~TAO_Notify_Object (void);
+  virtual ~TAO_Notify_Object ();
 
   /// This Object's ID
   ID id () const;
@@ -63,45 +63,45 @@ public:
       CORBA::Long id);
 
   /// Deactivate
-  void deactivate (void);
+  void deactivate ();
 
   /// Have we been shutdown. returns true if shutdown.
-  bool has_shutdown (void);
+  bool has_shutdown ();
 
   void execute_task (TAO_Notify_Method_Request& method_request);
 
   /// Get CORBA Ref.
-  CORBA::Object_ptr ref (void);
+  CORBA::Object_ptr ref ();
 
   /// Set the QoS Properties.
   virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   /// Get the QoS Properties.
-  CosNotification::QoSProperties* get_qos (void);
+  CosNotification::QoSProperties* get_qos ();
 
   bool find_qos_property_value (
     const char * name,
     CosNotification::PropertyValue & value)const;
 
   /// Obtain the Timer manager associated with this object.
-  virtual TAO_Notify_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer ();
 
   /// Accessor for the Event Manager
-  TAO_Notify_Event_Manager& event_manager (void);
+  TAO_Notify_Event_Manager& event_manager ();
 
   /// Shutdown. Returns 1 if the shutdown was already run once before.
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Load our attributes. Each derived type should call the superclass
   /// load first before loading its own attributes.
   virtual void load_attrs(const TAO_Notify::NVPList& attrs);
 
   /// Allow access to the underlying worker task.
-  TAO_Notify_Worker_Task* get_worker_task (void);
+  TAO_Notify_Worker_Task* get_worker_task ();
 
 protected:
   /// Constructor
-  TAO_Notify_Object (void);
+  TAO_Notify_Object ();
 
   /// Init this object with data from <rhs>.
   void initialize (TAO_Notify_Object* parent);
@@ -116,13 +116,13 @@ protected:
   void set_primary_as_proxy_poa();
 
   /// Accessor for the proxy_poa_
-  TAO_Notify_POA_Helper* proxy_poa (void);
+  TAO_Notify_POA_Helper* proxy_poa ();
 
   /// Accessor for the object_poa_
-  TAO_Notify_POA_Helper* object_poa (void);
+  TAO_Notify_POA_Helper* object_poa ();
 
   /// Get the POA assigned to us.
-  TAO_Notify_POA_Helper* poa (void);
+  TAO_Notify_POA_Helper* poa ();
 
   // Sets the admin properties
   void set_event_manager(TAO_Notify_Event_Manager* event_manager);
@@ -131,7 +131,7 @@ protected:
   void set_admin_properties(TAO_Notify_AdminProperties* admin_properties);
 
   /// Accessor for the Admin Properties
-  TAO_Notify_AdminProperties& admin_properties (void);
+  TAO_Notify_AdminProperties& admin_properties ();
 
   /// Notification that can be overridden by subclasses to be informed that
   /// <qos_properties_> have been modified.
@@ -161,24 +161,22 @@ private:
   void set_poa (TAO_Notify_POA_Helper* object_poa);
 
   /// Shutdown the current worker task and delete it if we own it.
-  void shutdown_worker_task (void);
+  void shutdown_worker_task ();
 
   /// Shutdown the current proxy poa.
-  void destroy_proxy_poa (void);
+  void destroy_proxy_poa ();
 
   /// Shutdown the current object poa.
-  void destroy_object_poa (void);
+  void destroy_object_poa ();
 
   /// Shutdown the current poa.
-  void destroy_poa (void);
+  void destroy_poa ();
 
 protected:
-
   /// The mutex to serialize access to state variables.
   TAO_SYNCH_MUTEX lock_;
 
 private:
-
   /// The POA in which the object is activated.
   TAO_Notify_POA_Helper* poa_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index 0e1b720c43c..951731f3c98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -47,25 +47,25 @@ TAO_Notify_Object::set_primary_as_proxy_poa()
 }
 
 ACE_INLINE TAO_Notify_POA_Helper*
-TAO_Notify_Object::poa (void)
+TAO_Notify_Object::poa ()
 {
   return this->poa_;
 }
 
 ACE_INLINE TAO_Notify_POA_Helper*
-TAO_Notify_Object::object_poa (void)
+TAO_Notify_Object::object_poa ()
 {
   return this->object_poa_;
 }
 
 ACE_INLINE TAO_Notify_POA_Helper*
-TAO_Notify_Object::proxy_poa (void)
+TAO_Notify_Object::proxy_poa ()
 {
   return this->proxy_poa_;
 }
 
 ACE_INLINE bool
-TAO_Notify_Object::has_shutdown (void)
+TAO_Notify_Object::has_shutdown ()
 {
   return this->shutdown_;
 }
@@ -78,14 +78,14 @@ TAO_Notify_Object::set_admin_properties( TAO_Notify_AdminProperties* admin_prope
 }
 
 ACE_INLINE TAO_Notify_Event_Manager&
-TAO_Notify_Object::event_manager (void)
+TAO_Notify_Object::event_manager ()
 {
   ACE_ASSERT( this->event_manager_.get() != 0 );
   return *this->event_manager_;
 }
 
 ACE_INLINE TAO_Notify_AdminProperties&
-TAO_Notify_Object::admin_properties (void)
+TAO_Notify_Object::admin_properties ()
 {
   ACE_ASSERT( this->admin_properties_.get() != 0 );
   return *this->admin_properties_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 171baa9e3e5..3f0451ce7a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled
 {
 public:
   /// Default Constructor
-  TAO_Notify_POA_Helper (void);
+  TAO_Notify_POA_Helper ();
 
   /// Create a new PortableServer::POA.
   void init (PortableServer::POA_ptr parent_poa, const char* poa_name);
@@ -52,10 +52,10 @@ public:
   virtual ~TAO_Notify_POA_Helper ();
 
   /// Get underlying POA
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
 
   /// Destroy underlying POA.
-  void destroy (void);
+  void destroy ();
 
   /// Activate Object, the POA will assign an ID and return its value.
   CORBA::Object_ptr activate (PortableServer::Servant servant,
@@ -76,7 +76,7 @@ public:
   CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant) const;
 
   /// Generate a unique id for each POA created.
-  ACE_CString get_unique_id (void);
+  ACE_CString get_unique_id ();
 
 protected:
   /// Set default POA policies.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
index 8679b91e6e2..24301c3cc8c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_Notify_POA_Helper::poa (void)
+TAO_Notify_POA_Helper::poa ()
 {
   return this->poa_.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 31590d5984e..32e1996dc14 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -36,21 +36,21 @@ class TAO_Notify_Serv_Export TAO_Notify_Peer
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Peer > Ptr;
   /// Constructor
-  TAO_Notify_Peer (void);
+  TAO_Notify_Peer ();
 
   /// Destructor
   virtual ~TAO_Notify_Peer ();
 
   /// This method sigantures deliberately match the RefCounting methods
   /// required for ESF Proxy
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   /// Shutdown the peer.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Access Proxy.
-  virtual TAO_Notify_Proxy* proxy (void) = 0;
+  virtual TAO_Notify_Proxy* proxy () = 0;
 
   // Dispatch updates
   virtual void dispatch_updates (const TAO_Notify_EventTypeSeq & added,
@@ -60,7 +60,7 @@ public:
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Handle dispatch exceptions.
-  void handle_dispatch_exception (void);
+  void handle_dispatch_exception ();
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior () const = 0;
@@ -72,7 +72,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void) = 0;
+  virtual void release () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index 316f93a140a..f319745bcf6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -13,7 +13,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 Persistent_Callback::~Persistent_Callback()
 {
 }
@@ -29,7 +28,6 @@ Persistent_Storage_Block::Persistent_Storage_Block(const size_t block_number,
 {
   ACE_NEW(this->data_, unsigned char[this->block_size_]);
   ACE_OS::memset(this->data_, 0, this->block_size_);
-
 }
 
 Persistent_Storage_Block::Persistent_Storage_Block(
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
index d6b32f7d70c..0f8454dc222 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
@@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 /// \brief An interface to allow callbacks on completion of persistent storage
 /// requests.
 class TAO_Notify_Serv_Export Persistent_Callback
@@ -197,7 +196,6 @@ private:
   bool thread_active_;
   ACE_SYNCH_CONDITION wake_up_thread_;
 };
-
 } /* namespace TAO_Notify */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 8b7738439c5..566806c7682 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -39,83 +39,83 @@ class TAO_Notify_Serv_Export TAO_Notify_Properties
 {
 public:
   /// Constructor
-  TAO_Notify_Properties (void);
+  TAO_Notify_Properties ();
 
   /// Destructor
   ~TAO_Notify_Properties ();
 
   /// Return a singleton instance of this class.
-  static TAO_Notify_Properties * instance (void);
+  static TAO_Notify_Properties * instance ();
 
-  static void close (void);
+  static void close ();
 
   // = Property Accessors
-  TAO_Notify_Factory* factory (void);
+  TAO_Notify_Factory* factory ();
   void factory (TAO_Notify_Factory* factory);
 
-  TAO_Notify_Builder* builder (void);
+  TAO_Notify_Builder* builder ();
   void builder (TAO_Notify_Builder* builder);
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
   void orb (CORBA::ORB_ptr orb);
-  CORBA::ORB_ptr dispatching_orb (void);
+  CORBA::ORB_ptr dispatching_orb ();
   void dispatching_orb (CORBA::ORB_ptr dispatching_orb);
 
-  PortableServer::POA_ptr default_poa (void);
+  PortableServer::POA_ptr default_poa ();
   void default_poa (PortableServer::POA_ptr default_poa);
 
-  CORBA::Boolean asynch_updates (void);
+  CORBA::Boolean asynch_updates ();
   void asynch_updates (CORBA::Boolean asynch_updates);
 
-  bool allow_reconnect (void);
+  bool allow_reconnect ();
   void allow_reconnect (bool b);
-  bool validate_client (void);
+  bool validate_client ();
   void validate_client (bool b);
-  ACE_Time_Value validate_client_delay (void);
+  ACE_Time_Value validate_client_delay ();
   void validate_client_delay (ACE_Time_Value b);
-  ACE_Time_Value validate_client_interval (void);
+  ACE_Time_Value validate_client_interval ();
   void validate_client_interval (ACE_Time_Value b);
 
   // Turn on/off update messages.
-  CORBA::Boolean updates (void);
+  CORBA::Boolean updates ();
   void updates (CORBA::Boolean updates);
-  bool separate_dispatching_orb (void);
+  bool separate_dispatching_orb ();
   void separate_dispatching_orb (bool b);
 
   // The QoS Property that must be applied to each newly created Event Channel
-  const CosNotification::QoSProperties& default_event_channel_qos_properties (void);
+  const CosNotification::QoSProperties& default_event_channel_qos_properties ();
 
   // Set the default EC QoS Property.
   void default_event_channel_qos_properties (const CosNotification::QoSProperties &ec_qos);
 
   // The QoS Property that must be applied to each newly created Supplier Admin
-  const CosNotification::QoSProperties& default_supplier_admin_qos_properties (void);
+  const CosNotification::QoSProperties& default_supplier_admin_qos_properties ();
 
   // Set the default SA QoS Property.
   void default_supplier_admin_qos_properties (const CosNotification::QoSProperties &sa_qos);
 
   // The QoS Property that must be applied to each newly created Consumer Admin
-  const CosNotification::QoSProperties& default_consumer_admin_qos_properties (void);
+  const CosNotification::QoSProperties& default_consumer_admin_qos_properties ();
 
   // Set the default CA QoS Property.
   void default_consumer_admin_qos_properties (const CosNotification::QoSProperties &ca_qos);
 
   // The QoS Property that must be applied to each newly created Proxy Supplier
-  const CosNotification::QoSProperties& default_proxy_supplier_qos_properties (void);
+  const CosNotification::QoSProperties& default_proxy_supplier_qos_properties ();
 
   // Set the default PS QoS Property.
   void default_proxy_supplier_qos_properties (const CosNotification::QoSProperties &ps_qos);
 
   // The QoS Property that must be applied to each newly created Proxy Consumer
-  const CosNotification::QoSProperties& default_proxy_consumer_qos_properties (void);
+  const CosNotification::QoSProperties& default_proxy_consumer_qos_properties ();
 
   // Set the default PC QoS Property.
   void default_proxy_consumer_qos_properties (const CosNotification::QoSProperties &pc_qos);
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp ();
   void defaultConsumerAdminFilterOp (CosNotifyChannelAdmin::InterFilterGroupOperator op);
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp (void);
+  CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp ();
   void defaultSupplierAdminFilterOp (CosNotifyChannelAdmin::InterFilterGroupOperator op);
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
index 75072336efc..c0ce10c65f7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Notify_Factory*
-TAO_Notify_Properties::factory (void)
+TAO_Notify_Properties::factory ()
 {
   return this->factory_;
 }
@@ -14,7 +14,7 @@ TAO_Notify_Properties::factory (TAO_Notify_Factory* factory)
 }
 
 ACE_INLINE TAO_Notify_Builder*
-TAO_Notify_Properties::builder (void)
+TAO_Notify_Properties::builder ()
 {
   return this->builder_;
 }
@@ -26,13 +26,13 @@ TAO_Notify_Properties::builder (TAO_Notify_Builder* builder)
 }
 
 ACE_INLINE CORBA::ORB_ptr
-TAO_Notify_Properties::orb (void)
+TAO_Notify_Properties::orb ()
 {
   return CORBA::ORB::_duplicate (orb_.in ());
 }
 
 ACE_INLINE CORBA::ORB_ptr
-TAO_Notify_Properties::dispatching_orb (void)
+TAO_Notify_Properties::dispatching_orb ()
 {
   return CORBA::ORB::_duplicate (dispatching_orb_.in ());
 }
@@ -50,7 +50,7 @@ TAO_Notify_Properties::dispatching_orb (CORBA::ORB_ptr dispatching_orb)
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_Notify_Properties::default_poa (void)
+TAO_Notify_Properties::default_poa ()
 {
   return PortableServer::POA::_duplicate (this->default_poa_.in ());
 }
@@ -62,7 +62,7 @@ TAO_Notify_Properties::default_poa (PortableServer::POA_ptr default_poa)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_Properties::asynch_updates (void)
+TAO_Notify_Properties::asynch_updates ()
 {
   return this->asynch_updates_;
 }
@@ -74,7 +74,7 @@ TAO_Notify_Properties::asynch_updates (CORBA::Boolean asynch_updates)
 }
 
 ACE_INLINE bool
-TAO_Notify_Properties::allow_reconnect (void)
+TAO_Notify_Properties::allow_reconnect ()
 {
   return this->allow_reconnect_;
 }
@@ -86,7 +86,7 @@ TAO_Notify_Properties::allow_reconnect (bool b)
 }
 
 ACE_INLINE bool
-TAO_Notify_Properties::validate_client (void)
+TAO_Notify_Properties::validate_client ()
 {
   return this->validate_client_;
 }
@@ -98,7 +98,7 @@ TAO_Notify_Properties::validate_client (bool b)
 }
 
 ACE_INLINE ACE_Time_Value
-TAO_Notify_Properties::validate_client_delay (void)
+TAO_Notify_Properties::validate_client_delay ()
 {
   return this->validate_client_delay_;
 }
@@ -110,7 +110,7 @@ TAO_Notify_Properties::validate_client_delay (ACE_Time_Value b)
 }
 
 ACE_INLINE ACE_Time_Value
-TAO_Notify_Properties::validate_client_interval (void)
+TAO_Notify_Properties::validate_client_interval ()
 {
   return this->validate_client_interval_;
 }
@@ -123,7 +123,7 @@ TAO_Notify_Properties::validate_client_interval (ACE_Time_Value b)
 
 
 ACE_INLINE bool
-TAO_Notify_Properties::separate_dispatching_orb (void)
+TAO_Notify_Properties::separate_dispatching_orb ()
 {
   return this->separate_dispatching_orb_;
 }
@@ -135,7 +135,7 @@ TAO_Notify_Properties::separate_dispatching_orb (bool b)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_Properties::updates (void)
+TAO_Notify_Properties::updates ()
 {
   return this->updates_;
 }
@@ -147,7 +147,7 @@ TAO_Notify_Properties::updates (CORBA::Boolean updates)
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_Notify_Properties::default_event_channel_qos_properties (void)
+TAO_Notify_Properties::default_event_channel_qos_properties ()
 {
   return this->ec_qos_;
 }
@@ -159,7 +159,7 @@ TAO_Notify_Properties::default_event_channel_qos_properties (const CosNotificati
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_Notify_Properties::default_supplier_admin_qos_properties (void)
+TAO_Notify_Properties::default_supplier_admin_qos_properties ()
 {
   return this->sa_qos_;
 }
@@ -171,7 +171,7 @@ TAO_Notify_Properties::default_supplier_admin_qos_properties (const CosNotificat
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_Notify_Properties::default_consumer_admin_qos_properties (void)
+TAO_Notify_Properties::default_consumer_admin_qos_properties ()
 {
   return this->ca_qos_;
 }
@@ -183,7 +183,7 @@ TAO_Notify_Properties::default_consumer_admin_qos_properties (const CosNotificat
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_Notify_Properties::default_proxy_supplier_qos_properties (void)
+TAO_Notify_Properties::default_proxy_supplier_qos_properties ()
 {
   return this->ps_qos_;
 }
@@ -195,7 +195,7 @@ TAO_Notify_Properties::default_proxy_supplier_qos_properties (const CosNotificat
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_Notify_Properties::default_proxy_consumer_qos_properties (void)
+TAO_Notify_Properties::default_proxy_consumer_qos_properties ()
 {
   return this->pc_qos_;
 }
@@ -207,7 +207,7 @@ TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotificat
 }
 
 ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_Properties::defaultConsumerAdminFilterOp (void)
+TAO_Notify_Properties::defaultConsumerAdminFilterOp ()
 {
   return this->defaultConsumerAdminFilterOp_;
 }
@@ -220,7 +220,7 @@ TAO_Notify_Properties::defaultConsumerAdminFilterOp (CosNotifyChannelAdmin::Inte
 
 
 ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_Properties::defaultSupplierAdminFilterOp (void)
+TAO_Notify_Properties::defaultSupplierAdminFilterOp ()
 {
   return this->defaultSupplierAdminFilterOp_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index e392cf2909d..544993394a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_PropertySeq
 {
 public:
   /// Constructor
-  TAO_Notify_PropertySeq (void);
+  TAO_Notify_PropertySeq ();
 
   /// Destructor
   ~TAO_Notify_PropertySeq ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 520709eff1d..2c0d25b1576 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -9,6 +9,8 @@
 
 #include "orbsvcs/Notify/PropertySeq.h"
 
+#include "orbsvcs/NotifyExtC.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /*****************************************************************************/
@@ -32,7 +34,6 @@ TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (
     value_ (rhs.value_),
     valid_ (rhs.valid_)
 {
-
 }
 
 template <class TYPE>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 987171f8857..35b02c07772 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -68,7 +68,7 @@ public:
   CORBA::Boolean is_valid () const;
 
   /// Invalidate this property's value.
-  void invalidate (void);
+  void invalidate ();
 
 protected:
   /// The Property name.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index 17130a3a969..88c3d9c181b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -33,7 +33,7 @@ TAO_Notify_PropertyBase_T<TYPE>::operator!= (const TYPE &rhs) const
 }
 
 template <class TYPE> ACE_INLINE void
-TAO_Notify_PropertyBase_T<TYPE>:: invalidate (void)
+TAO_Notify_PropertyBase_T<TYPE>:: invalidate ()
 {
   this->valid_ = 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 9a2ab7a4e8c..bc803700021 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -43,7 +43,7 @@ public:
   typedef CosNotifyChannelAdmin::ProxyIDSeq_var SEQ_VAR;
 
   /// Constructor
-  TAO_Notify_Proxy (void);
+  TAO_Notify_Proxy ();
 
   /// Destructor
   virtual ~TAO_Notify_Proxy ();
@@ -57,7 +57,7 @@ public:
       CORBA::Long id);
 
   /// Deactivate
-  void deactivate (void);
+  void deactivate ();
 
   /// Obtain the Proxy's subscribed types.
   void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
@@ -73,13 +73,13 @@ public:
                       const TAO_Notify_EventTypeSeq& removed);
 
   /// Have updates been turned off.
-  CORBA::Boolean updates_off (void);
+  CORBA::Boolean updates_off ();
 
   /// Destroy this object.
-  virtual void destroy (void) = 0;
+  virtual void destroy () = 0;
 
   /// Access our Peer.
-  virtual TAO_Notify_Peer* peer (void) = 0;
+  virtual TAO_Notify_Peer* peer () = 0;
 
   /// Implement the Obtain Types.
   virtual CosNotification::EventTypeSeq* obtain_types (
@@ -106,7 +106,6 @@ public:
   virtual void validate () = 0;
 
 protected:
-
   /// Filter Administration
   TAO_Notify_FilterAdmin filter_admin_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index f8f1b5da453..c83aa741299 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_Proxy::updates_off (void)
+TAO_Notify_Proxy::updates_off ()
 {
   return this->updates_off_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index ca388ef578c..2230a958c20 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -39,10 +39,10 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer
 public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> Ptr;
   /// Constructor
-  TAO_Notify_ProxyConsumer (void);
+  TAO_Notify_ProxyConsumer ();
 
   /// Destructor
-  virtual ~TAO_Notify_ProxyConsumer (void);
+  virtual ~TAO_Notify_ProxyConsumer ();
 
   /// init: overrides Topology_Object method
   virtual void init (TAO_Notify::Topology_Parent * topology_parent);
@@ -51,26 +51,26 @@ public:
   void connect (TAO_Notify_Supplier* supplier);
 
   /// Disconnect
-  void disconnect (void);
+  void disconnect ();
 
   /// Shutdown  (TAO_Notify_Container_T method)
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Destroy this object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Return true if connected
   bool is_connected () const;
 
   /// The SA parent.
-  TAO_Notify_SupplierAdmin& supplier_admin (void);
+  TAO_Notify_SupplierAdmin& supplier_admin ();
 
   ACE_Time_Value last_ping() const;
   void last_ping(const ACE_Time_Value& tv);
 
 protected:
   /// Access the Supplier
-  TAO_Notify_Supplier* supplier (void);
+  TAO_Notify_Supplier* supplier ();
 
   /// Accept an event from the Supplier
   void push_i (TAO_Notify_Event * event);
@@ -91,8 +91,7 @@ private:
   ACE_Auto_Ptr<TAO_Notify_Supplier> supplier_;
 
   /// Access our Peer.
-  virtual TAO_Notify_Peer* peer (void);
-
+  virtual TAO_Notify_Peer* peer ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
index 5f9deb58c82..6172c6e0928 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
@@ -8,13 +8,13 @@ TAO_Notify_ProxyConsumer::is_connected () const
 }
 
 ACE_INLINE TAO_Notify_Supplier*
-TAO_Notify_ProxyConsumer::supplier (void)
+TAO_Notify_ProxyConsumer::supplier ()
 {
   return this->supplier_.get();
 }
 
 ACE_INLINE TAO_Notify_SupplierAdmin&
-TAO_Notify_ProxyConsumer::supplier_admin (void)
+TAO_Notify_ProxyConsumer::supplier_admin ()
 {
   ACE_ASSERT( this->supplier_admin_.get() != 0 );
   return *this->supplier_admin_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 3b329e4723a..4c3ad93164f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -9,7 +9,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T ()
 {
 }
 
@@ -26,7 +26,7 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin ()
 {
   CosNotifyChannelAdmin::SupplierAdmin_var ret;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 1da12d3d681..1c8903aeb84 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -32,7 +32,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T
 {
 public:
   /// Constructor
-  TAO_Notify_ProxyConsumer_T (void);
+  TAO_Notify_ProxyConsumer_T ();
 
   /// Destructor
   ~TAO_Notify_ProxyConsumer_T ();
@@ -41,7 +41,7 @@ public:
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed);
 
-  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void);
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin ();
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode);
@@ -50,7 +50,6 @@ public:
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   );
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index a49ec312c7b..fa49f9d135f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notif
 public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier> Ptr;
   /// Constructor
-  TAO_Notify_ProxySupplier (void);
+  TAO_Notify_ProxySupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_ProxySupplier ();
@@ -50,16 +50,16 @@ public:
   /// Connect
   void connect (TAO_Notify_Consumer* consumer);
   /// Disconnect
-  void disconnect (void);
+  void disconnect ();
 
   /// Dispatch Event to consumer
   virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request);
 
   /// Override TAO_Notify_Container_T::shutdown  method
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Destroy this object.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Destroy this object, but also indicate if it is due to a timeout or
   /// not.
@@ -72,10 +72,10 @@ public:
   bool is_connected () const;
 
   /// Access the Consumer
-  TAO_Notify_Consumer* consumer (void);
+  TAO_Notify_Consumer* consumer ();
 
   /// The CA parent.
-  TAO_Notify_ConsumerAdmin& consumer_admin (void);
+  TAO_Notify_ConsumerAdmin& consumer_admin ();
 
 private:
   ///= Data Members.
@@ -86,7 +86,7 @@ private:
   TAO_Notify_Consumer::Ptr consumer_;
 
   /// Access our Peer.
-  virtual TAO_Notify_Peer* peer (void);
+  virtual TAO_Notify_Peer* peer ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
index 7f7d079890a..df3d2ba141c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
@@ -8,13 +8,13 @@ TAO_Notify_ProxySupplier::is_connected () const
 }
 
 ACE_INLINE TAO_Notify_Consumer*
-TAO_Notify_ProxySupplier::consumer (void)
+TAO_Notify_ProxySupplier::consumer ()
 {
   return this->consumer_.get();
 }
 
 ACE_INLINE TAO_Notify_ConsumerAdmin&
-TAO_Notify_ProxySupplier::consumer_admin (void)
+TAO_Notify_ProxySupplier::consumer_admin ()
 {
   ACE_ASSERT( this->consumer_admin_.get() != 0 );
   return *this->consumer_admin_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index f65acbbb9c8..8b0bce36406 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -15,7 +15,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T ()
   : is_suspended_ (0)
 {
 }
@@ -96,7 +96,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection ()
 {
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
@@ -113,7 +113,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection ()
 {
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
@@ -129,7 +129,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin ()
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ret;
 
@@ -143,7 +143,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
 /***************************** UNIMPLEMENTED METHODS***************************************/
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -155,7 +155,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mapp
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index ac288d54fe8..a53e6e75705 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -31,7 +31,7 @@ class TAO_Notify_ProxySupplier_T : public virtual TAO_Notify_Proxy_T <SERVANT_TY
 {
 public:
   /// Constructor
-  TAO_Notify_ProxySupplier_T (void);
+  TAO_Notify_ProxySupplier_T ();
 
   /// Destructor
   ~TAO_Notify_ProxySupplier_T ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 8c73a057172..818201dfcc4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -6,7 +6,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
-TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T ()
 {
   // Any object that is used by the POA gets a reference count of 1 at construction
   this->_incr_refcnt();
@@ -18,19 +18,19 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::~TAO_Notify_Proxy_T ()
 }
 
 template <class SERVANT_TYPE> PortableServer::Servant
-TAO_Notify_Proxy_T<SERVANT_TYPE>::servant (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::servant ()
 {
   return this;
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
@@ -42,7 +42,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoS
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -101,7 +101,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter)
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -110,7 +110,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index ab905b368b4..e3f254893d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -34,17 +34,17 @@ class TAO_Notify_Proxy_T : public SERVANT_TYPE, public virtual TAO_Notify_Proxy
 {
 public:
   /// Constructor
-  TAO_Notify_Proxy_T (void);
+  TAO_Notify_Proxy_T ();
 
   /// Destructor
   ~TAO_Notify_Proxy_T ();
 
   /// Implements TAO_Notify_Object::servant method.
-  virtual PortableServer::Servant servant (void);
+  virtual PortableServer::Servant servant ();
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index 201628c5b82..aa0fbb52336 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -33,10 +33,10 @@ class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_Proper
 {
 public:
   /// Constructor
-  TAO_Notify_QoSProperties (void);
+  TAO_Notify_QoSProperties ();
 
   /// Destructor
-  virtual ~TAO_Notify_QoSProperties (void);
+  virtual ~TAO_Notify_QoSProperties ();
 
   /// Return 0 on success, 1 if unsupported properties were detected and -1 on error.
   int init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq);
@@ -67,17 +67,17 @@ public:
   const TAO_Notify_Property_Time& blocking_policy() const;
 
   // The non-const accessors are used during topology load
-  TAO_Notify_Property_Short& event_reliability (void);
-  TAO_Notify_Property_Short& connection_reliability (void);
-  TAO_Notify_Property_Short& priority (void);
-  TAO_Notify_Property_Time& timeout (void);
-  TAO_Notify_Property_Boolean& stop_time_supported (void);
-  TAO_Notify_Property_Long& maximum_batch_size (void);
-  TAO_Notify_Property_Time& pacing_interval (void);
-  TAO_Notify_Property_Long& max_events_per_consumer (void);
-  TAO_Notify_Property_Short& discard_policy(void);
-  TAO_Notify_Property_Short& order_policy(void);
-  TAO_Notify_Property_Time& blocking_policy(void);
+  TAO_Notify_Property_Short& event_reliability ();
+  TAO_Notify_Property_Short& connection_reliability ();
+  TAO_Notify_Property_Short& priority ();
+  TAO_Notify_Property_Time& timeout ();
+  TAO_Notify_Property_Boolean& stop_time_supported ();
+  TAO_Notify_Property_Long& maximum_batch_size ();
+  TAO_Notify_Property_Time& pacing_interval ();
+  TAO_Notify_Property_Long& max_events_per_consumer ();
+  TAO_Notify_Property_Short& discard_policy();
+  TAO_Notify_Property_Short& order_policy();
+  TAO_Notify_Property_Time& blocking_policy();
 
 protected:
   /// Return 1 if <value> is unsupported.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
index db79570bce6..510e5b7d8af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
@@ -92,67 +92,67 @@ TAO_Notify_QoSProperties::blocking_policy() const
 
 ACE_INLINE
 TAO_Notify_Property_Short&
-TAO_Notify_QoSProperties::event_reliability(void)
+TAO_Notify_QoSProperties::event_reliability()
 {
   return this->event_reliability_;
 }
 
 ACE_INLINE
 TAO_Notify_Property_Short&
-TAO_Notify_QoSProperties::connection_reliability(void)
+TAO_Notify_QoSProperties::connection_reliability()
 {
   return this->connection_reliability_;
 }
 
 ACE_INLINE
 TAO_Notify_Property_Short&
-TAO_Notify_QoSProperties::priority(void)
+TAO_Notify_QoSProperties::priority()
 {
   return this->priority_;
 }
 
 ACE_INLINE
 TAO_Notify_Property_Time&
-TAO_Notify_QoSProperties::timeout(void)
+TAO_Notify_QoSProperties::timeout()
 {
   return this->timeout_;
 }
 
 ACE_INLINE
 TAO_Notify_Property_Boolean&
-TAO_Notify_QoSProperties::stop_time_supported(void)
+TAO_Notify_QoSProperties::stop_time_supported()
 {
   return this->stop_time_supported_;
 }
 
 ACE_INLINE TAO_Notify_Property_Long&
-TAO_Notify_QoSProperties::maximum_batch_size (void)
+TAO_Notify_QoSProperties::maximum_batch_size ()
 {
   return this->maximum_batch_size_;
 }
 
 ACE_INLINE TAO_Notify_Property_Time&
-TAO_Notify_QoSProperties::pacing_interval (void)
+TAO_Notify_QoSProperties::pacing_interval ()
 {
   return this->pacing_interval_;
 }
 ACE_INLINE
 TAO_Notify_Property_Long&
-TAO_Notify_QoSProperties::max_events_per_consumer (void)
+TAO_Notify_QoSProperties::max_events_per_consumer ()
 {
   return this->max_events_per_consumer_;
 }
 
 ACE_INLINE
 TAO_Notify_Property_Short&
-TAO_Notify_QoSProperties::discard_policy(void)
+TAO_Notify_QoSProperties::discard_policy()
 {
   return this->discard_policy_;
 }
 
 ACE_INLINE
 TAO_Notify_Property_Short&
-TAO_Notify_QoSProperties::order_policy(void)
+TAO_Notify_QoSProperties::order_policy()
 {
   return this->order_policy_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 09c91139f80..c1c44446beb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Builder : public TAO_Notify_Builder
 {
 public:
   /// Constructor
-  TAO_Notify_RT_Builder (void);
+  TAO_Notify_RT_Builder ();
 
   /// Destructor
   virtual ~TAO_Notify_RT_Builder ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index 76f83c53632..0286a1ff4f9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service
 {
 public:
   /// Constructor
-  TAO_RT_Notify_Service (void);
+  TAO_RT_Notify_Service ();
 
   /// Destructor
   ~TAO_RT_Notify_Service ();
@@ -42,10 +42,10 @@ protected:
   virtual void init_i (CORBA::ORB_ptr orb);
 
   /// Create the Factory for RT Notify objects.
-  virtual TAO_Notify_Factory* create_factory (void);
+  virtual TAO_Notify_Factory* create_factory ();
 
   /// Creates the Builder for RT Notify objects.
-  virtual TAO_Notify_Builder* create_builder (void);
+  virtual TAO_Notify_Builder* create_builder ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 2c0d9458a5d..624015376f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -30,7 +30,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_POA_Helper : public TAO_Notify_POA_Help
 {
 public:
   /// Destructor
-  ~TAO_Notify_RT_POA_Helper (void);
+  ~TAO_Notify_RT_POA_Helper ();
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
index f1549a4596c..7881aebb5fb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -29,18 +29,18 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Properties
 {
 public:
   /// Constructor
-  TAO_Notify_RT_Properties (void);
+  TAO_Notify_RT_Properties ();
 
   /// Destructor
   ~TAO_Notify_RT_Properties ();
 
   /// Return singleton instance of this class.
-  static TAO_Notify_RT_Properties * instance (void);
+  static TAO_Notify_RT_Properties * instance ();
 
-  RTCORBA::RTORB_ptr rt_orb (void);
+  RTCORBA::RTORB_ptr rt_orb ();
   void rt_orb (RTCORBA::RTORB_ptr rt_orb);
 
-  RTCORBA::Current_ptr current (void);
+  RTCORBA::Current_ptr current ();
   void current (RTCORBA::Current_ptr current);
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
index 3316151861f..30fa294de82 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE RTCORBA::RTORB_ptr
-TAO_Notify_RT_Properties::rt_orb (void)
+TAO_Notify_RT_Properties::rt_orb ()
 {
   return RTCORBA::RTORB::_duplicate (rt_orb_.in ());
 }
@@ -14,7 +14,7 @@ TAO_Notify_RT_Properties::rt_orb (RTCORBA::RTORB_ptr rt_orb)
 }
 
 ACE_INLINE RTCORBA::Current_ptr
-TAO_Notify_RT_Properties::current (void)
+TAO_Notify_RT_Properties::current ()
 {
   return RTCORBA::Current::_duplicate (current_.in());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index b1e3488ab5e..3e775ab64b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 Random_File::Random_File()
   : block_size_(512)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
index 4eefacf39be..0ffb9e321c2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 /**
  * \brief A random file class.
  *
@@ -83,7 +82,6 @@ private:
   size_t block_size_;
   mutable TAO_SYNCH_MUTEX lock_;
 };
-
 } /* namespace TAO_Notify */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index 1abb78b8df9..db8570672e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -34,32 +34,32 @@ class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task
 {
 public:
   /// Constructor
-  TAO_Notify_Reactive_Task (void);
+  TAO_Notify_Reactive_Task ();
 
   /// Destructor
-  virtual ~TAO_Notify_Reactive_Task (void);
+  virtual ~TAO_Notify_Reactive_Task ();
 
   /// Init the reactive task.
-  void init (void);
+  void init ();
 
   /// Shutdown task
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Exec the request.
   virtual void execute (TAO_Notify_Method_Request& method_request);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
-  virtual TAO_Notify_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer ();
 
   /// Returns NULL.
-  virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void);
+  virtual TAO_Notify_Buffering_Strategy* buffering_strategy ();
 
 private:
   /// The timer.
   TAO_Notify_Timer_Reactor::Ptr timer_;
 
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
index cc4ef7e45c5..892a8011b22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Notify_Buffering_Strategy*
-TAO_Notify_Reactive_Task::buffering_strategy (void)
+TAO_Notify_Reactive_Task::buffering_strategy ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 230f7432641..03689fc674f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -48,7 +48,6 @@ namespace TAO_Notify
       ACE_SYNCH_NULL_MUTEX> Reconnection_Registry_Type;
 
   public:
-
     /// Constructor
     Reconnection_Registry (Topology_Parent & parent);
 
@@ -65,7 +64,7 @@ namespace TAO_Notify
     ///
     void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
-    CORBA::Boolean is_alive (void);
+    CORBA::Boolean is_alive ();
 
     //////////////////////
     // During topology save
@@ -81,7 +80,7 @@ namespace TAO_Notify
     void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory);
 
   private:
-    void release (void);
+    void release ();
 
     Reconnection_Registry_Type reconnection_registry_;
     ::NotifyExt::ReconnectionRegistry::ReconnectionID highest_id_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index f3c96c621d8..379dd715558 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -61,7 +61,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_Refcountable> Ptr;
 
   /// Constructor
-  TAO_Notify_Refcountable (void);
+  TAO_Notify_Refcountable ();
 
   /// Destructor
   /// public for stack allocated instances
@@ -69,8 +69,8 @@ public:
 
   /// This method signatures deliberately match the RefCounting methods required for ESF Proxy
   /// Public for bridge implementations and various guard classes
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
 #if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
   static void diagnostic_dump( const char* title = 0 );
@@ -78,7 +78,7 @@ public:
 
 private:
   /// The release method is called when the refcount reaches 0.
-  virtual void release (void) = 0;
+  virtual void release () = 0;
 
   /// Use a signed counter so that we can more easily detect
   /// boundary conditions such as too many _decr_refcnt() calls.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index e32670b14f3..ffc5466e11a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -36,7 +36,6 @@ class TAO_Notify_Method_Request_Queueable;
 
 namespace TAO_Notify
 {
-
 class Routing_Slip_Persistence_Manager;
 
 // Forward declarations of TAO_Notify classes/pointers/collections
@@ -77,7 +76,7 @@ public:
 
   void set_rspm (Routing_Slip_Persistence_Manager * rspm);
 
-  void reconnect (void);
+  void reconnect ();
 
   /// Destructor (should be private but that inspires compiler wars)
   virtual ~Routing_Slip ();
@@ -232,7 +231,6 @@ private:
 
   static Routing_Slip_Queue persistent_queue_;
 };
-
 } // namespace
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 7d76533d46b..6ae29fe6bb9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 Routing_Slip_Persistence_Manager::Routing_Slip_Persistence_Manager(
   Standard_Event_Persistence_Factory* factory)
   : removed_(false)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index c458f30d069..919cb08ae58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -130,7 +130,7 @@ private:
       };
 
     Block_Header(Header_Type type);
-    virtual ~Block_Header (void);
+    virtual ~Block_Header ();
     virtual size_t extract_header(Persistent_Storage_Block& psb,
       size_t offset = 0);
     virtual size_t put_header(Persistent_Storage_Block& psb,
@@ -255,7 +255,6 @@ private:
   ACE_Message_Block * event_mb_;
   ACE_Message_Block * routing_slip_mb_;
 };
-
 } /* namespace TAO_Notify */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/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/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 8b394884503..9ab3162b23d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
-TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
+TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T ()
 {
 }
 
@@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container)
   container.collection ()->for_each (this);
 
   return this->seq_._retn ();
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index f0de98edcd8..9f2050785ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -38,7 +38,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T
 
 public:
   /// Constructor
-  TAO_Notify_Seq_Worker_T (void);
+  TAO_Notify_Seq_Worker_T ();
 
   /// Create a SEQ
   SEQ* create (CONTAINER& container);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 33e2f07b2cc..84d6802684d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer
   friend class TAO_Notify_Builder;
 public:
   /// Constructor
-  TAO_Notify_SequenceProxyPushConsumer (void);
+  TAO_Notify_SequenceProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_SequenceProxyPushConsumer ();
@@ -57,17 +57,17 @@ protected:
   ///= Protected Methods
 
   //= interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier);
 
   virtual void push_structured_events (const CosNotification::EventBatch & notifications);
 
-  virtual void disconnect_sequence_push_consumer (void);
+  virtual void disconnect_sequence_push_consumer ();
 
 private:
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 4d277a370d0..fcc8aa31c2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -45,7 +45,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier
 
 public:
   /// Constructor
-  TAO_Notify_SequenceProxyPushSupplier (void);
+  TAO_Notify_SequenceProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_SequenceProxyPushSupplier ();
@@ -59,7 +59,7 @@ public:
   virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   /// = Servant methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_sequence_push_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer
@@ -69,7 +69,7 @@ public:
   );
 
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 1d5b3a70076..2ff7297e9d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -71,15 +71,14 @@ public:
   virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer);
 
 protected:
-
-  virtual CORBA::Object_ptr get_consumer (void);
+  virtual CORBA::Object_ptr get_consumer ();
 
   /// The Consumer
   CosNotifyComm::SequencePushConsumer_var push_consumer_;
 
 private:
   /// TAO_Notify_Destroy_Callback methods.
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index 26bdd19cb1e..24c60ab5746 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -40,14 +40,13 @@ public:
   void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier);
 
   /// TAO_Notify_Destroy_Callback methods
-  virtual void release (void);
+  virtual void release ();
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior () const;
 
 protected:
-
-  virtual CORBA::Object_ptr get_supplier (void);
+  virtual CORBA::Object_ptr get_supplier ();
 
  /// The Supplier
   CosNotifyComm::SequencePushSupplier_var push_supplier_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index ce9a97a64ce..4dbac747c3e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -52,11 +52,11 @@ class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object
 {
 public:
   /// Destructor.
-  virtual ~TAO_Notify_Service (void);
+  virtual ~TAO_Notify_Service ();
 
   /// Load an implementation of the TAO_Notify_Service based on which
   /// implementations are loaded.
-  static TAO_Notify_Service* load_default (void);
+  static TAO_Notify_Service* load_default ();
 
   /// Init the service from configurator
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
index a9834a5c602..877339272d2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
@@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 Standard_Event_Persistence::Standard_Event_Persistence ()
   : filename_ (ACE_TEXT ("__PERSISTENT_EVENT__.DB"))
   , block_size_ (512)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index aca08885310..a91576fc880 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier :
 {
 public:
   /// Constructor
-  TAO_Notify_RT_StructuredProxyPushSupplier (void);
+  TAO_Notify_RT_StructuredProxyPushSupplier ();
 
   /// Destructor
   ~TAO_Notify_RT_StructuredProxyPushSupplier ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 8836af68ee3..420f6bce869 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -132,5 +132,4 @@ TAO_Notify_StructuredProxyPushConsumer::configure(
 }
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 21ac1c2cd3b..175ddf44cf2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -40,7 +40,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer
 
 public:
   /// Constructor
-  TAO_Notify_StructuredProxyPushConsumer (void);
+  TAO_Notify_StructuredProxyPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_StructuredProxyPushConsumer ();
@@ -51,9 +51,8 @@ public:
   virtual void configure(TAO_Notify_SupplierAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
 protected:
-
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_structured_push_supplier (
     CosNotifyComm::StructuredPushSupplier_ptr push_supplier
@@ -70,9 +69,8 @@ protected:
 
 
 private:
-
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 2df948724bb..c46d36a3a32 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -46,7 +46,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier
 
 public:
   /// Constructor
-  TAO_Notify_StructuredProxyPushSupplier (void);
+  TAO_Notify_StructuredProxyPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_StructuredProxyPushSupplier ();
@@ -57,7 +57,7 @@ public:
 
   /// = Servant methods
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (void);
+  virtual CosNotifyChannelAdmin::ProxyType MyType ();
 
   virtual void connect_structured_push_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer
@@ -71,9 +71,8 @@ public:
   virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
 private:
-
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 5d34c6a6043..b66e71b6815 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -61,15 +61,14 @@ public:
 
 
 protected:
-
-  virtual CORBA::Object_ptr get_consumer (void);
+  virtual CORBA::Object_ptr get_consumer ();
 
   /// The Consumer
   CosNotifyComm::StructuredPushConsumer_var push_consumer_;
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 
   /// Connection valid flag
   int connection_valid;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index dceff67a466..456d8e1a095 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -43,15 +43,14 @@ public:
   virtual ACE_CString get_ior () const;
 
 protected:
-
-  virtual CORBA::Object_ptr get_supplier (void);
+  virtual CORBA::Object_ptr get_supplier ();
 
   /// The Supplier
   CosNotifyComm::StructuredPushSupplier_var push_supplier_;
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index 880df5e42ed..e3f8c4bb819 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -39,17 +39,16 @@ public:
   virtual ~TAO_Notify_Supplier ();
 
   /// Access Specific Proxy.
-  TAO_Notify_ProxyConsumer* proxy_consumer (void);
+  TAO_Notify_ProxyConsumer* proxy_consumer ();
 
   /// Access Base Proxy.
-  virtual TAO_Notify_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy ();
 
-  virtual CORBA::Object_ptr get_supplier (void) = 0;
+  virtual CORBA::Object_ptr get_supplier () = 0;
 
   bool is_alive (bool allow_nil_supplier);
 
 protected:
-
   /// Dispatch updates implementation.
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
                                    const CosNotification::EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
index e1b2c45f8c3..8fcf8928148 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Notify_ProxyConsumer*
-TAO_Notify_Supplier::proxy_consumer (void)
+TAO_Notify_Supplier::proxy_consumer ()
 {
   return this->proxy_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index bb23585e87c..71d6b038e00 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -42,7 +42,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_SupplierAdmin > Ptr;
 
   /// Constructor
-  TAO_Notify_SupplierAdmin (void);
+  TAO_Notify_SupplierAdmin ();
 
   /// Destructor
   virtual ~TAO_Notify_SupplierAdmin ();
@@ -51,8 +51,8 @@ public:
   void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
   virtual const char * get_admin_type_name () const;
 
@@ -66,10 +66,9 @@ public:
       size_t position);
 
   /// TAO_Notify_Container_T requires a destroy method
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
-
     TAO_Notify::Topology_Object *load_proxy (
     CORBA::Long id,
     CosNotifyChannelAdmin::ClientType ctype,
@@ -83,15 +82,15 @@ protected:
       const CosNotification::QoSProperties & initial_qos);
 
   /// = CosNotifyChannelAdmin::SupplierAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (void);
+  virtual CosNotifyChannelAdmin::AdminID MyID ();
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ();
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ();
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ();
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (void);
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ();
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
       CosNotifyChannelAdmin::ProxyID proxy_id);
@@ -106,7 +105,7 @@ protected:
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
-  virtual ::CosNotification::QoSProperties* get_qos (void);
+  virtual ::CosNotification::QoSProperties* get_qos ();
 
   virtual void set_qos (const CosNotification::QoSProperties& qos);
 
@@ -125,9 +124,9 @@ protected:
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
       CosNotifyFilter::FilterID filter);
 
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void);
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters ();
 
-  virtual void remove_all_filters (void);
+  virtual void remove_all_filters ();
 
   virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ();
 
@@ -135,7 +134,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 58fe638e208..42684e8445c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -44,7 +44,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task
 
 public:
   /// Constructor
-  TAO_Notify_ThreadPool_Task (void);
+  TAO_Notify_ThreadPool_Task ();
 
   /// Destructor
   virtual ~TAO_Notify_ThreadPool_Task ();
@@ -68,10 +68,10 @@ public:
   virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   /// The object used by clients to register timers.
-  virtual TAO_Notify_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer ();
 
   /// Provide access to the underlying buffering strategy
-  TAO_Notify_Buffering_Strategy* buffering_strategy (void);
+  TAO_Notify_Buffering_Strategy* buffering_strategy ();
 
 protected:
   /// Task svc
@@ -79,7 +79,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 
   /// The buffering strategy to use.
   ACE_Auto_Ptr< TAO_Notify_Buffering_Strategy > buffering_strategy_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
index f60d6788010..afcfc6e2e7e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -36,7 +36,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer > Ptr;
   /// Destructor
-  virtual ~TAO_Notify_Timer (){};
+  virtual ~TAO_Notify_Timer () = default;
 
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index a5965725620..2360c3dfd93 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -35,10 +35,10 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer_Queue > Ptr;
 
   /// Constructor
-  TAO_Notify_Timer_Queue (void);
+  TAO_Notify_Timer_Queue ();
 
   /// Destructor
-  virtual ~TAO_Notify_Timer_Queue (void);
+  virtual ~TAO_Notify_Timer_Queue ();
 
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
@@ -49,7 +49,7 @@ public:
   virtual int cancel_timer (long timer_id);
 
   /// Get the native impl.
-  ACE_Timer_Queue& impl (void);
+  ACE_Timer_Queue& impl ();
 
 protected:
   /// The Timer Queue
@@ -57,7 +57,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 3146b11006b..28c9454f642 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -35,7 +35,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer_Reactor > Ptr;
 
   /// Constructor
-  TAO_Notify_Timer_Reactor (void);
+  TAO_Notify_Timer_Reactor ();
 
   /// Destructor
   virtual ~TAO_Notify_Timer_Reactor ();
@@ -54,7 +54,7 @@ protected:
 
 private:
   /// Release
-  virtual void release (void);
+  virtual void release ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index def15cc2749..393212d1a43 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -32,7 +32,6 @@ namespace CORBA
 
 namespace TAO_Notify
 {
-
 /// A forward declaration.
 class Topology_Object;
 
@@ -69,9 +68,8 @@ public:
    * vary based on the type of loader, so we can't include it in the
    * interface.
    */
-  virtual void close (void);
+  virtual void close ();
 };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index de3803bc12b..214f306bfd4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -55,7 +55,7 @@ namespace TAO_Notify
   {
    public:
     /// Destructor.
-    virtual ~Topology_Savable (void);
+    virtual ~Topology_Savable ();
 
     /// Save our state to a Topology_Saver.
     ///
@@ -92,8 +92,7 @@ namespace TAO_Notify
     /// to any external objects with whom we were interacting.  We should
     /// call the reconnect() method on all of our children to give them
     /// the chance to do the same.
-    virtual void reconnect (void);
-
+    virtual void reconnect ();
   };
 
   /// \brief Base class for Persistent Topology Objects.
@@ -150,7 +149,7 @@ namespace TAO_Notify
     ///
     ///  see also Topology_Parent::child_change ()
     /// \return false if save will never happen
-    bool self_change (void);
+    bool self_change ();
 
     /// \brief pointer to our topological parent
     ///
@@ -160,7 +159,7 @@ namespace TAO_Notify
     /// \brief Handle details of propagating change
     ///
     /// \return false if save will never happen
-    bool send_change (void);
+    bool send_change ();
 
     /// \brief Handle details of propagating change
     ///  for a deleted object.
@@ -175,7 +174,7 @@ namespace TAO_Notify
     /// (top level of tree)
     /// private virtual because this should only be called from send_change()
     /// \return false if save will never happen
-    virtual bool change_to_parent (void);
+    virtual bool change_to_parent ();
 
   protected:
     /// true if this object changed since last save_persistent
@@ -198,9 +197,8 @@ namespace TAO_Notify
     /// Called by a child that has changed.
     /// A child calls this method to report that it has changed.
     /// \return false if save will never happen
-    bool child_change (void);
+    bool child_change ();
   };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
index 024c8483f0e..1c496a22c44 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
@@ -12,7 +12,7 @@ namespace TAO_Notify
 
   ACE_INLINE
   bool
-  Topology_Parent::child_change (void)
+  Topology_Parent::child_change ()
   {
     this->children_changed_ = true;
     return send_change ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 93707f71c00..6331ef75469 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -34,7 +34,6 @@ namespace TAO_Notify
   class TAO_Notify_Serv_Export Topology_Saver
   {
   public:
-
     /// The destructor.
     virtual ~Topology_Saver ();
 
@@ -95,7 +94,7 @@ namespace TAO_Notify
      * vary based on the type of saver, so we can't include it in the
      * interface.
      */
-    virtual void close (void);
+    virtual void close ();
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
index 62739cd5965..5ab23c46bfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
@@ -43,7 +43,6 @@ class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task
   : public ACE_Task<ACE_NULL_SYNCH>
 {
 public:
-
   typedef TAO_Condition<TAO_SYNCH_MUTEX> CONDITION;
 
   /// Constructor.  It does not assume ownership of the <event_channel>
@@ -53,11 +52,11 @@ public:
                                      TAO_Notify_EventChannelFactory *ecf);
 
   /// destructor...
-  virtual ~TAO_Notify_validate_client_Task (void);
+  virtual ~TAO_Notify_validate_client_Task ();
 
   virtual int svc ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The delay of first time validate.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 9a66ed58ade..38f349a5618 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -41,7 +41,7 @@ public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Worker_Task > Ptr;
 
   /// Constructor
-  TAO_Notify_Worker_Task (void);
+  TAO_Notify_Worker_Task ();
 
   /// Update QoS Properties.
   virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
@@ -51,10 +51,10 @@ public:
   virtual void execute (TAO_Notify_Method_Request& method_request) = 0;
 
   /// Shutdown task
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /// The object used by clients to register timers.
-  virtual TAO_Notify_Timer* timer (void) = 0;
+  virtual TAO_Notify_Timer* timer () = 0;
 
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index 76094b30928..b4d535c045e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -71,7 +71,6 @@ private:
   /// If false, then we're just checking syntax of topology file.
   bool live_;
 };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index 71ee9911ba1..6308768b7f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-
 /**
  * \brief Save Notification Service Topology to an XML file.
  */
@@ -53,7 +52,7 @@ public:
   virtual void end_object (CORBA::Long id,
     const ACE_CString& type);
 
-  virtual void close (void);
+  virtual void close ();
 
 private:
   void backup_file_name (ACE_TCHAR * file_path, size_t nfile);
@@ -72,9 +71,7 @@ private:
 
   /// A string consisting of spaces that is our current indentation level.
   ACE_CString indent_;
-
 };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
index a567b11a3ac..952862c35a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
@@ -72,7 +72,6 @@ namespace TAO_Notify
     size_t backup_count_;
     bool timestamp_;
   };
-
 } // namespace TAO_Notify
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
index 5fcde9c4c19..5f085240713 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
@@ -98,7 +98,6 @@ namespace TAO_PG
 
     virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &packets);
   };
-
 } // namespace TAO_PG
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 3c23c9325a8..3f4bf31e76a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -99,25 +99,25 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (void);
+  char * the_name ();
 
-  PortableServer::POA_ptr the_parent (void);
+  PortableServer::POA_ptr the_parent ();
 
-  PortableServer::POAList *the_children (void);
+  PortableServer::POAList *the_children ();
 
-  PortableServer::POAManager_ptr the_POAManager (void);
+  PortableServer::POAManager_ptr the_POAManager ();
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (void);
+  PortableServer::AdapterActivator_ptr the_activator ();
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator);
 
-  PortableServer::ServantManager_ptr get_servant_manager (void);
+  PortableServer::ServantManager_ptr get_servant_manager ();
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
-  PortableServer::Servant get_servant (void);
+  PortableServer::Servant get_servant ();
 
   void set_servant (PortableServer::Servant servant);
 
@@ -147,7 +147,7 @@ public:
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
 
-  CORBA::OctetSeq *id (void);
+  CORBA::OctetSeq *id ();
 
   // End standard POA interface methods.
 
@@ -160,13 +160,12 @@ public:
            TAO_ORB_Core &orb_core,
            TAO_Object_Adapter *object_adapter);
 
-  virtual ~TAO_GOA (void);
+  virtual ~TAO_GOA ();
 
     // Used to force the initialization of the code.
-    static int Initializer (void);
+    static int Initializer ();
 
 protected:
-
   /// Template method for creating new POA's of this type.
   virtual TAO_Root_POA *new_POA (const String &name,
                                  PortableServer::POAManager_ptr poa_manager,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index a91cf6c403b..609aa9b90a0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -28,7 +28,7 @@ namespace TAO
   public:
     /// Used to force the insertion of UIPMC_Factory in the service
     /// configurator.
-    static int Initializer (void);
+    static int Initializer ();
   };
 
   static int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index f9aa0670849..7c2681d0d16 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -35,7 +35,7 @@ class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator
 {
 public:
   /// Constructor.
-  TAO_PG_Default_Property_Validator (void);
+  TAO_PG_Default_Property_Validator ();
 
   /// Destructor
   virtual ~TAO_PG_Default_Property_Validator () = default;
@@ -64,7 +64,6 @@ private:
   PortableGroup::Name membership_;
   PortableGroup::Name factories_;
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 8be0a079531..4f46abd4cfc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -169,7 +169,6 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr
 
   // and create a ior string
   this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
-
 }
 
 int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb)
@@ -298,7 +297,7 @@ void TAO::PG_FactoryRegistry::register_factory (
                         RoleInfo(5),
                         CORBA::NO_MEMORY());
 
-      ACE_auto_ptr_reset (safe_entry, role_info);
+      safe_entry.reset (role_info);
       role_info->type_id_ = type_id;
     }
   else
@@ -309,7 +308,7 @@ void TAO::PG_FactoryRegistry::register_factory (
         }
     }
 
-  PortableGroup::FactoryInfos & infos = role_info->infos_;;
+  PortableGroup::FactoryInfos & infos = role_info->infos_;
   CORBA::ULong length = infos.length();
   for (CORBA::ULong nInfo = 0u; nInfo < length; ++nInfo)
     {
@@ -505,7 +504,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
       PortableGroup::FactoryInfo & info = infos[nInfo];
       if (info.the_location == location)
       {
-
         ORBSVCS_ERROR((LM_INFO,
           "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n",
           this->identity_.c_str(),
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 042cb69528b..fae1f62b208 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -71,7 +71,7 @@ namespace TAO
     PG_FactoryRegistry (const char * name = "FactoryRegistry");
 
     /// virtual Destructor
-    virtual ~PG_FactoryRegistry (void);
+    virtual ~PG_FactoryRegistry ();
 
     /**
      * Parse command line arguments.
@@ -97,7 +97,7 @@ namespace TAO
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (void);
+    int fini ();
 
     /**
      * Processing to happen when the ORB's event loop is idle.
@@ -120,7 +120,7 @@ namespace TAO
 
     ////////////////////////////////
     // override servant base methods
-    virtual void _remove_ref (void);
+    virtual void _remove_ref ();
 
     //////////////////
     // CORBA interface
@@ -159,7 +159,6 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
     /**
      * A human-readable string to distinguish this from other Notifiers.
      */
@@ -217,7 +216,6 @@ namespace TAO
     int linger_;
 
     RegistryType registry_;
-
   };
 } // namespace TAO
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
index 9d4edb7506a..c37ddad820b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
@@ -44,7 +44,6 @@ struct TAO_PG_Factory_Node
 
   /// FactoryCreationId assigned to the member.
   PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
-
 };
 
 typedef ACE_Array_Base<TAO_PG_Factory_Node> TAO_PG_Factory_Set;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 78225419532..2d5ed961376 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -26,7 +26,6 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory (
 
 TAO_PG_GenericFactory::~TAO_PG_GenericFactory ()
 {
-
   TAO_PG_Factory_Map::iterator end = this->factory_map_.end ();
   for (TAO_PG_Factory_Map::iterator i = this->factory_map_.begin ();
        i != end;
@@ -134,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_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 8b2d4ad6a77..691c142f1a4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -54,13 +54,12 @@ public:
                          TAO_PG_PropertyManager & property_manager);
 
   /// Destructor.
-  ~TAO_PG_GenericFactory (void);
+  ~TAO_PG_GenericFactory ();
 
   /**
    * @name TAO_LoadBalancer::GenericFactory methods
    */
   //@{
-
   /**
    * Create an object of the specified type that adheres to the
    * restrictions defined by the provided Criteria.  The out
@@ -134,7 +133,6 @@ public:
       const CORBA::Boolean propagate_member_already_present);
 
 private:
-
   /// Populate the object group being created.  Called when the
   /// infrastructure-controlled membership style is used for the
   /// object group being created.
@@ -175,7 +173,6 @@ private:
     PortableGroup::MinimumNumberMembersValue & minimum_number_members);
 
 private:
-
   /// Reference to the POA used to create object group references.
   PortableServer::POA_var poa_;
 
@@ -212,7 +209,6 @@ private:
   /// Lock used to synchronize access to the factory creation id
   /// index (i.e. next_fcid_).
   TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 7d9d138d90e..f7eb0d328f4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -293,7 +293,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_
 }
 
 
-
 PortableGroup::ObjectGroups *
 TAO::PG_Group_Factory::groups_at_location (
     const PortableGroup::Location & the_location)
@@ -359,7 +358,6 @@ TAO::PG_Group_Factory::set_object_group_storable_factory (
   ACE_NEW_THROW_EX (this->list_store_,
                     TAO::PG_Group_List_Store (*this->storable_factory_),
                     CORBA::NO_MEMORY ());
-
 }
 
 TAO::PG_Group_Factory::Group_Map &
@@ -430,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 110030bce8a..7b628e5da0b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -101,7 +101,7 @@ namespace TAO
      * return all groups in the factory
      */
     PortableGroup::ObjectGroups *
-    all_groups (void);
+    all_groups ();
 
     /**
      * insert existing group.  Take ownership
@@ -162,7 +162,6 @@ namespace TAO
     void set_object_group_storable_factory (TAO::Storable_Factory * factory);
 
   protected:
-
     /**
      * Factory function to create a storable object object from
      * scratch.
@@ -194,7 +193,6 @@ namespace TAO
     PG_Group_List_Store * list_store_;
 
   private:
-
     CORBA::ORB_var orb_;
 
     /// Reference to the POA used to create object group references.
@@ -220,7 +218,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_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
index eaa37bdee45..ad666863a4d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -53,10 +53,10 @@ public:
                       const PortableServer::ObjectId & oid);
 
   /// Destructor.
-  ~TAO_PG_Group_Guard (void);
+  ~TAO_PG_Group_Guard ();
 
   /// Relinquish cleanup responsibility.
-  void release (void);
+  void release ();
 
 private:
   /// Reference to the infrastructure TAO_PG_GenericFactory that
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
index 8642cf3ce77..f4f4e138bfb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
@@ -38,7 +38,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_PortableGroup_Export TAO_PG_Location_Equal_To
 {
 public:
-
   /// Perform a string comparison on each of the sequence elements in
   /// the given locations.
   int operator() (const PortableGroup::Location &lhs,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 72065e982b1..b1ffb6120b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -74,7 +74,6 @@ TAO_PG_ObjectGroupManager::add_member (
                              the_location,
                              member,
                              check_type_id);
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index ebbd04b4b6a..a78ea1a1c8b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -47,10 +47,10 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager
 {
 public:
   /// Constructor.
-  TAO_PG_ObjectGroupManager (void);
+  TAO_PG_ObjectGroupManager ();
 
   /// Destructor.
-  ~TAO_PG_ObjectGroupManager (void);
+  ~TAO_PG_ObjectGroupManager ();
 
   /**
    * @name PortableGroup::ObjectGroupManager methods
@@ -59,7 +59,6 @@ public:
    * interface.
    */
   //@{
-
   /// Create a member and add it to the given object group.
   virtual PortableGroup::ObjectGroup_ptr create_member (
       PortableGroup::ObjectGroup_ptr object_group,
@@ -198,7 +197,6 @@ public:
   void validate_members (CORBA::ORB_ptr orb, const TimeBase::TimeT& timeout);
 
 protected:
-
   /// Underlying and non-locking implementation of the add_member()
   /// and _tao_add_member() methods in this class.
   PortableGroup::ObjectGroup_ptr add_member_i (
@@ -248,7 +246,6 @@ protected:
                                    TAO_PG_ObjectGroup_Array * groups);
 
 private:
-
   /// Help function to get active or inactive member infos.
   TAO_PG_MemberInfo_Set get_members (bool is_alive);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
index 628d75e9fa2..38e929f385f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
@@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 struct TAO_PG_ObjectGroup_Map_Entry
 {
 public:
-
   /// The RepositoryId corresponding to all Members in the
   /// ObjectGroup.
   CORBA::String_var type_id;
@@ -64,7 +63,6 @@ public:
   /// Properties used when creating this object group, in addition to
   /// those set dynamically after the creation.
   PortableGroup::Properties properties;
-
 };
 
 /// ObjectId hash map typedef.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 933ad6b0274..39951ceb8f2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -175,7 +175,6 @@ namespace TAO
     PortableGroup::InitialNumberMembersValue get_initial_number_members () const;
 
 
-
     /**
      * @@TODO DOC
      */
@@ -230,7 +229,7 @@ namespace TAO
     /**
      * @@TODO DOC
      */
-    virtual PortableGroup::Locations * locations_of_members (void);
+    virtual PortableGroup::Locations * locations_of_members ();
 
     /**
      * @@TODO DOC
@@ -242,12 +241,12 @@ namespace TAO
     /**
      * @@TODO DOC
      */
-    virtual void initial_populate (void);
+    virtual void initial_populate ();
 
     /**
      * @@TODO DOC
      */
-    virtual void minimum_populate (void);
+    virtual void minimum_populate ();
 
 
     /**
@@ -264,23 +263,21 @@ namespace TAO
 
     virtual void set_name (const char* group_name);
 
-    virtual const char* get_name (void);
+    virtual const char* get_name ();
 
     /////////////////////////
     // Implementation methods
   private:
-
     int increment_version ();
 
-    void distribute_iogr (void);
+    void distribute_iogr ();
 
     void create_members (size_t count);
 
   protected:
-
     virtual PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member);
 
-    void clear_members_map (void);
+    void clear_members_map ();
 
     /////////////////////////
     // Forbidden methods
@@ -293,15 +290,12 @@ namespace TAO
     /////////////////
     // Static Methods
   public:
-
     ///////////////
     // Static Data
   private:
-
     ///////////////
     // Data Members
   private:
-
     /**
      * Protect internal state.
      */
@@ -311,12 +305,10 @@ namespace TAO
     CORBA::ORB_var orb_;
 
   private:
-
     /// Where to find the factories for replicas.
     PortableGroup::FactoryRegistry_var factory_registry_;
 
   protected:
-
     // The object group manipulator
     TAO::PG_Object_Group_Manipulator & manipulator_;
 
@@ -371,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 a3ba9dd57c0..e5cb7fe7f68 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -85,7 +85,6 @@ namespace TAO
                         PortableGroup::ObjectGroup_ptr member) const;
 
   private:
-
     /**
      * Allocate an ogid for a new object group
      */
@@ -98,7 +97,6 @@ namespace TAO
       convert_ogid_to_oid (PortableGroup::ObjectGroupId ogid) const;
 
   private:
-
     /// The orb
     CORBA::ORB_var orb_;
 
@@ -113,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 a1822362dce..21953ce8621 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -37,11 +37,9 @@ namespace
 
 namespace TAO
 {
-
   class Object_Group_File_Guard : public TAO::Storable_File_Guard
   {
   public:
-
     Object_Group_File_Guard ( TAO::PG_Object_Group_Storable & object_group,
                               Method_Type method_type);
 
@@ -67,10 +65,8 @@ namespace TAO
     virtual TAO::Storable_Base * create_stream (const char * mode);
 
   private:
-
     TAO::PG_Object_Group_Storable & object_group_;
   };
-
 }
 
 TAO::Object_Group_File_Guard::Object_Group_File_Guard (
@@ -153,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)
     {
@@ -251,8 +246,7 @@ TAO::PG_Object_Group_Storable::PG_Object_Group_Storable (
   // version already exists.
   bool stream_exists = false;
   {
-    ACE_Auto_Ptr<TAO::Storable_Base> stream (
-      this->create_stream ("r"));
+    ACE_Auto_Ptr<TAO::Storable_Base> stream (this->create_stream ("r"));
 
     if (stream->exists ())
       stream_exists = true;
@@ -290,8 +284,7 @@ TAO::PG_Object_Group_Storable::PG_Object_Group_Storable (
   // version already exists.
   bool stream_exists = false;
   {
-    ACE_Auto_Ptr<TAO::Storable_Base> stream (
-      this->create_stream ("r"));
+    ACE_Auto_Ptr<TAO::Storable_Base> stream (this->create_stream ("r"));
 
     if (stream->exists ())
       stream_exists = true;
@@ -311,16 +304,13 @@ TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable ()
 {
   if (destroyed_)
     {
-      ACE_Auto_Ptr<TAO::Storable_Base> stream (
-        this->create_stream ("r"));
+      ACE_Auto_Ptr<TAO::Storable_Base> stream (this->create_stream ("r"));
 
       if (stream->exists ())
         {
           stream->remove ();
         }
-
     }
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
index 4be3b931eb1..0aa09da87eb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
@@ -111,14 +111,14 @@ namespace TAO
         const char * type_id,
         const PortableGroup::Criteria & the_criteria);
 
-    virtual PortableGroup::Locations * locations_of_members (void);
+    virtual PortableGroup::Locations * locations_of_members ();
 
     virtual CORBA::Object_ptr get_member_reference (
         const PortableGroup::Location & the_location);
 
-    virtual void initial_populate (void);
+    virtual void initial_populate ();
 
-    virtual void minimum_populate (void);
+    virtual void minimum_populate ();
 
     virtual int has_member_at (const PortableGroup::Location & location );
 
@@ -126,7 +126,7 @@ namespace TAO
 
     virtual void set_name (const char* group_name);
 
-    virtual const char* get_name (void);
+    virtual const char* get_name ();
 
     virtual PortableGroup::ObjectGroupId  get_object_group_id () const;
 
@@ -151,7 +151,6 @@ namespace TAO
     time_t last_changed_;
 
   protected:
-
     bool loaded_from_stream_;
 
     bool destroyed_;
@@ -162,7 +161,7 @@ namespace TAO
     /**
      * Signals that this context was updated.
      */
-    virtual void state_written (void);
+    virtual void state_written ();
 
     /**
      * A callback invoked by the object group file guard
@@ -176,7 +175,6 @@ namespace TAO
     TAO_SYNCH_MUTEX lock_;
 
     friend class Object_Group_File_Guard;
-
   };
 } // namespace TAO
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index a016ef95a5a..b141599f443 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -83,7 +83,6 @@ namespace TAO_PG
   private:
     NamedValueVec values_;
   };
-
 } //namespace TAO_PG
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index 2307a500f86..1db783c17dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -92,7 +92,7 @@ namespace TAO
      * resource leaks.
      * @returns a newly allocated PortableGroup::Properties.
      */
-    PortableGroup::Properties * get_default_properties (void);
+    PortableGroup::Properties * get_default_properties ();
 
     /**
      * Undefine default properties that appear in props.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 9eb811f199c..b6b7bc593b1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -59,7 +59,6 @@ public:
    * interface.
    */
   //@{
-
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
       const PortableGroup::Properties & props);
@@ -145,7 +144,6 @@ private:
    * @todo Strategize the validator, or use template policies.
    */
   TAO_PG_Default_Property_Validator property_validator_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index bf18a767a8a..4554afdc793 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -164,7 +164,6 @@ void TAO::PG_Property_Set::set_property (
 }
 
 
-
 void TAO::PG_Property_Set::export_properties(PortableGroup::Properties & property_set) const
 {
   ValueMap merged_values;
@@ -211,7 +210,6 @@ void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const
 }
 
 
-
 int TAO::PG_Property_Set::find (
   const ACE_CString & key,
   const PortableGroup::Value *& pValue) const
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 38904560b23..4d51d5451a1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -64,7 +64,7 @@ namespace TAO
     /**
      * constructor: empty set with no defaults.
      */
-    PG_Property_Set (void);
+    PG_Property_Set ();
 
     /**
      * constructor
@@ -153,7 +153,6 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
     /**
      * Protect internal state.
      */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index 4d365eb44e1..698b3ae661f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -52,7 +52,6 @@ namespace TAO
          i != 0;
          i = i->cont ())
       {
-
         ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
         buf += i->length ();
       }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index 6044c7615b0..481d154b353 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -66,19 +66,18 @@ public:
   TAO_PortableGroup_Acceptor_Registry () = default;
 
   ///  Default destructor.
-  ~TAO_PortableGroup_Acceptor_Registry (void);
+  ~TAO_PortableGroup_Acceptor_Registry ();
 
   /// Open an acceptor based on a tagged profile.
   void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core);
 
   /// Close all open acceptors.
-  int close_all (void);
+  int close_all ();
 
   typedef ACE_Unbounded_Queue<Entry> Acceptor_Registry;
   typedef ACE_Unbounded_Queue_Iterator<Entry> Acceptor_Registry_Iterator;
 
 protected:
-
   /// Helper function to open a group acceptor.
   void open_i (const TAO_Profile* profile,
                TAO_ORB_Core &orb_core,
@@ -89,7 +88,6 @@ protected:
             Entry *&entry);
 
 private:
-
   // The acceptor registry should not be copied.
   TAO_PortableGroup_Acceptor_Registry (
     const TAO_PortableGroup_Acceptor_Registry&);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index fc8c91bc883..00054102207 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -42,13 +42,13 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Loader
 {
 public:
   /// Constructor.
-  TAO_PortableGroup_Loader (void);
+  TAO_PortableGroup_Loader ();
 
   /// Initialize the PortableGroup loader hooks.
   virtual int init (int argc, ACE_TCHAR *[]);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index 0ae58aa6ccb..7831a49f79f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -85,7 +85,7 @@ public:
   TAO_Portable_Group_Map () = default;
 
   /// Destructor.
-  ~TAO_Portable_Group_Map (void);
+  ~TAO_Portable_Group_Map ();
 
   /// Add a GroupId->ObjectKey mapping to the map.
   /// This function takes ownership of the memory pointed to be group_id
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index 15b533d28db..5ab7b942067 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -57,7 +57,7 @@ public:
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   /**
    * The TAO_Acceptor methods, check the documentation in
@@ -74,12 +74,12 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
@@ -104,7 +104,6 @@ public:
                               char *&host);
 
 protected:
-
   /**
    * Implement the common part of the open*() methods.  This method is
    * virtual to allow a derived class implementation to be invoked
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
index 9ecf57d37c7..bc609a30646 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
@@ -16,7 +16,7 @@ TAO_UIPMC_Acceptor::address () const
 }
 
 ACE_INLINE const ACE_INET_Addr *
-TAO_UIPMC_Acceptor::endpoints (void)
+TAO_UIPMC_Acceptor::endpoints ()
 {
   ACE_ASSERT (this->addrs_ != 0);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index a0992d8de03..b95a2407a90 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -50,9 +50,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler :
   public TAO_UIPMC_SVC_HANDLER,
   public TAO_Connection_Handler
 {
-
 public:
-
   TAO_UIPMC_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor. arg parameter is used by the Acceptor to pass the
@@ -61,7 +59,7 @@ public:
 
 
   /// Destructor.
-  ~TAO_UIPMC_Connection_Handler (void);
+  ~TAO_UIPMC_Connection_Handler ();
 
   //@{
   /** @name Connection Handler overloads
@@ -76,8 +74,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -87,7 +85,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
@@ -106,7 +104,6 @@ public:
   // UIPMC Additions - End
 
 protected:
-
   // UIPMC Additions - Begin
 
   // This is always the remote address
@@ -121,7 +118,7 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 
@@ -130,7 +127,6 @@ protected:
   int set_tos (int tos);
 
 private:
-
   /// Stores the type of service value.
   int dscp_codepoint_;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 4bd176212d7..d3cb4947983 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -48,7 +48,7 @@ public:
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
   virtual int check_prefix (const char *endpoint);
@@ -64,7 +64,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (void);
+  virtual TAO_Profile * make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index e5d78638e74..81e57b96ceb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -51,7 +51,7 @@ public:
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
 
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
 
   /// Makes a copy of this TAO_Endpoint.
@@ -84,7 +84,7 @@ public:
   /// Set the port number.
   CORBA::UShort port (CORBA::UShort p); //@@ Frank - deprecate this.
 
-  //TAO_UIPMC_Connection_Handler *&hint (void);
+  //TAO_UIPMC_Connection_Handler *&hint ();
   // Access to our <hint_>.
   /// Do we have a preferred local network interface set for this target?
   bool is_preferred_network () const;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index 6068c4b8e1c..56e62305d6c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -31,8 +31,8 @@ class TAO_Connector;
 class TAO_PortableGroup_Export TAO_UIPMC_Protocol_Factory : public TAO_Protocol_Factory
 {
 public:
-  TAO_UIPMC_Protocol_Factory (void);
-  virtual ~TAO_UIPMC_Protocol_Factory (void) = default;
+  TAO_UIPMC_Protocol_Factory ();
+  virtual ~TAO_UIPMC_Protocol_Factory () = default;
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -49,8 +49,8 @@ public:
   virtual char options_delimiter () const;
 
   // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
index 6f5cdb32aa6..149e933831f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
@@ -58,7 +58,7 @@ public:
   TAO_UIPMC_Mcast_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_UIPMC_Mcast_Connection_Handler (void);
+  ~TAO_UIPMC_Mcast_Connection_Handler ();
 
   //@{
   /** @name Connection Handler overloads
@@ -73,8 +73,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -84,7 +84,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   // UIPMC Additions - Begin
   const ACE_INET_Addr &addr () const;
@@ -120,7 +120,7 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
index 5a2236c3e1d..8c0a23f2086 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
@@ -57,7 +57,7 @@ public:
                              TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_UIPMC_Mcast_Transport (void);
+  ~TAO_UIPMC_Mcast_Transport ();
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
@@ -69,8 +69,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler *event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler *event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   /// Shouldn't ever be called on the server side.
@@ -84,7 +84,7 @@ protected:
                         size_t,
                         ACE_Time_Value const *);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
 public:
   /// @@TODO: These methods IMHO should have more meaningful
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index 461c5823bc5..5556e6073b2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -54,7 +54,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, default. Used when the profile contents
   /// are not yet known or when it is being decoded from an IOR.
@@ -76,12 +76,12 @@ public:
   virtual int decode (TAO_InputCDR &cdr);
   virtual void parse_string (const char *string);
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
+  virtual int encode_endpoints ();
   virtual void encodeAddressInfo (TAO_OutputCDR &stream) const;
-  virtual TAO_Endpoint *endpoint (void);
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
-  virtual IOP::TaggedProfile &create_tagged_profile (void);
+  virtual IOP::TaggedProfile &create_tagged_profile ();
   virtual void request_target_specifier (
     TAO_Target_Specification &target_spec,
     TAO_Target_Specification::TAO_Target_Address r);
@@ -99,11 +99,11 @@ public:
 protected:
   /// Template methods, please see documentation in tao/Profile.h
   virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual void parse_string_i (const char *);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-  virtual void update_cached_group_component (void);
+  virtual void update_cached_group_component ();
 
 protected:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 529bb23232a..04d2ca03092 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -52,7 +52,6 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-
   virtual ACE_Event_Handler *event_handler_i ();
   virtual TAO_Connection_Handler *connection_handler_i ();
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
index c0d9b19aa45..b6a253e0096 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
@@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_PG
 {
-
   UIPMC_Recv_Packet_Cleanup_Guard::UIPMC_Recv_Packet_Cleanup_Guard (
     TAO_UIPMC_Mcast_Transport *transport
   )
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
index edc24b52cf5..b796f6b7c3d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
@@ -26,7 +26,6 @@ class TAO_UIPMC_Mcast_Transport;
 
 namespace TAO_PG
 {
-
   /**
    * @class UIPMC_Recv_Packet_Cleanup_Guard
    *
@@ -97,7 +96,6 @@ namespace TAO_PG
                                  ACE_SYNCH_NULL_MUTEX> Fragments_Map;
     Fragments_Map fragments_;
   };
-
 } // namespace TAO_PG
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index 08a0f011026..948e5b9f2db 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_PortableGroup_Export TAO_UIPMC_Wait_Never : public TAO_Wait_Strategy
 {
-
 public:
   /// Constructor.
   TAO_UIPMC_Wait_Never (TAO_Transport *transport);
@@ -47,6 +46,15 @@ public:
   int register_handler () override;
   bool non_blocking () const override;
   bool can_process_upcalls () const override;
+
+  // = Documented in TAO_Wait_Strategy.
+  virtual int sending_request (TAO_ORB_Core *orb_core,
+                               TAO_Message_Semantics msg_semantics);
+  virtual int wait (ACE_Time_Value *max_wait_time,
+                    TAO_Synch_Reply_Dispatcher &rd);
+  virtual int register_handler ();
+  virtual bool non_blocking () const;
+  virtual bool can_process_upcalls () const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
index f872dd5c504..3f74cdeb86a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
@@ -49,10 +49,10 @@ class TAO_PortableGroup_Export TAO_MIOP_Resource_Factory
 {
 public:
   /// Constructor.
-  TAO_MIOP_Resource_Factory (void);
+  TAO_MIOP_Resource_Factory ();
 
   /// Destructor.
-  virtual ~TAO_MIOP_Resource_Factory (void);
+  virtual ~TAO_MIOP_Resource_Factory ();
 
   /**
    * @name Service Configurator Hooks
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index a221db0de35..44597e3f600 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -15,7 +15,6 @@
 #include "ace/OS_NS_string.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // = Methods to deal with ACE_Hash_Map_Manager.
@@ -491,7 +490,6 @@ TAO_PropertySet::define_property (const char *property_name,
 CORBA::Boolean
 TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
 {
-
   // If the sequence is empty, no constraints.
   if (this->allowed_property_types_.length () == 0)
     return 1;
@@ -1181,7 +1179,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
         {
           break;
         }
-      // fallthrough
+      ACE_FALLTHROUGH;
     default:
       // Error. ret is -1 or rebind returned other than 1.
       throw CORBA::UNKNOWN ();
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index e057cbf5925..f96232753fe 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -42,7 +42,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Key
   //     Key for the Hash Table. The EXT_ID of the
   //     ACE_Hash_Map_Manager.
 public:
-  CosProperty_Hash_Key (void);
+  CosProperty_Hash_Key ();
   // Default constructor.
 
   CosProperty_Hash_Key (const char * &name);
@@ -54,7 +54,7 @@ public:
   CosProperty_Hash_Key (const CosProperty_Hash_Key &hash_key);
   // Copy constructor.
 
-  virtual ~CosProperty_Hash_Key (void);
+  virtual ~CosProperty_Hash_Key ();
   // Destructor.
 
   virtual bool operator == (const CosProperty_Hash_Key &hash_key) const;
@@ -64,7 +64,6 @@ public:
   // The function that computes a hash value.
 
 // private:
-
   CosPropertyService::PropertyName_var pname_;
   // Storage pointer.
 };
@@ -75,7 +74,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Value
   //     This will be the value part in the Hash_Table. The INT_ID of
   //     the ACE_Hash_Map_Manager.
 public:
-  CosProperty_Hash_Value (void);
+  CosProperty_Hash_Value ();
   // Default constructor.
 
   CosProperty_Hash_Value (const CORBA::Any &any,
@@ -85,11 +84,10 @@ public:
   CosProperty_Hash_Value (const CosProperty_Hash_Value &hash_value);
   // Copy constructor.
 
-  virtual ~CosProperty_Hash_Value (void);
+  virtual ~CosProperty_Hash_Value ();
   // Destructor.
 
 //private:
-
   CORBA::Any pvalue_;
   // property value.
 
@@ -112,14 +110,14 @@ class TAO_Property_Serv_Export TAO_PropertySetFactory :  public virtual POA_CosP
   // = DESCRIPTION
   //     The object may be created with some predfined properties.
 public:
-  TAO_PropertySetFactory (void);
+  TAO_PropertySetFactory ();
   // Constructor.
 
-  virtual ~TAO_PropertySetFactory (void);
+  virtual ~TAO_PropertySetFactory ();
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (void);
+  create_propertyset ();
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
 
@@ -156,14 +154,14 @@ class TAO_Property_Serv_Export TAO_PropertySetDefFactory : public virtual POA_Co
   // = DESCRIPTION
   //     The object creation may be done with some predefined properties.
 public:
-  TAO_PropertySetDefFactory(void);
+  TAO_PropertySetDefFactory();
   // Constructor.
 
-  virtual ~TAO_PropertySetDefFactory (void);
+  virtual ~TAO_PropertySetDefFactory ();
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (void);
+  create_propertysetdef ();
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
@@ -198,7 +196,7 @@ public:
   friend class TAO_PropertiesIterator;
 
   /// Default constructor.
-  TAO_PropertySet (void);
+  TAO_PropertySet ();
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                    const CosPropertyService::Properties allowed_properties);
@@ -211,7 +209,7 @@ public:
                    const CORBA::ULong number_of_allowed_propertydefs);
   // PropertySetDef's construction needs this.
 
-  virtual ~TAO_PropertySet (void);
+  virtual ~TAO_PropertySet ();
   // Destructor function.
 
   virtual void define_property (const char *property_name,
@@ -223,7 +221,7 @@ public:
   virtual void define_properties (const CosPropertyService::Properties &nproperties);
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (void);
+  virtual CORBA::ULong get_number_of_properties ();
   // Get the number of properties that are currently defined in the
   // PropertySet.
 
@@ -253,7 +251,7 @@ public:
   virtual void delete_properties (const CosPropertyService::PropertyNames &property_names);
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (void);
+  virtual CORBA::Boolean delete_all_properties ();
   // Delete everything from this property set.
 
   virtual CORBA::Boolean is_property_defined (const char *property_name);
@@ -318,7 +316,7 @@ class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosProper
   //     provide more client access and control of the characteristics
   //     (metadata) of a PropertySet.
 public:
-  TAO_PropertySetDef (void);
+  TAO_PropertySetDef ();
   // Constructor.
 
   TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
@@ -328,7 +326,7 @@ public:
   TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs);
   // This is also for the factory.
 
-  virtual ~TAO_PropertySetDef (void);
+  virtual ~TAO_PropertySetDef ();
   // Destructor.
 
   virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types);
@@ -411,10 +409,10 @@ public:
   TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
   // Constructor.
 
-  virtual ~TAO_PropertyNamesIterator (void);
+  virtual ~TAO_PropertyNamesIterator ();
   // Destructor.
 
-  virtual void reset (void);
+  virtual void reset ();
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
@@ -432,7 +430,7 @@ public:
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Destroys the iterator.
 private:
   typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
@@ -467,10 +465,10 @@ public:
   TAO_PropertiesIterator (TAO_PropertySet &property_set);
   // Constructor.
 
-  virtual ~TAO_PropertiesIterator (void);
+  virtual ~TAO_PropertiesIterator ();
   // Destructor.
 
-  virtual void reset (void);
+  virtual void reset ();
   // Resets the position in an iterator to the first property, if one exists.
 
   virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty);
@@ -487,7 +485,7 @@ public:
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Destroys the iterator.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 39f3b8e1dc7..ca57772158a 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -175,7 +175,7 @@ public:
    * of scheduled priorities.  All scheduled priorities range from 0
    * to the number returned, inclusive.
    */
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void);
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority ();
 
   virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
index 7a7e5de736d..ed178833178 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
@@ -48,12 +48,12 @@ namespace TAO
     typedef TAO_Accept_Strategy<IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_ACCEPT_STRATEGY;
 
     /// Constructor.
-    IIOP_SSL_Acceptor (void);
+    IIOP_SSL_Acceptor ();
 
     /// Destructor.
-    ~IIOP_SSL_Acceptor (void);
+    ~IIOP_SSL_Acceptor ();
 
-    virtual int close (void);
+    virtual int close ();
 
   private:
     /// The concrete acceptor, as a pointer to it's base class.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 4c300069df1..f0a4d3c4b84 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class IIOP_SSL_Connection_Handler
    *
@@ -47,14 +46,12 @@ namespace TAO
   class IIOP_SSL_Connection_Handler : public TAO_IIOP_Connection_Handler
   {
   public:
-
     /// Constructor.
     IIOP_SSL_Connection_Handler (ACE_Thread_Manager* t = 0);
     IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core);
 
     /// Destructor.
-    ~IIOP_SSL_Connection_Handler (void);
-
+    ~IIOP_SSL_Connection_Handler ();
   };
 
   // ****************************************************************
@@ -78,16 +75,14 @@ namespace TAO
   class Null_SSL_State_Guard
   {
   public:
-
     /// Constructor that sets up the null TSS SSL state.
     Null_SSL_State_Guard (TAO::SSLIOP::Current_ptr current,
                           int &result);
 
     /// Destructor that restores the previous TSS SSL state.
-    ~Null_SSL_State_Guard (void);
+    ~Null_SSL_State_Guard ();
 
   private:
-
     /// The SSLIOP::Current implementation that was previously
     /// associated with the current thread and invocation.
     /**
@@ -102,9 +97,7 @@ 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.
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
index 667237bbdac..c51daa4f597 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
@@ -20,7 +20,7 @@ TAO::Null_SSL_State_Guard::Null_SSL_State_Guard (
 }
 
 ACE_INLINE
-TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard (void)
+TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard ()
 {
   // Restore the previous TSS SSL state.
   this->current_->teardown (this->previous_current_impl_,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index 3c06e02904e..53aafa75c65 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -41,18 +41,16 @@ namespace TAO
   class IIOP_SSL_Connector : public TAO_IIOP_Connector
   {
   public:
-
     /// Constructor.
-    IIOP_SSL_Connector (void);
+    IIOP_SSL_Connector ();
 
     /// Destructor.
-    ~IIOP_SSL_Connector (void);
+    ~IIOP_SSL_Connector ();
 
     int open (TAO_ORB_Core *orb_core);
-    int close (void);
+    int close ();
 
   public:
-
     typedef TAO_Connect_Concurrency_Strategy<IIOP_SSL_Connection_Handler>
             CONNECT_CONCURRENCY_STRATEGY;
 
@@ -68,7 +66,6 @@ namespace TAO
             BASE_CONNECTOR;
 
   protected:
-
     /**
      * @name The TAO_Connector Methods
      *
@@ -85,14 +82,12 @@ namespace TAO
     //@}
 
   private:
-
     /// Our connect strategy
     CONNECT_STRATEGY connect_strategy_;
 
     /// The connector initiating connection requests for IIOP_SSL.
     BASE_CONNECTOR base_connector_;
   };
-
 } // End TAO namespace.
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
index 1a31541d446..9610fc16d8d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
@@ -60,7 +60,7 @@ namespace TAO
                         TAO_ORB_Core *orb_core);
 
     /// Default destructor.
-    ~IIOP_SSL_Transport (void);
+    ~IIOP_SSL_Transport ();
 
     /** @name Overridden Template Methods
      *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
index 996dc779302..baaa1dd427b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
@@ -34,7 +34,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-
     /**
      * @class Accept_Strategy
      *
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_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 6a60f33a322..dfa877b7a3b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -51,7 +51,7 @@ namespace TAO
                 bool check_host);
 
       /// Destructor.
-      ~Acceptor (void);
+      ~Acceptor ();
 
       typedef TAO_Strategy_Acceptor<Connection_Handler, ACE_SSL_SOCK_Acceptor> BASE_ACCEPTOR;
       typedef TAO_Creation_Strategy<Connection_Handler> CREATION_STRATEGY;
@@ -75,7 +75,7 @@ namespace TAO
                                 int version_major,
                                 int version_minor,
                                 const char *options = 0);
-      virtual int close (void);
+      virtual int close ();
       virtual int create_profile (const TAO::ObjectKey &object_key,
                                   TAO_MProfile &mprofile,
                                   CORBA::Short priority);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index 73fce84efc9..0ccf7f7cefa 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -66,7 +66,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (void);
+      virtual char * context_id ();
 
       virtual SecurityLevel3::Principal * client_principal ();
 
@@ -82,13 +82,13 @@ namespace TAO
 
       virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ();
 
-      virtual CORBA::Boolean client_authentication (void);
+      virtual CORBA::Boolean client_authentication ();
 
-      virtual CORBA::Boolean target_authentication (void);
+      virtual CORBA::Boolean target_authentication ();
 
-      virtual CORBA::Boolean confidentiality (void);
+      virtual CORBA::Boolean confidentiality ();
 
-      virtual CORBA::Boolean integrity (void);
+      virtual CORBA::Boolean integrity ();
       //@}
 
     protected:
@@ -97,7 +97,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~ClientCredentials (void);
+      ~ClientCredentials ();
 
     private:
       /// Reference to the OpenSSL @c SSL data structure associated
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 5838e7579f7..757f3944cec 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -56,7 +56,7 @@ namespace TAO
       Connection_Handler (TAO_ORB_Core *orb_core);
 
       /// Destructor.
-      ~Connection_Handler (void);
+      ~Connection_Handler ();
 
       /**
        * @name Connection Handler overloads
@@ -74,8 +74,8 @@ namespace TAO
       //@{
       /** @name Event Handler overloads
        */
-      virtual int resume_handler (void);
-      virtual int close_connection (void);
+      virtual int resume_handler ();
+      virtual int close_connection ();
       virtual int handle_input (ACE_HANDLE);
       virtual int handle_output (ACE_HANDLE);
       virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -85,7 +85,7 @@ namespace TAO
       //@}
 
       /// Add ourselves to cache.
-      int add_transport_to_cache (void);
+      int add_transport_to_cache ();
 
       /// Process the @a listen_list.
       int process_listen_point_list (IIOP::ListenPointList &listen_list);
@@ -103,14 +103,14 @@ namespace TAO
 
       /// Return true if the host name matches the name/domain in the peer
       /// certificate.
-      bool check_host (void);
+      bool check_host ();
 
     protected:
       //@{
       /**
        * @name TAO_Connection Handler overloads
        */
-      virtual int release_os_resources (void);
+      virtual int release_os_resources ();
       virtual void pos_io_hook (int & return_value);
       virtual int handle_write_ready (const ACE_Time_Value *timeout);
       //@}
@@ -146,7 +146,7 @@ namespace TAO
                    int &result);
 
       /// Destructor that tears down the TSS SSL state.
-      ~State_Guard (void);
+      ~State_Guard ();
 
     private:
       /// Pointer to the connection handler currently handling the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
index 55ac19b0d06..4957a8cf31b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
@@ -17,7 +17,7 @@ TAO::SSLIOP::State_Guard::State_Guard (
 }
 
 ACE_INLINE
-TAO::SSLIOP::State_Guard::~State_Guard (void)
+TAO::SSLIOP::State_Guard::~State_Guard ()
 {
   this->handler_->teardown_ssl_state (this->previous_current_impl_,
                                       this->setup_done_);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 458198a14c7..50a2d07f3fd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -257,7 +257,6 @@ TAO::SSLIOP::Connector::make_secure_profile ()
 }
 
 
-
 TAO_Profile *
 TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len)
 {
@@ -513,13 +512,11 @@ 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")));
-
             }
         }
     }
   else
     {
-
       bool make_new_connection =
         (found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) ||
         (found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY
@@ -527,7 +524,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
 
       if (make_new_connection)
         {
-
           if (TAO_debug_level > 4)
             ORBSVCS_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ")
@@ -764,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_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index c553948bbfb..89c05b99db5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -63,7 +63,7 @@ namespace TAO
        */
       //@{
       virtual int open (TAO_ORB_Core *orb_core);
-      virtual int close (void);
+      virtual int close ();
       virtual TAO_Transport *connect (TAO::Profile_Transport_Resolver *r,
                                       TAO_Transport_Descriptor_Interface *desc,
                                       ACE_Time_Value *timeout);
@@ -82,12 +82,12 @@ namespace TAO
        * @see @c TAO_Connector
        */
       //@{
-      virtual TAO_Profile * make_profile (void);
+      virtual TAO_Profile * make_profile ();
       virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
       //@}
 
       /// SSL-specific profile
-      TAO_Profile * make_secure_profile (void);
+      TAO_Profile * make_secure_profile ();
 
       /// IIOP-specific connection establishment.
       /**
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index d468ae1ac59..be0e0e189a7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -72,13 +72,13 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * creds_id (void);
+      virtual char * creds_id ();
 
-      virtual SecurityLevel3::CredentialsType creds_type (void) = 0;
+      virtual SecurityLevel3::CredentialsType creds_type () = 0;
 
       virtual SecurityLevel3::CredentialsUsage creds_usage ();
 
-      virtual TimeBase::UtcT expiry_time (void);
+      virtual TimeBase::UtcT expiry_time ();
 
       virtual SecurityLevel3::CredentialsState creds_state ();
 
@@ -95,7 +95,7 @@ namespace TAO
        * @note Caller owns the returned object.  Use a
        *       TAO::SSLIOP::X509_var.
        */
-      ::X509 *x509 (void);
+      ::X509 *x509 ();
       //@}
 
       /// Return a pointer to the underlying private key.
@@ -105,7 +105,7 @@ namespace TAO
        * @note Caller owns the returned object.  Use a
        *       TAO::SSLIOP::EVP_PKEY_var.
        */
-      ::EVP_PKEY *evp (void);
+      ::EVP_PKEY *evp ();
       //@}
 
       bool operator== (const SSLIOP_Credentials &rhs);
@@ -117,7 +117,7 @@ namespace TAO
 
       static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj);
 
-      static SSLIOP::Credentials_ptr _nil (void)
+      static SSLIOP::Credentials_ptr _nil ()
       {
         return (SSLIOP::Credentials_ptr) 0;
       }
@@ -130,7 +130,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting  mechanism.
        */
-      ~SSLIOP_Credentials (void);
+      ~SSLIOP_Credentials ();
 
     protected:
       /// Reference to the X.509 certificate associated with this SSLIOP
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
index df5f0ced92c..46b74d1b0d5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
@@ -2,14 +2,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ::X509 *
-TAO::SSLIOP_Credentials::x509 (void)
+TAO::SSLIOP_Credentials::x509 ()
 {
   return
     TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (this->x509_.in ());
 }
 
 ACE_INLINE ::EVP_PKEY *
-TAO::SSLIOP_Credentials::evp (void)
+TAO::SSLIOP_Credentials::evp ()
 {
   return
     TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ());
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index c0e216cc120..7187d87a588 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -70,13 +70,13 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * acquisition_method (void);
+      virtual char * acquisition_method ();
 
       virtual SecurityLevel3::AcquisitionStatus current_status ();
 
-      virtual CORBA::ULong nth_iteration (void);
+      virtual CORBA::ULong nth_iteration ();
 
-      virtual CORBA::Any * get_continuation_data (void);
+      virtual CORBA::Any * get_continuation_data ();
 
       virtual SecurityLevel3::AcquisitionStatus continue_acquisition (
           const CORBA::Any & acquisition_arguments);
@@ -84,7 +84,7 @@ namespace TAO
       virtual SecurityLevel3::OwnCredentials_ptr get_credentials (
           CORBA::Boolean on_list);
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
     protected:
@@ -93,12 +93,12 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~CredentialsAcquirer (void);
+      ~CredentialsAcquirer ();
 
     private:
       /// Verify that this CredentialsAcquirer object is still valid,
       /// i.e. hasn't been destroyed.
-      void check_validity (void);
+      void check_validity ();
 
       /// Create an OpenSSL X.509 certificate data structure.
       static ::X509 * make_X509 (const ::SSLIOP::File &certificate);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index dc39617d0f5..1a4fa1cdaa0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -86,7 +86,7 @@ namespace TAO
        * @return @c true if the current execution context is not
        *         within a SSL session.
        */
-      virtual CORBA::Boolean no_context (void);
+      virtual CORBA::Boolean no_context ();
 
       /// Set the TSS slot ID assigned to this object.
       void tss_slot (size_t slot);
@@ -111,7 +111,7 @@ namespace TAO
 
       static Current_ptr _narrow (CORBA::Object_ptr obj);
 
-      static Current_ptr _nil (void)
+      static Current_ptr _nil ()
       {
         return (Current_ptr)0;
       }
@@ -121,13 +121,13 @@ namespace TAO
 
     protected:
       /// Destructor
-      ~Current (void);
+      ~Current ();
 
       /// Set the TSS SSLIOP::Current implementation.
       int implementation (Current_Impl *impl);
 
       /// Return the TSS SSLIOP::Current implementation.
-      Current_Impl *implementation (void);
+      Current_Impl *implementation ();
 
     private:
       Current (const Current &) = delete;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
index 870554d3e0d..b721a43215d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
@@ -17,7 +17,7 @@ TAO::SSLIOP::Current::implementation (TAO::SSLIOP::Current_Impl *impl)
 }
 
 ACE_INLINE TAO::SSLIOP::Current_Impl *
-TAO::SSLIOP::Current::implementation (void)
+TAO::SSLIOP::Current::implementation ()
 {
   if (this->orb_core_ == 0)
     return 0;
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_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index ac09e5b1cab..bb1747d0efd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -293,7 +293,6 @@ TAO_SSLIOP_Endpoint::set_sec_attrs (::Security::QOP q,
 
 
 
-
 TAO_SSLIOP_Synthetic_Endpoint::~TAO_SSLIOP_Synthetic_Endpoint ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index b82328f752e..22940d963c9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -58,7 +58,7 @@ namespace TAO
                 TAO_IIOP_Endpoint *iiop_endp);
 
       /// Destructor.
-      virtual ~TAO_SSLIOP_Endpoint (void);
+      virtual ~TAO_SSLIOP_Endpoint ();
 
       /// Need to have an assignment operator since the SSLIOP_Profile class
       /// may have to reorder its list of endpoints based on filtering by
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
index bdcb30639af..7dcc6aee327 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
@@ -35,7 +35,7 @@ TAO_SSLIOP_Endpoint::iiop_endpoint (TAO_IIOP_Endpoint *iiop_endpoint,
 }
 
 ACE_INLINE const ::SSLIOP::SSL &
-TAO_SSLIOP_Endpoint::ssl_component (void)const
+TAO_SSLIOP_Endpoint::ssl_component () const
 {
   return this->ssl_component_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 13a3d95679a..4d6ccfd6e50 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -718,7 +718,6 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[])
     {
       if (ssl_ctx->private_key (private_key_path.in(), private_key_type) != 0)
         {
-
           ORBSVCS_ERROR ((LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) - Unable to set ")
                           ACE_TEXT ("SSL private key ")
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index aa19cfd95f4..ba514b4ccc7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -40,7 +40,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-
     /**
      * @class Protocol_Factory
      *
@@ -53,12 +52,11 @@ namespace TAO
       : public TAO_Protocol_Factory
     {
     public:
-
       /// Constructor.
-      Protocol_Factory (void);
+      Protocol_Factory ();
 
       /// Destructor.
-      virtual ~Protocol_Factory (void);
+      virtual ~Protocol_Factory ();
 
       // = Service Configurator hooks.
       /// Dynamic linking hook
@@ -75,12 +73,11 @@ namespace TAO
       virtual char options_delimiter () const;
 
       // = Check Protocol_Factory.h for a description of these methods.
-      virtual TAO_Acceptor  * make_acceptor (void);
-      virtual TAO_Connector * make_connector  (void);
+      virtual TAO_Acceptor  * make_acceptor ();
+      virtual TAO_Connector * make_connector  ();
       virtual int requires_explicit_endpoint () const;
 
     private:
-
       /// Parse an X509 file path, which is expected to looks like:
       ///   <X509Path> ::= <Prefix> ':' <Path>
       ///   <Prefix>   ::= 'PEM' | 'ASN1'
@@ -103,7 +100,7 @@ namespace TAO
       static ACE_CString pem_passwd_;
 
       /// Create and register the SSLIOP ORB initializer.
-      int register_orb_initializer (void);
+      int register_orb_initializer ();
 
       /// Default quality-of-protection settings for the SSLIOP
       /// pluggable protocol.
@@ -118,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_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 12617d2179c..317b38cba03 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -78,9 +78,9 @@ namespace TAO
        * PortableInterceptor::ServerRequestInterceptor interface.
        */
       //@{
-      virtual char * name (void);
+      virtual char * name ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
 
       virtual void receive_request_service_contexts (
           PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -104,7 +104,7 @@ namespace TAO
        * Protected destructor to force deallocation by the reference
        * counting mechanism.
        */
-      ~Server_Invocation_Interceptor (void);
+      ~Server_Invocation_Interceptor ();
 
     private:
       /**
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
index 24dbbc2d4eb..11ea42ad9f8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -69,21 +69,20 @@ namespace TAO
     class OpenSSL_st_var
     {
     public:
-
       /**
        * @name Constructors
        *
        * Constructors.
        */
       //@{
-      OpenSSL_st_var (void);
+      OpenSSL_st_var ();
       OpenSSL_st_var (T * st);
       OpenSSL_st_var (OpenSSL_st_var<T> const & v);
       OpenSSL_st_var (T const & st);
       //@}
 
       /// Destructor
-      ~OpenSSL_st_var (void);
+      ~OpenSSL_st_var ();
 
       /**
        * @name Assignment operators.
@@ -97,22 +96,20 @@ namespace TAO
       //@}
 
       T const * operator-> () const;
-      T* operator-> (void);
+      T* operator-> ();
 
       operator const T& () const;
       operator T& ();
 
       T*  in () const;
-      T*& inout (void);
-      T*& out (void);
-      T*  _retn (void);
+      T*& inout ();
+      T*& out ();
+      T*  _retn ();
       T*  ptr () const;
 
     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_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
index 06691af5980..c1507de8ef3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
@@ -38,7 +38,7 @@ TAO::SSLIOP::release (T * st)
 // -------------------------------------------------------------------
 
 template <typename T> ACE_INLINE
-TAO::SSLIOP::OpenSSL_st_var<T>::OpenSSL_st_var (void)
+TAO::SSLIOP::OpenSSL_st_var<T>::OpenSSL_st_var ()
   : st_ (0)
 {
 }
@@ -63,7 +63,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::OpenSSL_st_var (T const & st)
 }
 
 template <typename T> ACE_INLINE
-TAO::SSLIOP::OpenSSL_st_var<T>::~OpenSSL_st_var (void)
+TAO::SSLIOP::OpenSSL_st_var<T>::~OpenSSL_st_var ()
 {
   TAO::SSLIOP::OpenSSL_traits<T>::release (this->st_);
   //  TAO::SSLIOP::release (this->st_);
@@ -109,7 +109,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::operator-> () const
 }
 
 template <typename T> ACE_INLINE T *
-TAO::SSLIOP::OpenSSL_st_var<T>::operator-> (void)
+TAO::SSLIOP::OpenSSL_st_var<T>::operator-> ()
 {
   return this->st_;
 }
@@ -133,13 +133,13 @@ TAO::SSLIOP::OpenSSL_st_var<T>::in () const
 }
 
 template <typename T> ACE_INLINE T *&
-TAO::SSLIOP::OpenSSL_st_var<T>::inout (void)
+TAO::SSLIOP::OpenSSL_st_var<T>::inout ()
 {
   return this->st_;
 }
 
 template <typename T> ACE_INLINE T *&
-TAO::SSLIOP::OpenSSL_st_var<T>::out (void)
+TAO::SSLIOP::OpenSSL_st_var<T>::out ()
 {
   TAO::SSLIOP::OpenSSL_traits<T>::release (this->st_);
   this->st_ = 0;
@@ -147,7 +147,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::out (void)
 }
 
 template <typename T> ACE_INLINE T *
-TAO::SSLIOP::OpenSSL_st_var<T>::_retn (void)
+TAO::SSLIOP::OpenSSL_st_var<T>::_retn ()
 {
   // Yield ownership of the OpenSSL structure.
   T * st = this->st_;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index be7540ea0a6..35b27ccfeb3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -31,7 +31,6 @@ TAO::SSLIOP::OwnCredentials_ptr
 TAO::SSLIOP::OwnCredentials::_nil ()
 {
   return (OwnCredentials *) 0;
-
 }
 
 SecurityLevel3::CredentialsType
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 4b180f5f005..866a332d8fd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -60,7 +60,7 @@ namespace TAO
       OwnCredentials (::X509 *cert, ::EVP_PKEY *evp);
 
       static OwnCredentials_ptr _duplicate (OwnCredentials_ptr obj);
-      static OwnCredentials_ptr _nil (void);
+      static OwnCredentials_ptr _nil ();
       static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
@@ -70,7 +70,7 @@ namespace TAO
        * interface.
        */
       //@{
-      SecurityLevel3::CredentialsType creds_type (void);
+      SecurityLevel3::CredentialsType creds_type ();
       //@}
 
       /**
@@ -84,7 +84,7 @@ namespace TAO
 
       virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor ();
 
-      virtual void release_credentials (void);
+      virtual void release_credentials ();
       //@}
 
     protected:
@@ -93,7 +93,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~OwnCredentials (void);
+      ~OwnCredentials ();
     };
   } // End SSLIOP namespace
 }  // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 92e01b78220..87fcf32105d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // {
 //   namespace SSLIOP
 //   {
-
     /**
      * @class Profile
      *
@@ -75,8 +74,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
       // = Please see Profile.h for the documentation of these methods.
       virtual int decode (TAO_InputCDR& cdr);
-      virtual int encode_endpoints (void);
-      virtual TAO_Endpoint *endpoint (void);
+      virtual int encode_endpoints ();
+      virtual TAO_Endpoint *endpoint ();
 
       /**
        * Override parse_string() from the base class to update the SSL
@@ -110,7 +109,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~TAO_SSLIOP_Profile (void);
+      ~TAO_SSLIOP_Profile ();
 
       /// Profile equivalence template method.
       /**
@@ -130,7 +129,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        *       but sadly others pay the price (of footprint) under
        *       normal operations.
        */
-      int decode_tagged_endpoints (void);
+      int decode_tagged_endpoints ();
 
       /**
        * Head of this profile's list of endpoints.  This endpoint is
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_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index b67de885b0c..83bddb92835 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -60,7 +60,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (void);
+      virtual char * context_id ();
 
       virtual SecurityLevel3::Principal * client_principal ();
 
@@ -76,19 +76,19 @@ namespace TAO
 
       virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ();
 
-      virtual CORBA::Boolean client_authentication (void);
+      virtual CORBA::Boolean client_authentication ();
 
-      virtual CORBA::Boolean target_authentication (void);
+      virtual CORBA::Boolean target_authentication ();
 
-      virtual CORBA::Boolean confidentiality (void);
+      virtual CORBA::Boolean confidentiality ();
 
-      virtual CORBA::Boolean integrity (void);
+      virtual CORBA::Boolean integrity ();
 
-      virtual CORBA::Boolean target_embodied (void);
+      virtual CORBA::Boolean target_embodied ();
 
-      virtual CORBA::Boolean target_endorsed (void);
+      virtual CORBA::Boolean target_endorsed ();
 
-      virtual void release (void);
+      virtual void release ();
       //@}
     };
   }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index e9df6979bb0..966da1897ca 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -188,7 +188,6 @@ TAO::SSLIOP::Transport::tear_listen_point_list (TAO_InputCDR &cdr)
 }
 
 
-
 void
 TAO::SSLIOP::Transport::set_bidir_context_info (
   TAO_Operation_Details &opdetails)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 05fd173c5cd..a5e2d041101 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -63,7 +63,7 @@ namespace TAO
                  TAO_ORB_Core *orb_core);
 
       /// Default destructor.
-      ~Transport (void);
+      ~Transport ();
 
       /// Overload of the handle_input () in the TAO_Transport
       /// class. This is required to set up the state guard. The
@@ -79,8 +79,8 @@ namespace TAO
        * TAO_Transport.
        */
       //@{
-      virtual ACE_Event_Handler * event_handler_i (void);
-      virtual TAO_Connection_Handler *connection_handler_i (void);
+      virtual ACE_Event_Handler * event_handler_i ();
+      virtual TAO_Connection_Handler *connection_handler_i ();
 
       /// Write the complete Message_Block chain to the connection.
       virtual ssize_t send (iovec *iov, int iovcnt,
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/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index f80cd66be75..debf6832652 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -8,7 +8,6 @@
 #include "orbsvcs/Sched/Config_Scheduler.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Config_Scheduler::ACE_Config_Scheduler ()
@@ -161,7 +160,6 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority)
 {
-
   if (impl->priority (handle, priority, p_subpriority, p_priority) == -1)
     {
       ORBSVCS_ERROR ((LM_ERROR,
@@ -185,7 +183,6 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::Dependency_Type_t
                                              dependency_type)
 {
-
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->lookup_rt_info (handle, rt_info))
     {
@@ -220,7 +217,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::Config_Info_Set_out configs,
                                                RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
 {
-
   // Initialize the scheduler implementation.
   impl->init (minimum_priority, maximum_priority);
 
@@ -425,7 +421,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
                                                    RtecScheduler::OS_Priority& priority,
                                                    RtecScheduler::Dispatching_Type_t & d_type)
 {
-
   if (impl->dispatch_configuration (p_priority, priority, d_type) == -1)
     {
       ORBSVCS_ERROR ((LM_ERROR,
@@ -440,7 +435,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 RtecScheduler::Preemption_Priority_t
 ACE_Config_Scheduler::last_scheduled_priority ()
 {
-
   RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue ();
 
   if (priority < 0)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 38aab1e781d..4caa6059e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -33,9 +33,8 @@ class TAO_RTSched_Export ACE_Config_Scheduler
   //   distributed with the EC.
 {
 public:
-
-  ACE_Config_Scheduler (void);
-  virtual ~ACE_Config_Scheduler (void);
+  ACE_Config_Scheduler ();
+  virtual ~ACE_Config_Scheduler ();
 
   virtual RtecScheduler::handle_t create (const char * entry_point);
 
@@ -82,7 +81,7 @@ public:
   // provide the thread priority and queue type for the given priority level
 
   virtual RtecScheduler::Preemption_Priority_t
-      last_scheduled_priority (void);
+      last_scheduled_priority ();
   // Returns the last priority number assigned to an operation in the
   // schedule.
   // The number returned is one less than the total number of
@@ -161,7 +160,6 @@ public:
 
 
 private:
-
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
 
   // trait for the scheduler implementation base class
@@ -210,7 +208,6 @@ private:
 
   // implementation base class pointer
   BaseSchedImplType* impl;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index f1844bed135..a7b0e2bf5f0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -19,7 +19,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //////////////////////
@@ -308,7 +307,6 @@ ACE_DynScheduler::register_task (RT_Info *rt_info, handle_t &handle)
   // = registers a task.
 
 
-
 ACE_DynScheduler::status_t
 ACE_DynScheduler::get_rt_info (Object_Name name,
                                RT_Info* &rtinfo)
@@ -357,7 +355,6 @@ ACE_DynScheduler::get_rt_info (Object_Name name,
 
 
 
-
 int ACE_DynScheduler::priority (
   const RtecScheduler::handle_t handle,
   RtecScheduler::OS_Priority &priority,
@@ -487,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);
 
-
 }
 
 
@@ -1286,7 +1281,6 @@ ACE_DynScheduler::calculate_utilization_params ()
 }
 
 
-
 void
 ACE_DynScheduler::update_priority_level_params ()
 {
@@ -1412,7 +1406,6 @@ ACE_DynScheduler::relate_task_entries ()
 ACE_DynScheduler::status_t
 ACE_DynScheduler::relate_task_entries_recurse (long &time, Task_Entry &entry)
 {
-
   // may have entered at a non-root node previously, so this does
   //  not necessarily indicate a cycle in the dependency graph
         if (entry.dfs_status () != Task_Entry::NOT_VISITED)
@@ -1827,7 +1820,6 @@ ACE_DynScheduler::create_timeline ()
     Dispatch_Entry *rescheduled_entry;
     while (reschedule_queue.is_empty () == 0)
     {
-
       if (reschedule_queue.dequeue_head (rescheduled_entry) < 0)
       {
         status = ST_BAD_INTERNAL_POINTER;
@@ -1916,7 +1908,6 @@ ACE_DynScheduler::create_timeline ()
   // Create a timeline.
 
 
-
 ACE_DynScheduler::status_t
 ACE_DynScheduler::output_dispatch_priorities (const char *filename)
 {
@@ -1944,7 +1935,6 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename)
 ACE_DynScheduler::status_t
 ACE_DynScheduler::output_dispatch_priorities (FILE *file)
 {
-
   u_long dispatch_count = 0;
   u_long i = 0;
   for (i = 0; i < dispatch_entry_count_; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index d5b383829f8..665fdfbb5ce 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -41,7 +41,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTSched_Export ACE_DynScheduler
 {
 public:
-
   //////////////////////////////
   // public type declarations //
   //////////////////////////////
@@ -107,7 +106,6 @@ public:
   };
 
 
-
   /////////////////////////////
   // public member functions //
   /////////////////////////////
@@ -264,7 +262,6 @@ public:
                                       Dispatching_Type & d_type);
 
 protected:
-
   ////////////////////////////////
   // protected member functions //
   ////////////////////////////////
@@ -282,7 +279,7 @@ protected:
     ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set);
 
   /// = store assigned information back into the RT_Infos
-  virtual status_t store_assigned_info (void);
+  virtual status_t store_assigned_info ();
 
   // = Set the minimum priority value.
   void minimum_priority_queue (const Preemption_Priority minimum_priority_queue_number);
@@ -380,7 +377,6 @@ protected:
   ACE_Ordered_MultiSet <TimeLine_Entry_Link> *timeline_;
 
 private:
-
   ///////////////////////////////
   // private type declarations //
   ///////////////////////////////
@@ -424,11 +420,11 @@ private:
   status_t output_dispatch_priorities (FILE *file);
 
   // = Set up the task entry data structures
-  status_t setup_task_entries (void);
+  status_t setup_task_entries ();
 
   // = Relate the task entries according to the
   //   dependencies of the underlying RT_Infos
-  status_t relate_task_entries (void);
+  status_t relate_task_entries ();
 
   // recursively traverse dependency graph, relating
   // task entries and performing DFS start/end marking
@@ -440,13 +436,13 @@ private:
                       ACE_CString & unresolved_remotes);
 
   // checks for cycles in the dependency graph
-  status_t check_dependency_cycles (void);
+  status_t check_dependency_cycles ();
 
   // recursion used to check for cycles in the dependency graph
   status_t check_dependency_cycles_recurse (Task_Entry &entry);
 
   // = Aggregate the scheduling parameters of the threads
-  status_t aggregate_thread_parameters (void);
+  status_t aggregate_thread_parameters ();
 
   // = recursion over oneway dependencies used to aggregate thread parameters
   status_t aggregate_oneways_recurse (Task_Entry &entry);
@@ -538,7 +534,6 @@ private:
   u_long min_dispatch_id_;
 
   u_long max_dispatch_id_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index b50d9381218..09c2cb01284 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -19,7 +19,6 @@
 
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ///////////////////////////
@@ -168,7 +167,6 @@ TAO_RT_Info_Ex::enabled_state ()
 }
 
 
-
 //////////////////////////////
 // struct TAO_RT_Info_Tuple //
 //////////////////////////////
@@ -444,7 +442,6 @@ register_tuples (TAO_RT_Info_Tuple ** tuple_ptr_array,
 
 
 
-
 // Accessor for original RT_Info data.
 
 TAO_RT_Info_Ex &
@@ -582,7 +579,6 @@ fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds)
 }
 
 
-
 // Accessor for DFS traversal status of the node.
 
 TAO_Reconfig_Scheduler_Entry::DFS_Status
@@ -1196,7 +1192,6 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
 }
 
 
-
 // Compares two RT_Info entries by priority alone.  Returns -1 if the
 // first one is higher, 0 if they're the same, and 1 if the second one is higher.
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 8986356c541..68e1021b5bd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -111,7 +111,6 @@ struct TAO_RTSched_Export TAO_RT_Info_Tuple
 class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry
 {
 public:
-
   // Info for DFS traversal, topological sort of call graph.
   enum DFS_Status {NOT_VISITED, VISITED, FINISHED};
 
@@ -140,7 +139,7 @@ public:
                        long &tuple_count);
 
   /// Accessor for stored original RT_Info data.
-  TAO_RT_Info_Ex & orig_rt_info_data (void);
+  TAO_RT_Info_Ex & orig_rt_info_data ();
 
   /// Mutator for stored original RT_Info data.
   void orig_rt_info_data (TAO_RT_Info_Ex &data);
@@ -305,7 +304,6 @@ public:
 */
 
 private:
-
   /**
    * Stores the values of operation characteristics as they were specified
    * in the most recent call to the Reconfig_Scheduler's set () method.
@@ -402,13 +400,11 @@ private:
 class TAO_RTSched_Export TAO_Reconfig_Sched_Entry_Visitor
 {
 public:
-
   /// Destructor.
-  virtual ~TAO_Reconfig_Sched_Entry_Visitor (void);
+  virtual ~TAO_Reconfig_Sched_Entry_Visitor ();
 
   /// Visit a Reconfig Scheduler Entry.
   virtual int visit (TAO_Reconfig_Scheduler_Entry &) = 0;
-
 };
 
 
@@ -422,7 +418,6 @@ class TAO_RTSched_Export TAO_RSE_Reset_Visitor :
   //   prior to the first DFS traversal for topological sorting.
 {
 public:
-
   /// Constructor.
   TAO_RSE_Reset_Visitor ();
 
@@ -446,13 +441,11 @@ public:
 class TAO_RTSched_Export TAO_RT_Info_Tuple_Visitor
 {
 public:
-
   /// Destructor.
-  virtual ~TAO_RT_Info_Tuple_Visitor (void);
+  virtual ~TAO_RT_Info_Tuple_Visitor ();
 
   /// Visit a RT_Info tuple.
   virtual int visit (TAO_RT_Info_Tuple &) = 0;
-
 };
 
 /**
@@ -466,7 +459,6 @@ public:
 class TAO_RTSched_Export TAO_Reconfig_Sched_Strategy_Base
 {
 public:
-
   /// Ordering function to compare the DFS finish times of
   /// two RT_Info_Tuples
   static int comp_tuple_finish_times (const void *first, const void *second);
@@ -509,7 +501,6 @@ class TAO_RTSched_Export TAO_MUF_FAIR_Reconfig_Sched_Strategy
   //   has index 0, the next higher rate has index 1, etc.
 {
 public:
-
   /**
    * Ordering function used to qsort an array of RT_Info_Tuple
    * pointers into a total <priority, subpriority> ordering.  Returns
@@ -566,7 +557,6 @@ class TAO_RTSched_Export TAO_RMS_FAIR_Reconfig_Sched_Strategy
   //   order.
 {
 public:
-
   /**
    * Ordering function used to qsort an array of RT_Info_Tuple
    * pointers into a total <priority, subpriority> ordering.  Returns
@@ -638,7 +628,6 @@ class TAO_RTSched_Export TAO_RMS_MLF_Reconfig_Sched_Strategy
   //   order.
 {
 public:
-
   /**
    * Ordering function used to qsort an array of RT_Info_Tuple
    * pointers into a total <priority, subpriority> ordering.  Returns
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index 61ec21234da..1b234e9f203 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -226,7 +226,6 @@ postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */)
 }
 
 
-
 /////////////////////////
 // TAO_RSE_DFS_Visitor //
 /////////////////////////
@@ -337,7 +336,7 @@ TAO_RSE_SCC_Visitor
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-number_of_cycles (void)
+number_of_cycles ()
 {
   return this->number_of_cycles_;
 }
@@ -348,7 +347,7 @@ number_of_cycles (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-in_a_cycle (void)
+in_a_cycle ()
 {
   return this->in_a_cycle_;
 }
@@ -554,7 +553,7 @@ TAO_RSE_Forward_Propagation_Visitor
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_locals (void)
+unresolved_locals ()
 {
   return this->unresolved_locals_;
 }
@@ -574,7 +573,7 @@ unresolved_locals (int i)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_remotes (void)
+unresolved_remotes ()
 {
   return this->unresolved_remotes_;
 }
@@ -593,7 +592,7 @@ unresolved_remotes (int i)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-thread_specification_errors (void)
+thread_specification_errors ()
 {
   return this->thread_specification_errors_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index 7fcaaa9797a..915645bdb6b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -40,7 +40,6 @@ class TAO_RSE_Dependency_Visitor :
   //   derived classes may call to pass them in.
 {
 public:
-
   /// Type of map used for O(1) lookup of RT_Info
   /// dependency sets by caller or called handle.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
@@ -102,11 +101,9 @@ protected:
 
   /// Map of handles into RT_Infos.
   RT_INFO_MAP & rt_info_map_;
-
 };
 
 
-
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 class TAO_RSE_DFS_Visitor :
   public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
@@ -119,7 +116,6 @@ class TAO_RSE_DFS_Visitor :
   //   as appropriate according to DFS state markers.
 {
 public:
-
   /// Constructor.
   TAO_RSE_DFS_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
@@ -156,7 +152,6 @@ protected:
 private:
   /// Keeps track of DFS start and finish times.
   int DFS_time_;
-
 };
 
 
@@ -172,18 +167,17 @@ class TAO_RSE_SCC_Visitor :
   //   flag cycles in the graph.
 {
 public:
-
   /// Constructor.
   TAO_RSE_SCC_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
 
   /// Accessor for number of cycles detected in traversal.
-  int number_of_cycles (void);
+  int number_of_cycles ();
 
   /// Accessor for whether or not the recursion is within a previously
   /// detected cycle.
-  int in_a_cycle (void);
+  int in_a_cycle ();
 
   /// Mutator for whether or not the recursion is within a previously
   /// detected cycle.
@@ -259,14 +253,12 @@ class TAO_RSE_Reverse_Propagation_Visitor :
   //   and its dependants, according to its dependencies.
 {
 public:
-
   /// Constructor.
   TAO_RSE_Reverse_Propagation_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
 
 protected:
-
   /**
    * Propagates aggregate execution time from successor to calling
    * entry.  Returns 1 on success (to prevent recursion on the
@@ -275,7 +267,6 @@ protected:
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-
 };
 
 
@@ -292,26 +283,25 @@ class TAO_RSE_Forward_Propagation_Visitor :
   //   its dependencies, and the period and threads it specifies.
 {
 public:
-
   /// Constructor.
   TAO_RSE_Forward_Propagation_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
 
   /// Accessor for number of nodes with unresolved local dependencies.
-  int unresolved_locals (void);
+  int unresolved_locals ();
 
   /// Mutator for numberof nodes with unresolved local dependencies.
   void unresolved_locals (int);
 
   /// Accessor for number of nodes with unresolved remote dependencies.
-  int unresolved_remotes (void);
+  int unresolved_remotes ();
 
   /// Mutator for number of nodes with unresolved remote dependencies.
   void unresolved_remotes (int);
 
   /// Accessor for number of nodes with thread specification errors.
-  int thread_specification_errors (void);
+  int thread_specification_errors ();
 
   /// Mutator for number of nodes with thread specification errors.
   void thread_specification_errors (int);
@@ -336,7 +326,6 @@ protected:
                                   const RtecScheduler::Dependency_Info &di);
 
 private:
-
   /// Number of nodes with unresolved local dependencies.
   int unresolved_locals_;
 
@@ -360,7 +349,6 @@ class TAO_RSE_Priority_Visitor :
   //   priority and subpriority boundaries.
 {
 public:
-
   /// Constructor.
   TAO_RSE_Priority_Visitor (RtecScheduler::handle_t handles,
                             TAO_Reconfig_Scheduler_Entry ** entry_ptr_array);
@@ -382,7 +370,6 @@ public:
   int finish ();
 
 private:
-
   /// Pointer to previous tuple in the iteration.
   TAO_Reconfig_Scheduler_Entry *previous_entry_;
 
@@ -421,7 +408,6 @@ class TAO_Tuple_Admission_Visitor :
   //   whether or not a given operation is critical.
 {
 public:
-
   /// Constructor.
   TAO_Tuple_Admission_Visitor (const CORBA::Double & critical_utilization_threshold,
                                const CORBA::Double & noncritical_utilization_threshold);
@@ -453,7 +439,6 @@ public:
   CORBA::Double total_noncritical_utilization ();
 
 private:
-
   /// Utilization by critical operations.
   CORBA::Double critical_utilization_;
 
@@ -486,14 +471,12 @@ class TAO_RSE_Criticality_Propagation_Visitor :
   //   and its dependants, according to its dependencies.
 {
 public:
-
   /// Constructor.
   TAO_RSE_Criticality_Propagation_Visitor
     (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
 
 protected:
-
   /**
    * Propagates criticality from successor to calling
    * entry.  Returns 1 on success (to prevent recursion on the
@@ -502,7 +485,6 @@ protected:
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                                   TAO_Reconfig_Scheduler_Entry &successor,
                                   const RtecScheduler::Dependency_Info &di);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index f5735cdb6ee..fc548a13ac9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -308,7 +308,7 @@ init (int config_count,
 
 // Closes the scheduler, releasing all current resources.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -626,7 +626,6 @@ reset (RtecScheduler::handle_t handle,
 }
 
 
-
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
@@ -1159,7 +1158,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
   // If everything is already up to date, we're done.
   if (SCHED_ALL_STABLE == stability_flags_)
     {
-
       // Must always provide a value for an out parameter
       ACE_NEW_THROW_EX (anomalies,
          RtecScheduler::Scheduling_Anomaly_Set (0),
@@ -1173,7 +1171,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
   if ((this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE)
       || (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE))
     {
-
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
@@ -1437,7 +1434,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::Preemption_Priority_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (void)
+last_scheduled_priority ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -1857,7 +1854,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                    number_of_calls,
                    dependency_type,
                    enabled);
-
 }
 
 
@@ -2176,7 +2172,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
 // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (void)
+dfs_traverse_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2209,12 +2205,11 @@ dfs_traverse_i (void)
 }
 
 
-
 // Sorts an array of RT_info handles in topological order, then
 // checks for loops, marks unresolved remote dependencies.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (void)
+detect_cycles_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2258,7 +2253,7 @@ detect_cycles_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-perform_admission_i (void)
+perform_admission_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2318,7 +2313,7 @@ perform_admission_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-crit_dfs_traverse_i (void)
+crit_dfs_traverse_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2352,7 +2347,7 @@ crit_dfs_traverse_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_criticalities_i (void)
+propagate_criticalities_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2394,7 +2389,7 @@ propagate_criticalities_i (void)
 // Propagates periods, sets total frame size.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (void)
+propagate_characteristics_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2433,7 +2428,7 @@ propagate_characteristics_i (void)
 // Sets last scheduled priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (void)
+assign_priorities_i ()
 {
   int i;
 #if defined (SCHEDULER_LOGGING)
@@ -2577,7 +2572,7 @@ assign_priorities_i (void)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-refresh_tuple_ptr_array_i (void)
+refresh_tuple_ptr_array_i ()
 {
 #if defined (SCHEDULER_LOGGING)
   ORBSVCS_DEBUG ((LM_TRACE,
@@ -2808,7 +2803,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (void)
+compute_utilization_i ()
 {
   TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY> util_visitor;
   for (int i = 0; i < this->rt_info_count_; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index 96758db6f26..3a8d9fbe6a9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -42,7 +42,6 @@ class TAO_Reconfig_Scheduler :
   //
 {
 public:
-
   /// Type of map used for O(1) lookup of RT_Infos by their handles.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
                                   TAO_RT_Info_Ex *,
@@ -106,7 +105,7 @@ public:
             u_long stability_flags);
 
   /// Closes the scheduler, releasing all current resources.
-  void close (void);
+  void close ();
 
   /**
    * Create an RT_Info.  If it does not exist, a new RT_Info is
@@ -248,7 +247,7 @@ public:
    * of scheduled priorities.  All scheduled priorities range from 0
    * to the number returned, inclusive.
    */
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void);
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority ();
 
   /// Provides the set of Config_Infos associated with the current schedule.
   virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs);
@@ -308,7 +307,6 @@ public:
   void critical_utilization_threshold (const CORBA::Double &);
 
 protected:
-
   // @@ TO DO: use a memento to save and restore scheduler state without
   //           breaking encapsulation, particularly of these flags.
 
@@ -436,15 +434,15 @@ protected:
 
   /// Traverses dependency graph, assigning a topological ordering.
   /// Resets DFS map entries, do DFS traversal, constructs DFS map.
-  virtual void dfs_traverse_i (void);
+  virtual void dfs_traverse_i ();
 
   /// Sorts an array of RT_info handles in topological order, then
   /// checks for loops, marks unresolved remote dependencies.
-  virtual void detect_cycles_i (void);
+  virtual void detect_cycles_i ();
 
   /// Compute aggregate execution times, then performs admission over
   /// rate tuples.
-  void perform_admission_i (void);
+  void perform_admission_i ();
 
 
   /**
@@ -452,29 +450,29 @@ protected:
    * ordering.  Resets DFS map entries, do DFS traversal, constructs
    * DFS map.
    */
-  void crit_dfs_traverse_i (void);
+  void crit_dfs_traverse_i ();
 
 
   /// Propagates criticalities.
-  void propagate_criticalities_i (void);
+  void propagate_criticalities_i ();
 
 
   /// Propagates effective execution time and period, sets total frame size.
-  void propagate_characteristics_i (void);
+  void propagate_characteristics_i ();
 
   /**
    * Sort operations by urgency (done by strategy), then assign
    * priorities and subpriorities in one pass.  (Re)computes utilization
    * and sets last scheduled priority and last feasible priority.
    */
-  virtual void assign_priorities_i (void);
+  virtual void assign_priorities_i ();
 
   /// Refreshes the array of tuple pointers, corrects the count.
-  void refresh_tuple_ptr_array_i (void);
+  void refresh_tuple_ptr_array_i ();
 
   /// Compute utilization, set last feasible priority.
 /* WSOA merge - commented out
-  virtual void compute_utilization_i (void);
+  virtual void compute_utilization_i ();
 
 
   /// Helper method to give an RT_Info some reasonable default values
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 9cfb8e0b5da..28898481921 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -18,7 +18,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Task_Entry::Task_Entry ()
@@ -211,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/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 0033bc0613a..bb29121d49d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -43,7 +43,6 @@ class Dispatch_Proxy_Iterator;
 class TAO_RTSched_Export Dispatch_Entry_Link
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -71,13 +70,11 @@ public:
   Dispatch_Entry &dispatch_entry () const;
 
 private:
-
     /// Dispatch entry to which the smart pointer refers.
   Dispatch_Entry &dispatch_entry_;
 };
 
 
-
 /**
  * @class Task_Entry
  *
@@ -88,7 +85,6 @@ private:
 class TAO_RTSched_Export Task_Entry
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -188,7 +184,6 @@ public:
   u_long effective_execution_time () const;
 
 private:
-
   // Prohibits calls of the given type: currently used to enforce
   // the notion that two-way calls to disjunctive or conjunctive
   // RT_Infos do not have any defined meaning, and thus should be
@@ -280,7 +275,6 @@ private:
 
   // Set of links to Task Entries which call this entry.
   ACE_Unbounded_Set <Task_Entry_Link *> callers_;
-
 };
 
 
@@ -288,7 +282,6 @@ private:
 class TAO_RTSched_Export Task_Entry_Link
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -319,7 +312,6 @@ public:
   Task_Entry &called () const;
 
 private:
-
   // the number of calls of the operation
   CORBA::Long number_of_calls_;
 
@@ -344,7 +336,6 @@ private:
 class TAO_RTSched_Export Dispatch_Entry
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -440,7 +431,6 @@ private:
   // stores a pointer to the original dispatch entry if this
   // is a dispatch generated by expanding the original frame
   Dispatch_Entry *original_dispatch_;
-
 };
 
 /**
@@ -458,7 +448,6 @@ private:
 class TAO_RTSched_Export Dispatch_Proxy_Iterator
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -530,7 +519,6 @@ public:
 
 
 private:
-
     /// the number of calls corresponding to each actual dispatch
   u_long number_of_calls_;
 
@@ -551,11 +539,9 @@ private:
 };
 
 
-
 class TAO_RTSched_Export TimeLine_Entry
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -594,7 +580,6 @@ public:
   bool operator < (const TimeLine_Entry&) const;
 
 private:
-
   // the dispatch entry to which the time slice corresponds
   Dispatch_Entry &dispatch_entry_;
 
@@ -607,13 +592,11 @@ private:
   // next and previous priority time slices for this dispatch entry
   TimeLine_Entry *next_;
   TimeLine_Entry *prev_;
-
 };
 
 class TAO_RTSched_Export TimeLine_Entry_Link
 {
 public:
-
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
   typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
@@ -635,10 +618,8 @@ public:
   bool operator < (const TimeLine_Entry_Link&) const;
 
 private:
-
   /// the underlying entry
   TimeLine_Entry &entry_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 456d98d885d..8c5718ea40a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -16,7 +16,6 @@
 #include "ace/Lock_Adapter_T.h"
 
 
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // class Scheduler static members
@@ -229,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/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index cb64989590c..9ffced104f8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -167,7 +167,6 @@ public:
                                        Config_Info* &config_info) = 0;
 
 
-
   // = Computes the schedule.
   /// This actually generates the files.
   virtual status_t
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index eb2db77c5e9..eaa44622deb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -13,7 +13,6 @@
 #include "ace/OS_NS_stdio.h"
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index c1bb16f71c5..74e5d01c316 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -578,7 +578,6 @@ ACE_Strategy_Scheduler::schedule_timeline_entry (
 }
 
 
-
 ////////////////////////////////////////////////////////////////////
 // class template ACE_Strategy_Scheduler_Factory member functions //
 ////////////////////////////////////////////////////////////////////
@@ -600,7 +599,6 @@ ACE_Strategy_Scheduler_Factory<STRATEGY>::create (RtecScheduler::Preemption_Prio
 }
 
 
-
 /////////////////////////////////////////////////////////////////
 // abstract base class ACE_Scheduler_Strategy member functions //
 /////////////////////////////////////////////////////////////////
@@ -697,7 +695,6 @@ ACE_Scheduler_Strategy::minimum_critical_priority ()
 }
 
 
-
 /////////////////////////////////////////////////////////////////////////
 // class ACE_MUF_Scheduler_Strategy static data member initializations //
 /////////////////////////////////////////////////////////////////////////
@@ -857,7 +854,6 @@ ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 
 
 
-
 /////////////////////////////////////////////////////////////////////////
 // class ACE_RMS_Scheduler_Strategy static data member initializations //
 /////////////////////////////////////////////////////////////////////////
@@ -989,7 +985,6 @@ ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 }
 
 
-
 /////////////////////////////////////////////////////////////////////////
 // class ACE_MLF_Scheduler_Strategy static data member initializations //
 /////////////////////////////////////////////////////////////////////////
@@ -1123,7 +1118,6 @@ ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 }
 
 
-
 /////////////////////////////////////////////////////////////////////////
 // class ACE_EDF_Scheduler_Strategy static data member initializations //
 /////////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index e6976130dc9..9f25a876c4a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -37,7 +37,6 @@ class TAO_RTSched_Export ACE_Strategy_Scheduler : public ACE_DynScheduler
 {
 // public interface
 public:
-
     /// = Constructor.
   ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy);
 
@@ -60,7 +59,6 @@ public:
   virtual Preemption_Priority minimum_critical_priority ();
 
 private:
-
     /// = Schedules a dispatch entry into the timeline being created.
   virtual status_t schedule_timeline_entry (Dispatch_Entry &dispatch_entry,
                                             ACE_Unbounded_Queue <Dispatch_Entry *>
@@ -77,7 +75,6 @@ private:
 };
 
 
-
 ////////////////////////////////////////
 // Factory for strategized schedulers //
 ////////////////////////////////////////
@@ -94,7 +91,6 @@ template <class STRATEGY>
 class ACE_Strategy_Scheduler_Factory
 {
 public:
-
     /// = Constructs and returns a scheduler strategized with
     ///   an instance of the the parameterized strategy type.
         static ACE_Strategy_Scheduler * create (RtecScheduler::Preemption_Priority_t minimum_critical_priority);
@@ -117,12 +113,11 @@ public:
 class TAO_RTSched_Export ACE_Scheduler_Strategy
 {
 public:
-
   /// = Constructor.
   ACE_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
   /// Destructor.
-  virtual ~ACE_Scheduler_Strategy (void);
+  virtual ~ACE_Scheduler_Strategy ();
 
     /**
      * = Compares two dispatch entries in strategy specific high to low
@@ -168,7 +163,6 @@ public:
     dispatch_type (const Dispatch_Entry &entry) = 0;
 
 protected:
-
     /**
      * = Compares two dispatch entries using the specific priority, dynamic
      *   subpriority, and static subpriority method definitions provided by
@@ -188,7 +182,6 @@ protected:
 };
 
 
-
 /**
  * @class ACE_MUF_Scheduler_Strategy
  *
@@ -200,7 +193,6 @@ protected:
 class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy
 {
 public:
-
     /// = Constructor.
   ACE_MUF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
@@ -231,7 +223,6 @@ public:
     dispatch_type (const Dispatch_Entry &entry);
 
 protected:
-
     /**
      * = Returns a dynamic subpriority value at the current time for
      *   the given timeline entry: if the operation has
@@ -252,7 +243,6 @@ protected:
     const Dispatch_Entry &second_entry);
 
 private:
-
     // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
 #if defined (ACE_HAS_WINCE)
   static int _cdecl sort_function (void *arg1, void *arg2);
@@ -276,7 +266,6 @@ private:
 class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strategy
 {
 public:
-
     /// = Constructor.
   ACE_RMS_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
@@ -307,7 +296,6 @@ public:
     dispatch_type (const Dispatch_Entry &entry);
 
 protected:
-
     /// = Just returns 0: all operations have
     ///   the same dynamic subpriority value.
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
@@ -320,17 +308,14 @@ protected:
      const Dispatch_Entry &second_entry);
 
 private:
-
     /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
 
     /// = Instance of the strategy.
   static ACE_RMS_Scheduler_Strategy *instance_;
-
 };
 
 
-
 /**
  * @class ACE_MLF_Scheduler_Strategy
  *
@@ -342,7 +327,6 @@ private:
 class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy
 {
 public:
-
     /// = Constructor.
   ACE_MLF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
@@ -366,7 +350,6 @@ public:
     dispatch_type (const Dispatch_Entry &entry);
 
 protected:
-
     /**
      * = Returns a dynamic subpriority value at the current time for
      *   the given timeline entry: if the operation has
@@ -387,13 +370,11 @@ protected:
      const Dispatch_Entry &second_entry);
 
 private:
-
     /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
 
     /// = Instance of the strategy
   static ACE_MLF_Scheduler_Strategy *instance_;
-
 };
 
 
@@ -408,7 +389,6 @@ private:
 class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strategy
 {
 public:
-
     /// = Default constructor.
   ACE_EDF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
@@ -433,7 +413,6 @@ public:
     dispatch_type (const Dispatch_Entry &entry);
 
 protected:
-
     /**
      * = Returns a dynamic subpriority value at the current time for the
      *   given timeline entry: if the operation has non-negative
@@ -455,13 +434,11 @@ protected:
      const Dispatch_Entry &second_entry);
 
 private:
-
     /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
 
     /// = Instance of the strategy.
   static ACE_EDF_Scheduler_Strategy *instance_;
-
 };
 
 
@@ -476,7 +453,6 @@ private:
 class TAO_RTSched_Export ACE_Criticality_Scheduler_Strategy : public ACE_Scheduler_Strategy
 {
 public:
-
     /// = Constructor.
   ACE_Criticality_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
 
@@ -507,7 +483,6 @@ public:
     dispatch_type (const Dispatch_Entry &entry);
 
 protected:
-
     /// = Just returns 0: all operations have
     ///   the same dynamic subpriority value.
     virtual long dynamic_subpriority (Dispatch_Entry &entry,
@@ -520,13 +495,11 @@ protected:
      const Dispatch_Entry &second_entry);
 
 private:
-
     /// = Comparison function to pass to qsort: calls instance ()->sort_comp ().
   static int sort_function (void *arg1, void *arg2);
 
     /// = Instance of the strategy.
   static ACE_Criticality_Scheduler_Strategy *instance_;
-
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 8d1618b975b..c1d0f295880 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -235,7 +235,6 @@ ACE_Scheduler_Factory::server ()
 }
 
 static char header[] =
-"// $Id $\n\n"
 "// This file was automatically generated by the Scheduler_Factory.\n"
 "// Before editing the file please consider generating it again.\n"
 "\n"
@@ -522,7 +521,6 @@ int ACE_Scheduler_Factory::dump_schedule
 
 void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * entry, FILE* file)
 {
-
    if( entry == 0 )
    {
       ACE_OS::fprintf (file, "Entry is NULL");
@@ -597,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,
@@ -631,7 +628,6 @@ void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset,
       }
       else
       {
-
       ACE_OS::fprintf (file,
          subset_tuple_format,
          (*tuple_ptr_ptr)->handle,
@@ -671,14 +667,11 @@ 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);
-
-
    }
 
 
    ACE_OS::fclose (file);
    return 0;
-
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index 53ed18ce61c..0c80a8b9bb6 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -67,7 +67,6 @@ public:
    */
   struct POD_RT_Info
   {
-
     const char *entry_point;
     RtecScheduler::handle_t handle;
     RtecScheduler::Time worst_case_execution_time;
@@ -83,7 +82,6 @@ public:
     RtecScheduler::Preemption_Priority_t preemption_priority;
     CORBA::Long info_type;
     RtecScheduler::RT_Info_Enabled_Type_t enabled;
-
   };
 
 
@@ -159,7 +157,7 @@ public:
    * from main, after resolve_initial_references.
    */
   static int server (RtecScheduler::Scheduler_ptr);
-  static RtecScheduler::Scheduler_ptr server (void);
+  static RtecScheduler::Scheduler_ptr server ();
 
   /**
    * This helper function will dump the schedule returned by a
@@ -202,7 +200,7 @@ public:
    * the factory is uninitialized, or in a config or runtime mode of
    * operation.
    */
-  static Factory_Status status (void);
+  static Factory_Status status ();
 
   // = Access the (OS independent) preemption priority of the calling thread.
   /// Returns (u_int) -1 if the preemption priority hadn't been set.
@@ -244,7 +242,6 @@ public:
   static void rt_info_enable_state_default(RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default);
 
 protected:
-
   /**
    * By default this factory assumes we are runnning a config
    * run. Calling this method disables that.  Since the methods
@@ -253,7 +250,7 @@ protected:
    * code emitted for the run-time scheduler, automagically disabling
    * the config_run() when that code is linked in.
    */
-  static int no_config_run (void);
+  static int no_config_run ();
 
 private:
   static RtecScheduler::Scheduler_ptr server_;
@@ -271,7 +268,6 @@ private:
 
   /// Default rt_info enabled state.  (Boeing Extension)
   static RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
index 374ebb64e8f..505e010e20e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // operation.
 
 ACE_INLINE ACE_Scheduler_Factory::Factory_Status
-ACE_Scheduler_Factory::status (void)
+ACE_Scheduler_Factory::status ()
 {
   return status_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index 8da232ed62b..693e3a9db4d 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -36,7 +36,6 @@
 class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info
 {
 public:
-
   /// Construct a helper class instance from values for
   /// the fields of the IDL struct it wraps.
   ACE_RT_Info (const char* entry_point,
@@ -54,7 +53,6 @@ public:
   /// Add a dependency of one RT_Info upon another.
   int add_dependency(RtecScheduler::handle_t dep,
                      int number_of_calls = 1);
-
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index 547502dfee2..535be94399f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace Security
   {
-
     /**
      * @class EstablishTrustPolicy
      *
@@ -54,7 +53,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       EstablishTrustPolicy (const ::Security::EstablishTrust &trust);
 
@@ -62,34 +60,30 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
       /// Return the "establish trust" value associated with this
       /// policy.
-      virtual ::Security::EstablishTrust trust (void);
+      virtual ::Security::EstablishTrust trust ();
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~EstablishTrustPolicy (void);
+      ~EstablishTrustPolicy ();
 
     private:
-
       /// Quality of protection which can be specified for an object
       /// 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 3f1b5bc7ee8..151c0df9924 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -51,7 +51,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       QOPPolicy (::Security::QOP qop);
 
@@ -59,34 +58,30 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
       /// Return the Quality-of-Protection value associated with this
       /// policy.
-      virtual ::Security::QOP qop (void);
+      virtual ::Security::QOP qop ();
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechansim.
        */
-      ~QOPPolicy (void);
+      ~QOPPolicy ();
 
     private:
-
       /// Quality of protection which can be specified for an object
       /// 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.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index 2f20367d331..ec1cd67695e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -177,7 +177,6 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key,
 
   // For now we just return the default.
   return access_decision;
-
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
index 8aab5b872ca..99fa61fcb67 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
@@ -54,8 +54,8 @@ namespace TAO
     {
     public:
       /*! Constructor */
-      AccessDecision (void);
-      ~AccessDecision (void);
+      AccessDecision ();
+      ~AccessDecision ();
 
       virtual ::CORBA::Boolean access_allowed (
         const ::SecurityLevel2::CredentialsList & cred_list,
@@ -71,10 +71,10 @@ namespace TAO
           const char * operation_name,
           ::CORBA::Boolean collocated_invocation);
 
-      virtual ::CORBA::Boolean default_decision (void);
+      virtual ::CORBA::Boolean default_decision ();
       virtual void default_decision (::CORBA::Boolean d);
 
-      virtual ::CORBA::Boolean default_collocated_decision (void);
+      virtual ::CORBA::Boolean default_collocated_decision ();
       virtual void default_collocated_decision (::CORBA::Boolean d);
 
       virtual void add_object (const char * orbid,
@@ -163,7 +163,6 @@ namespace TAO
       ::CORBA::Boolean access_allowed_i (OBJECT_KEY& key,
                                          const char *operation_name,
                                          CORBA::Boolean collocated = false);
-
     };
 
     /**
@@ -177,7 +176,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       SecurityManager (/* not sure what's needed yet */);
 
@@ -200,16 +198,14 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      virtual ~SecurityManager (void);
+      virtual ~SecurityManager ();
 
     private:
-
       /// The ORB-specific SecurityLevel2::PrincipalAuthenticator
       /// reference.
       // Except we're not going to have one of these right now
@@ -218,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 264096a34e5..38512da9fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -46,7 +46,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       ContextEstablishmentPolicy (
         SecurityLevel3::CredsDirective             creds_directive,
@@ -75,33 +74,29 @@ namespace TAO
 
       virtual SecurityLevel3::FeatureDirective use_integrity ();
 
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~ContextEstablishmentPolicy (void);
+      ~ContextEstablishmentPolicy ();
 
     private:
-
       SecurityLevel3::CredsDirective     creds_directive_;
       SecurityLevel3::OwnCredentialsList creds_list_;
       SecurityLevel3::FeatureDirective   use_client_auth_;
       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 3b37c920a29..7a43e265113 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace SL3
   {
-
     /**
      * @class CredentialsAcquirerFactory
      *
@@ -43,17 +42,14 @@ namespace TAO
     class TAO_Security_Export CredentialsAcquirerFactory
     {
     public:
-
       /// Destructor.
-      virtual ~CredentialsAcquirerFactory (void);
+      virtual ~CredentialsAcquirerFactory ();
 
       /// Create a TAO::SL3::CredentialsAcquirerFactory.
       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_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index a1f9556ebb6..001dd340523 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -111,7 +111,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
     }
 
   throw CORBA::BAD_PARAM ();
-
 }
 
 SecurityLevel3::OwnCredentialsList *
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 2238cb76330..6b0e0806ef6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -81,10 +81,10 @@ namespace TAO
       typedef Credentials_Table::iterator Credentials_Iterator;
 
       /// Constructor
-      CredentialsCurator (void);
+      CredentialsCurator ();
 
       static CredentialsCurator_ptr _duplicate (CredentialsCurator_ptr obj);
-      static CredentialsCurator_ptr _nil (void);
+      static CredentialsCurator_ptr _nil ();
       static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
@@ -125,16 +125,14 @@ namespace TAO
         SecurityLevel3::OwnCredentials_ptr credentials);
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~CredentialsCurator (void);
+      ~CredentialsCurator ();
 
     private:
-
       /// Lock used to synchronize access to underlying tables.
       TAO_SYNCH_MUTEX lock_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index 315e25f6ac1..54ac5630e5d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -51,7 +51,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       ObjectCredentialsPolicy (
         const SecurityLevel3::OwnCredentialsList & creds);
@@ -65,29 +64,25 @@ namespace TAO
       //@{
       virtual SecurityLevel3::OwnCredentialsList * creds_list ();
 
-      virtual CORBA::PolicyType policy_type (void);
+      virtual CORBA::PolicyType policy_type ();
 
-      virtual CORBA::Policy_ptr copy (void);
+      virtual CORBA::Policy_ptr copy ();
 
-      virtual void destroy (void);
+      virtual void destroy ();
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~ObjectCredentialsPolicy (void);
+      ~ObjectCredentialsPolicy ();
 
     private:
-
       /// 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 62dccfbe615..f8930836857 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -33,7 +33,6 @@ namespace TAO
 {
   namespace SL3
     {
-
       /**
        * @class olicyFactory
        *
@@ -46,7 +45,6 @@ namespace TAO
           public virtual ::CORBA::LocalObject
       {
       public:
-
         /**
          * @name Methods Required by the PolicyFactory Interface
          *
@@ -56,7 +54,6 @@ namespace TAO
          * sub-classes.
          */
         //@{
-
         /// Construct a Test::Policy object as a test.
         virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                                  const CORBA::Any & value);
@@ -64,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 4d7d76cb14b..b88602c2f30 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -56,7 +56,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       SecurityCurrent (size_t tss_slot, TAO_ORB_Core * oc);
 
@@ -69,7 +68,7 @@ namespace TAO
       //@{
       virtual SecurityLevel3::ClientCredentials_ptr client_credentials ();
 
-      virtual CORBA::Boolean request_is_local (void);
+      virtual CORBA::Boolean request_is_local ();
       //@}
 
       /// Return the TSS slot ID assigned to the "SecurityCurrent"
@@ -81,16 +80,14 @@ namespace TAO
       size_t tss_slot () const;
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~SecurityCurrent (void);
+      ~SecurityCurrent ();
 
     private:
-
       /// Set the thread-specific storage
       /// SecurityLevel3::SecurityCurrent implementation.
       /**
@@ -103,10 +100,9 @@ namespace TAO
        * There is no function that places the implementation pointer
        * in TSS.  The underlying security mechanism does that.
        */
-      SecurityCurrent_Impl * implementation (void);
+      SecurityCurrent_Impl * implementation ();
 
     private:
-
       /**
        * @name Retricted Copying and Assignment
        *
@@ -119,16 +115,13 @@ namespace TAO
       //@}
 
     private:
-
       /// Thread-specific storage slot assigned to this object.
       const size_t tss_slot_;
 
       /// Pointer to the ORB Core corresponding to the ORB with which
       /// 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.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
index a0f7eac384d..be13aa17e98 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
@@ -11,7 +11,7 @@ TAO::SL3::SecurityCurrent::tss_slot () const
 }
 
 ACE_INLINE TAO::SL3::SecurityCurrent_Impl *
-TAO::SL3::SecurityCurrent::implementation (void)
+TAO::SL3::SecurityCurrent::implementation ()
 {
   TAO::SL3::SecurityCurrent_Impl *impl =
     static_cast<TAO::SL3::SecurityCurrent_Impl *> (
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index a8427985509..101cc200fca 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -46,7 +46,7 @@ namespace TAO
     {
     public:
       /// Destructor.
-      virtual ~SecurityCurrent_Impl (void);
+      virtual ~SecurityCurrent_Impl ();
 
       /**
        * @name SecurityLevel3::Current Methods
@@ -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 29be6b8bf09..6954f63476a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -46,7 +46,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       SecurityManager (SecurityLevel3::CredentialsCurator_ptr cc);
 
@@ -77,22 +76,18 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      virtual ~SecurityManager (void);
+      virtual ~SecurityManager ();
 
     private:
-
       /// The ORB-specific SecurityLevel3::CredentialsCurator
       /// reference.
       SecurityLevel3::CredentialsCurator_var credentials_curator_;
-
     };
-
   } // End SL3 namespace
 }  // End TAO namespace
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index a247302d9f0..7feb54267cd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -85,11 +85,11 @@ public:
 protected:
   /// Destructor
   /// Protected to force allocation on the heap.
-  ~TAO_Security_Current (void);
+  ~TAO_Security_Current ();
 
   /// Fully initialize this object.  This method is used predominantly
   /// to set the ORB core pointer.
-  int init (void);
+  int init ();
 
   /// Set the TSS Security::Current implementation.
   /**
@@ -101,7 +101,7 @@ protected:
    * There is no function that places the implementation pointer in
    * TSS.  The underlying security mechanism does that.
    */
-  TAO::Security::Current_Impl *implementation (void);
+  TAO::Security::Current_Impl *implementation ();
 
 private:
   TAO_Security_Current (const TAO_Security_Current &) = delete;
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
index a799af3e796..d21fe9a72c1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
@@ -8,7 +8,7 @@ TAO_Security_Current::tss_slot () const
 }
 
 ACE_INLINE TAO::Security::Current_Impl *
-TAO_Security_Current::implementation (void)
+TAO_Security_Current::implementation ()
 {
   if (this->orb_core_ == 0 && this->init () != 0)
     return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index fad2ea9eeb6..b71ac970fd8 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -44,9 +44,8 @@ namespace TAO
     class TAO_Security_Export Current_Impl
     {
     public:
-
       /// Destructor.
-      virtual ~Current_Impl (void);
+      virtual ~Current_Impl ();
 
       /**
        * @name SecurityLevel1::Current Methods
@@ -76,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 9dd11a96518..acea74c9755 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -36,7 +36,6 @@ namespace TAO
 {
   namespace Security
   {
-
     /**
      * @class PolicyFactory
      *
@@ -49,11 +48,9 @@ namespace TAO
         public ::CORBA::LocalObject
     {
     public:
-
       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/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
index 6f8d682a822..3293c437178 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
@@ -30,8 +30,8 @@ public:
   virtual void operator() (int which_signal) = 0;
 
 protected:
-  Shutdown_Functor (void) {}
-  virtual ~Shutdown_Functor (void) {}
+  Shutdown_Functor () {}
+  virtual ~Shutdown_Functor () {}
 };
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
index ae944d6d818..00f2a9883c1 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_CosProperty_Serv
 Description: TAO CosProperty Service Library
-Requires: TAO_PortableServer_Skel
+Requires: TAO_CosProperty_Skel
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosProperty_Serv
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index aeb74e75716..85761774632 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -109,7 +109,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
         }
       else if (up2 < lb1)
         {
-
           ACE_NEW_RETURN (tio,
                           TAO_TIO (0, 0),
                           CosTime::OTNoOverlap);
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index 2bfb6946e00..1fda2481d34 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -39,7 +39,7 @@ public:
            TimeBase::TimeT upper);
 
   /// Destructor.
-  ~TAO_TIO (void);
+  ~TAO_TIO ();
 
   /// This is the get method for the attribute time interval.
   virtual TimeBase::IntervalT  time_interval ();
@@ -70,7 +70,7 @@ public:
    * time interval in the TIO and time value is the midpoint of the
    * interval.
    */
-  virtual CosTime::UTO_ptr time (void);
+  virtual CosTime::UTO_ptr time ();
 
 private:
   /// This attribute returns an IntervalT structure with the values of
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 2a7f45e1a0f..0f564a41b61 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -49,11 +49,11 @@ public:
                           const IORS& server);
 
   /// Destructor.
-  ~TAO_Time_Service_Clerk (void);
+  ~TAO_Time_Service_Clerk ();
 
   /// This operation returns the global time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (void);
+  virtual CosTime::UTO_ptr universal_time ();
 
   /**
    * This operation returns the global time in a UTO only if the time
@@ -61,7 +61,7 @@ public:
    * operation is not implemented and throws a CORBA::NO_IMPLEMENT
    * exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (void);
+  virtual CosTime::UTO_ptr secure_universal_time ();
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
@@ -76,16 +76,16 @@ public:
                                          TimeBase::TimeT upper);
 
   /// Return the globally synchronized time.
-  virtual CORBA::ULongLong get_time (void);
+  virtual CORBA::ULongLong get_time ();
 
   /// Returns the time displacement factor.
-  CORBA::Short time_displacement_factor (void);
+  CORBA::Short time_displacement_factor ();
 
   /// Set the TDF.
   void time_displacement_factor (CORBA::Short);
 
   /// Get method for inaccuracy.
-  TimeBase::InaccuracyT inaccuracy (void);
+  TimeBase::InaccuracyT inaccuracy ();
 
   /// Set method for inaccuracy.
   void inaccuracy (TimeBase::InaccuracyT inaccuracy);
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 2a7b5a0fc05..b18940177c8 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -36,21 +36,21 @@ class TAO_Time_Serv_Export TAO_Time_Service_Server : public POA_CosTime::TimeSer
 {
 public:
   /// Constructor.
-  TAO_Time_Service_Server (void);
+  TAO_Time_Service_Server ();
 
   /// Destructor.
-  ~TAO_Time_Service_Server (void);
+  ~TAO_Time_Service_Server ();
 
   /// This operation returns the current system time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (void);
+  virtual CosTime::UTO_ptr universal_time ();
 
   /**
    * This operation returns the current time in a UTO only if the time
    * can be guaranteed to have been obtained securely. Currently this operation
    * is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (void);
+  virtual CosTime::UTO_ptr secure_universal_time ();
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
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/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index df5b7066692..76e1b1faace 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -46,27 +46,27 @@ public:
            TimeBase::TdfT tdf);
 
   /// Destructor.
-  ~TAO_UTO (void);
+  ~TAO_UTO ();
 
   /// For the readonly attribute <time>.
   virtual TimeBase::TimeT time ();
 
   /// For the readonly attribute <inaccuracy>.
-  virtual TimeBase::InaccuracyT  inaccuracy (void);
+  virtual TimeBase::InaccuracyT  inaccuracy ();
 
   /// For the readonly attribute <tdf>, which is the "time displacement
   /// factor".
-  virtual TimeBase::TdfT tdf (void);
+  virtual TimeBase::TdfT tdf ();
 
   /// For the readonly attribute <utc_time>.
-  virtual TimeBase::UtcT utc_time (void);
+  virtual TimeBase::UtcT utc_time ();
 
   /**
    * Absolute time = Relative time + Base time.
    * ?? Find out more about the Base Time, UTC and
    *    Distributed Time Sync. Algos. [3
    */
-  CosTime::UTO_ptr absolute_time (void);
+  CosTime::UTO_ptr absolute_time ();
 
   /// Compares the time contained in the object with the time in the
   /// supplied uto according to the supplied comparison type.
@@ -84,7 +84,7 @@ public:
 
   /// Returns a TIO object representing the error interval around the
   /// time value in the UTO.
-  CosTime::TIO_ptr interval (void);
+  CosTime::TIO_ptr interval ();
 
 private:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 2dfdaaf37df..40415cb1e31 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -18,7 +18,6 @@ Timer_Helper::Timer_Helper ()
 Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk)
   : clerk_ (clerk)
 {
-
 }
 
 Timer_Helper::~Timer_Helper ()
@@ -74,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/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 68dbfe5f082..96a014ef9f3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -48,10 +48,10 @@ class TAO_Time_Serv_Export Timer_Helper : public ACE_Event_Handler
 {
 public:
   /// Constructor.
-  Timer_Helper (void);
+  Timer_Helper ();
 
   /// Destructor.
-  ~Timer_Helper (void);
+  ~Timer_Helper ();
 
   /// Constructor that sets the clerk.
   Timer_Helper (TAO_Time_Service_Clerk *clerk);
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index aa6bc96b982..07fa0725ad3 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Number of nanoseconds between CORBA and POSIX epochs.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 1014f848399..f22d6f41cee 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -95,7 +95,7 @@ public:
                               const char* preference);
 
   /// Destructor
-  ~TAO_Preference_Interpreter(void);
+  ~TAO_Preference_Interpreter();
 
   void order_offer (CosTrading::Offer* offer,
                     CosTrading::OfferId offer_id = 0);
@@ -114,7 +114,7 @@ public:
   int remove_offer (CosTrading::Offer*& offer);
 
   /// Return the number of offers remaining in the ordering.
-  size_t num_offers (void);
+  size_t num_offers ();
 
   struct Preference_Info
   {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 3d20afdd2bd..f7c3fe02985 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -605,7 +605,6 @@ operator== (const TAO_Literal_Constraint& left,
 }
 
 
-
 bool
 operator< (const TAO_Literal_Constraint& left,
            const TAO_Literal_Constraint& right)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index 1d95f7eba8e..842fbcfb34a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -154,14 +154,14 @@ public:
   TAO_Unary_Constraint (TAO_Expression_Type op_type,
                         TAO_Constraint* operand);
 
-  virtual ~TAO_Unary_Constraint (void);
+  virtual ~TAO_Unary_Constraint ();
 
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
   virtual TAO_Expression_Type expr_type () const
     { return this->op_; }
 
-  TAO_Constraint* operand (void);
+  TAO_Constraint* operand ();
 
 private:
   TAO_Unary_Constraint (const TAO_Unary_Constraint&);
@@ -185,7 +185,7 @@ class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint
 public:
   TAO_Property_Constraint (const char* name);
 
-  virtual ~TAO_Property_Constraint (void);
+  virtual ~TAO_Property_Constraint ();
 
   virtual int accept (TAO_Constraint_Visitor* visitor);
 
@@ -211,7 +211,7 @@ private:
 class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 {
 public:
-  TAO_Literal_Constraint (void);
+  TAO_Literal_Constraint ();
 
   // = Constructors for each of the various types of literals.
 
@@ -226,7 +226,7 @@ public:
   TAO_Literal_Constraint (const TAO_Literal_Constraint& lit);
 
   /// Destructor.
-  ~TAO_Literal_Constraint(void);
+  ~TAO_Literal_Constraint();
 
   /// Visitor accept methods.
   virtual int accept (TAO_Constraint_Visitor* visitor);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index e87b992b6a9..b01598e7b01 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -392,7 +392,6 @@ public:
   /// uses the appropriate form of equals comparison.
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::ULong element) const;
-
 };
 
 template<>
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 9d0429b6b46..9299ac0f34e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -10,7 +10,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-
 #define  YY_INT_ALIGNED short int
 
 /* A lexical scanner generated by flex */
@@ -22,9 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 
-
-
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
@@ -53,13 +49,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 
-
-
-
-
-
-
-
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -176,13 +165,6 @@ typedef unsigned int flex_uint32_t;
 
 
 
-
-
-
-
-
-
-
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
@@ -220,7 +202,6 @@ typedef unsigned int flex_uint32_t;
 #define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
 
-
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
 #define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -266,7 +247,6 @@ struct yy_buffer_state
   FILE *yy_input_file;
 
 
-
   char *yy_ch_buf;    /* input buffer */
   char *yy_buf_pos;    /* current position in input buffer */
 
@@ -334,7 +314,6 @@ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
 static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 
-
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
@@ -350,7 +329,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 
-
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
 static int yy_n_chars;    /* number of characters read into yy_ch_buf */
@@ -434,7 +412,6 @@ extern char *yytext;
 
 
 
-
 static yy_state_type yy_get_previous_state ( );
 static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
 static int yy_get_next_buffer ( );
@@ -442,7 +419,6 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 
 
 
-
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
@@ -629,12 +605,10 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base);
 
 
 
-
 #define INITIAL 0
 
 
 
-
 #ifndef YY_NO_UNISTD_H
 /* Special case for "unistd.h", since it is non-ANSI. We include it way
  * down here because we want the user's section 1 to have been scanned first.
@@ -643,14 +617,12 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base);
 #endif
 
 
-
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *
 #endif
 
 
 
-
 static int yy_init_globals ( );
 
 
@@ -661,68 +633,54 @@ static int yy_init_globals ( );
 int yylex_destroy ( );
 
 
-
 int yyget_debug ( );
 
 
-
 void yyset_debug ( int debug_flag  );
 
 
-
 YY_EXTRA_TYPE yyget_extra ( );
 
 
-
 void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
 
-
 FILE *yyget_in ( );
 
 
-
 void yyset_in  ( FILE * _in_str  );
 
 
-
 FILE *yyget_out ( );
 
 
-
 void yyset_out  ( FILE * _out_str  );
 
 
-
       int yyget_leng ( );
 
 
-
 char *yyget_text ( );
 
 
-
 int yyget_lineno ( );
 
 
-
 void yyset_lineno ( int _line_number  );
 
 
 
 
 
-
-
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap ( void );
+extern "C" int yywrap ();
 #else
-extern int yywrap ( void );
+extern int yywrap ();
 #endif
 #endif
 
@@ -743,9 +701,9 @@ static int yy_flex_strlen ( const char * );
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput ( void );
+static int yyinput ();
 #else
-static int input ( void );
+static int input ();
 #endif
 
 #endif
@@ -755,8 +713,6 @@ static int input ( void );
 
 
 
-
-
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
 #ifdef __ia64__
@@ -777,7 +733,6 @@ static int input ( void );
 #endif
 
 
-
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
  * is returned in "result".
  */
@@ -815,7 +770,6 @@ static int input ( void );
 #endif
 
 
-
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
  * we don't want an extra ';' after the "return" because that will cause
  * some compilers to complain about unreachable statements.
@@ -837,11 +791,9 @@ static int input ( void );
 #endif
 
 
-
 /* end tables serialization structures and prototypes */
 
 
-
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
@@ -854,11 +806,9 @@ static int input ( void );
 
 
 
-
-
 extern int yylex ();
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex ()
 #endif /* !YY_DECL */
 
 
@@ -870,14 +820,12 @@ extern int yylex ();
 #endif
 
 
-
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
 #define YY_BREAK /*LINTED*/break;
 #endif
 
 
-
 #define YY_RULE_SETUP \
   YY_USER_ACTION
 
@@ -897,8 +845,6 @@ YY_DECL
 
 
 
-
-
   if ( !(yy_init) )
     {
     (yy_init) = 1;
@@ -908,7 +854,6 @@ YY_DECL
 #endif
 
 
-
     if ( ! (yy_start) )
       (yy_start) = 1;  /* first start state */
 
@@ -928,9 +873,6 @@ YY_DECL
     }
 
   {
-
-
-
   while ( /*CONSTCOND*/1 )    /* loops until end-of-file is reached */
     {
     yy_cp = (yy_c_buf_p);
@@ -976,7 +918,6 @@ yy_find_action:
     YY_DO_BEFORE_ACTION;
 
 
-
 do_action:  /* This label is used only to access EOF actions. */
 
 
@@ -1290,7 +1231,6 @@ case YY_STATE_EOF(INITIAL):
 
 
 
-
 /* yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
@@ -1382,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 )
@@ -1529,7 +1468,6 @@ static int yy_get_next_buffer ()
   *--yy_cp = (char) c;
 
 
-
   (yytext_ptr) = yy_bp;
   (yy_hold_char) = *yy_cp;
   (yy_c_buf_p) = yy_cp;
@@ -1539,9 +1477,9 @@ static int yy_get_next_buffer ()
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput (void)
+    static int yyinput ()
 #else
-    static int input  (void)
+    static int input  ()
 #endif
 
 {
@@ -1619,7 +1557,6 @@ static int yy_get_next_buffer ()
  */
     void yyrestart  (FILE * input_file )
 {
-
   if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
     YY_CURRENT_BUFFER_LVALUE =
@@ -1637,7 +1574,6 @@ static int yy_get_next_buffer ()
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
   /* TODO. We should be able to replace this entire function body
    * with
    *    yypop_buffer_state();
@@ -1712,7 +1648,6 @@ static void yy_load_buffer_state  ()
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-
   if ( ! b )
     return;
 
@@ -1750,7 +1685,6 @@ static void yy_load_buffer_state  ()
     }
 
 
-
         b->yy_is_interactive = file ? (ACE_OS::isatty( fileno(file) ) > 0) : 0;
 
 
@@ -1846,7 +1780,6 @@ static void yyensure_buffer_stack ()
   yy_size_t num_to_alloc;
 
   if (!(yy_buffer_stack)) {
-
     /* First allocation is just for 2 elements, since we don't know if this
      * scanner will even need a stack. We use 2 instead of 1 to avoid an
      * immediate realloc on the next call.
@@ -1867,7 +1800,6 @@ static void yyensure_buffer_stack ()
   }
 
   if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
     /* Increase the buffer to prepare for a possible push. */
     yy_size_t grow_size = 8 /* arbitrary grow size */;
 
@@ -1888,7 +1820,6 @@ static void yyensure_buffer_stack ()
 
 
 
-
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
@@ -1926,7 +1857,6 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 
 
 
-
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
@@ -1937,13 +1867,11 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
  */
 YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
-
   return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
 
 
-
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
@@ -1988,9 +1916,6 @@ YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 
 
 
-
-
-
 #ifndef YY_EXIT_FAILURE
 #define YY_EXIT_FAILURE 2
 #endif
@@ -2019,25 +1944,20 @@ static void yynoreturn yy_fatal_error (const char* msg )
   while ( 0 )
 
 
-
 /* Accessor  methods (get/set functions) to struct members. */
 
 
-
 /** Get the current line number.
  *
  */
 int yyget_lineno  ()
 {
-
-
     return yylineno;
 }
 
 
 
 
-
 /** Get the input stream.
  *
  */
@@ -2047,7 +1967,6 @@ FILE *yyget_in  ()
 }
 
 
-
 /** Get the output stream.
  *
  */
@@ -2057,7 +1976,6 @@ FILE *yyget_out  ()
 }
 
 
-
 /** Get the length of the current token.
  *
  */
@@ -2078,15 +1996,12 @@ char *yyget_text  ()
 
 
 
-
 /** Set the current line number.
  * @param _line_number line number
  *
  */
 void yyset_lineno (int  _line_number )
 {
-
-
     yylineno = _line_number;
 }
 
@@ -2094,7 +2009,6 @@ void yyset_lineno (int  _line_number )
 
 
 
-
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param _in_str A readable stream.
@@ -2107,7 +2021,6 @@ void yyset_in (FILE *  _in_str )
 }
 
 
-
 void yyset_out (FILE *  _out_str )
 {
         yyout = _out_str ;
@@ -2115,21 +2028,18 @@ void yyset_out (FILE *  _out_str )
 
 
 
-
 int yyget_debug  ()
 {
         return yy_flex_debug;
 }
 
 
-
 void yyset_debug (int  _bdebug )
 {
         yy_flex_debug = _bdebug ;
 }
 
 
-
 static int yy_init_globals ()
 {
         /* Initialization is the same as for the non-reentrant scanner.
@@ -2148,8 +2058,6 @@ static int yy_init_globals ()
 
 
 
-
-
 /* Defined in main.c */
 #ifdef YY_STDINIT
     yyin = stdin;
@@ -2169,7 +2077,6 @@ static int yy_init_globals ()
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  ()
 {
-
     /* Pop the buffer stack, destroying each element. */
   while(YY_CURRENT_BUFFER){
     yy_delete_buffer( YY_CURRENT_BUFFER  );
@@ -2184,7 +2091,6 @@ int yylex_destroy  ()
 
 
 
-
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
     yy_init_globals( );
@@ -2193,17 +2099,14 @@ int yylex_destroy  ()
 }
 
 
-
 /*
  * Internal utility routines.
  */
 
 
-
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
-
   int i;
   for ( i = 0; i < n; ++i )
     s1[i] = s2[i];
@@ -2211,7 +2114,6 @@ static void yy_flex_strncpy (char* s1, const char * s2, int n )
 #endif
 
 
-
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (const char * s )
 {
@@ -2224,17 +2126,14 @@ static int yy_flex_strlen (const char * s )
 #endif
 
 
-
 void *yyalloc (yy_size_t  size )
 {
       return malloc(size);
 }
 
 
-
 void *yyrealloc  (void * ptr, yy_size_t  size )
 {
-
   /* The cast to (char *) in the following accommodates both
    * implementations that use char* generic pointers, and those
    * that use void* generic pointers.  It works with the latter
@@ -2246,7 +2145,6 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 }
 
 
-
 void yyfree (void * ptr )
 {
       free( (char *) ptr );  /* see yyrealloc() for (char *) cast */
@@ -2260,8 +2158,6 @@ void yyfree (void * ptr )
 
 
 
-
-
 TAO_Literal_Constraint*
 extract_string(const char* total)
 {
@@ -2392,7 +2288,7 @@ trader_strtoll(const char* s, unsigned int base)
 }
 
 int
-yywrap (void)
+yywrap ()
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index d44d126c578..164b10f653c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -51,7 +51,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 #  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
 # endif
 #else
-# define YYPARSE_DECL() yyparse(void)
+# define YYPARSE_DECL() yyparse()
 #endif
 
 /* Parameters sent to lex. */
@@ -59,7 +59,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 # define YYLEX_DECL() yylex(void *YYLEX_PARAM)
 # define YYLEX yylex(YYLEX_PARAM)
 #else
-# define YYLEX_DECL() yylex(void)
+# define YYLEX_DECL() yylex()
 # define YYLEX yylex()
 #endif
 
@@ -304,7 +304,6 @@ static const YYINT yyctable[] = {                        -1,
 #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a))
 #if YYDEBUG
 static const char *const yyname[] = {
-
 "$end",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -359,7 +358,6 @@ static const char *const yyrule[] = {
 "factor : TAO_MINUS TAO_NUMBER",
 "factor : TAO_STRING",
 "factor : TAO_BOOLEAN",
-
 };
 #endif
 
@@ -766,11 +764,9 @@ yyloop:
             ctry = save->ctry;
             if (save->state != yystate) YYABORT;
             yyFreeState(save);
-
         }
         else
         {
-
             /* Unresolved conflict - start/continue trial parse */
             YYParseState *save;
 #if YYDEBUG
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index f5d8691fdd6..67d355d0894 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -32,10 +32,10 @@ class TAO_Trading_Serv_Export TAO_Interpreter
 {
 protected:
   /// Constructor.
-  TAO_Interpreter (void);
+  TAO_Interpreter ();
 
   /// Destructor.
-  ~TAO_Interpreter (void);
+  ~TAO_Interpreter ();
 
   /// Using the Yacc generated parser, construct an expression tree
   /// representing <constraints> from the tokens returned by it.
@@ -52,9 +52,9 @@ private:
 };
 
 // Functions we need for parsing.
-extern int yyparse (void);
+extern int yyparse ();
 extern void yyrestart (FILE*);
-extern int yylex (void);
+extern int yylex ();
 
 // Have yylex read from the constraint string, not from stdin.
 #undef YY_INPUT
@@ -81,7 +81,6 @@ public:
   static int copy_into (char* buf, int max_size);
 
 private:
-
   /// Pointers to keep track of the input string.
   static char* string_;
   static char* current_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index c6929ec2c1b..5c9920b52d9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -83,7 +83,6 @@ class TAO_Sequence_Extracter_Base
 //   Static methods used by the TAO_Sequence_Extracter class.
 {
 public:
-
   static CORBA::TCKind sequence_type (CORBA::TypeCode* code);
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 2d056734fcc..f0f7ff6c27d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -50,7 +50,6 @@ class TAO_Offer_Database
 {
   friend class TAO_Service_Offer_Iterator<LOCK_TYPE>;
 public:
-
   // Traits
   typedef TAO_Service_Offer_Iterator<LOCK_TYPE> offer_iterator;
 
@@ -80,7 +79,7 @@ public:
 
   /// Return an iterator that will traverse and return all the offer
   /// ids in the service type map.
-  TAO_Offer_Id_Iterator* retrieve_all_offer_ids (void);
+  TAO_Offer_Id_Iterator* retrieve_all_offer_ids ();
 
   struct Offer_Map_Entry
   {
@@ -156,19 +155,19 @@ public:
                               TAO_Offer_Database<LOCK_TYPE>& offer_database);
 
   /// Release all the locks acquired.
-  ~TAO_Service_Offer_Iterator (void);
+  ~TAO_Service_Offer_Iterator ();
 
   /// Returns 1 if there are more offers, 0 otherwise.
-  int has_more_offers (void);
+  int has_more_offers ();
 
   /// Get the id for the current offer.
-  CosTrading::OfferId get_id (void);
+  CosTrading::OfferId get_id ();
 
   /// Returns the next offer in the series.
-  CosTrading::Offer* get_offer (void);
+  CosTrading::Offer* get_offer ();
 
   /// Advances the iterator 1.
-  void next_offer (void);
+  void next_offer ();
 
  private:
   /// Lock the top_level map.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index e79269ae7b3..6f581a9456c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -62,7 +62,6 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
   // populate the sequence.
   for (CORBA::ULong i = 0; i < offers_in_sequence; i++)
     {
-
       CosTrading::Offer *source = 0;
       this->offers_.dequeue_head (source);
       this->pfilter_.filter_offer (source, offers[i]);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 9ae6c26fd71..75abe170d9c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -46,7 +46,7 @@ class TAO_Offer_Iterator
 public:
   TAO_Offer_Iterator (const TAO_Property_Filter& property_filter);
 
-  virtual ~TAO_Offer_Iterator (void);
+  virtual ~TAO_Offer_Iterator ();
 
   /**
    * BEGIN SPEC
@@ -55,14 +55,14 @@ public:
    * destroyed.
    * END SPEC
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add an offer to the collection of offers the iterator will
   /// iterate over.
   virtual void add_offer (CosTrading::OfferId offer_id,
                           const CosTrading::Offer* offer) = 0;
 
-  virtual CORBA::ULong max_left (void) = 0;
+  virtual CORBA::ULong max_left () = 0;
 
   // BEGIN SPEC
   // The max_left operation returns the number of service offers
@@ -116,7 +116,7 @@ class TAO_Query_Only_Offer_Iterator
 public:
   TAO_Query_Only_Offer_Iterator (const TAO_Property_Filter& pfilter);
 
-  virtual ~TAO_Query_Only_Offer_Iterator (void);
+  virtual ~TAO_Query_Only_Offer_Iterator ();
 
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
@@ -124,14 +124,13 @@ public:
                                  CosTrading::OfferSeq_out offers);
 
   /// Return the number of items left in the iterator.
-  virtual CORBA::ULong max_left (void);
+  virtual CORBA::ULong max_left ();
 
   /// Add an offer the iterator should iterate over.
   void add_offer (CosTrading::OfferId offer_id,
                   const CosTrading::Offer* offer);
 
 private:
-
   TAO_Query_Only_Offer_Iterator (const TAO_Query_Only_Offer_Iterator&);
   TAO_Query_Only_Offer_Iterator& operator=(const TAO_Query_Only_Offer_Iterator&);
 
@@ -162,28 +161,26 @@ class TAO_Offer_Iterator_Collection :
 //   the trader graph is deep enough.
 {
 public:
-
   // = Constructors.
 
-  TAO_Offer_Iterator_Collection (void);
+  TAO_Offer_Iterator_Collection ();
 
-  virtual ~TAO_Offer_Iterator_Collection (void);
+  virtual ~TAO_Offer_Iterator_Collection ();
 
   /// Retrieve n offers from the set of iterators.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers);
 
   /// Destroy the collection of iterators.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Determine how many offers are left in the collection.
-  virtual CORBA::ULong max_left (void);
+  virtual CORBA::ULong max_left ();
 
   /// Add an iterator to the collection.
   void add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter);
 
 private:
-
   TAO_Offer_Iterator_Collection (const TAO_Offer_Iterator_Collection&);
   TAO_Offer_Iterator_Collection& operator= (const TAO_Offer_Iterator_Collection&);
 
@@ -214,11 +211,10 @@ class TAO_Offer_Id_Iterator :
 //   END SPEC
 {
  public:
-
   /// No op constructor
-  TAO_Offer_Id_Iterator(void);
+  TAO_Offer_Id_Iterator();
 
-  ~TAO_Offer_Id_Iterator (void);
+  ~TAO_Offer_Id_Iterator ();
 
   /**
    * The max_left operation returns the number of offer identifiers
@@ -227,14 +223,14 @@ class TAO_Offer_Id_Iterator :
    * identifiers (e.g., if the iterator determines its set of offer
    * identifiers through lazy evaluation).
    */
-  virtual CORBA::ULong max_left(void);
+  virtual CORBA::ULong max_left();
 
   /**
    * The destroy operation destroys the iterator. No further
    * operations can be invoked on an iterator after it has been
    * destroyed.
    */
-  virtual void destroy(void);
+  virtual void destroy();
 
   /**
    * The next_n operation returns a set of offer identifiers in the
@@ -255,7 +251,6 @@ class TAO_Offer_Id_Iterator :
   void insert_id(CosTrading::OfferId new_id);
 
  private:
-
   TAO_Offer_Id_Iterator (const TAO_Offer_Id_Iterator&);
   TAO_Offer_Id_Iterator& operator= (TAO_Offer_Id_Iterator&);
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index e98e2905485..0b8227a2edc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -16,7 +16,7 @@ TAO_Register_Offer_Iterator (TAO_Offer_Database<MAP_LOCK_TYPE> &db,
 
 template <class MAP_LOCK_TYPE>
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-~TAO_Register_Offer_Iterator (void)
+~TAO_Register_Offer_Iterator ()
 {
   while (! this->offer_ids_.is_empty ())
     {
@@ -37,7 +37,7 @@ add_offer (CosTrading::OfferId id,
 
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (void)
+max_left ()
 {
   return static_cast<CORBA::ULong> (this->offer_ids_.size ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 8cf9d872641..32e7a17a33b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -45,7 +45,7 @@ public:
                                const TAO_Property_Filter& pfilter);
 
   /// Destructor.
-  virtual ~TAO_Register_Offer_Iterator (void);
+  virtual ~TAO_Register_Offer_Iterator ();
 
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
@@ -58,14 +58,13 @@ public:
    * the trader will have all the offers it has now when the time
    * to return them comes.
    */
-  virtual CORBA::ULong max_left (void);
+  virtual CORBA::ULong max_left ();
 
   /// Add an offer the iterator should iterate over.
   void add_offer (CosTrading::OfferId id,
                   const CosTrading::Offer *);
 
 private:
-
   /// A reference to the trader is needed for access to the map of offers.
   TAO_Offer_Database<MAP_LOCK_TYPE> &db_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index ed02cdd2173..f7a9692cd5e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -38,10 +38,10 @@ public:
    */
   TAO_Service_Type_Repository (ACE_Lock *lock = 0);
 
-  ~TAO_Service_Type_Repository (void);
+  ~TAO_Service_Type_Repository ();
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (void);
+    incarnation ();
 
   /**
    * BEGIN SPEC
@@ -178,7 +178,6 @@ public:
   virtual void unmask_type (const char  *name);
 
 private:
-
   /**
    * @class Type_Info
    *
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index ae5b660b3b3..fbc1b384a24 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -84,7 +84,7 @@ private:
                      TAO_TRADER_STANDALONE,
                      TAO_TRADER_LINKED };
 
-  TAO_TRADER* manufacture_trader (void);
+  TAO_TRADER* manufacture_trader ();
 
   void parse_args (int& argc, ACE_TCHAR** argv);
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index 28c928f070a..2dbad344b80 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -29,7 +29,6 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
       try
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
index fc5e9b84792..de440bd108a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -37,7 +37,6 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator
 
   /// Desctructor.
   virtual ~TAO_Trader_Constraint_Validator ();
-
 };
 
 class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 67941639ea2..6aa02a42676 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -205,7 +205,7 @@ lookup_one_type (const char* type,
   // @@ Would have used Offer_Database::offer_iterator for less
   // coupling between TAO_Lookup and Offer_Database, but g++ barfs on
   // that.
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined (ACE_HAS_CPP20)
   TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
     offer_iter (type, offer_database);
 #else
@@ -958,7 +958,7 @@ withdraw_using_constraint (const char *type,
   // Try to find the map of offers of desired service type.
   // @@ Again, should be Offer_Database::offer_iterator
   {
-#if defined (_MSC_VER)
+#if defined (_MSC_VER) && !defined (ACE_HAS_CPP20)
     TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
       offer_iter (type, offer_database);
 #else
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 084af6df4fd..fa06efa1c1a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -267,7 +267,7 @@ class TAO_Register :
 public:
   TAO_Register (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  virtual ~TAO_Register (void);
+  virtual ~TAO_Register ();
 
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
@@ -509,10 +509,9 @@ class TAO_Admin :
   public TAO_Link_Attributes <POA_CosTrading::Admin>
 {
 public:
-
   TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  ~TAO_Admin (void);
+  ~TAO_Admin ();
 
   // = Importing Parameters (used by the Lookup Interface)
 
@@ -560,7 +559,7 @@ public:
     set_type_repos (CosTrading::TypeRepository_ptr repository);
 
   virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (void);
+    request_id_stem ();
 
   virtual CosTrading::Admin::OctetSeq*
     set_request_id_stem (const CosTrading::Admin::OctetSeq& stem);
@@ -618,10 +617,9 @@ class TAO_Link :
   public TAO_Link_Attributes <POA_CosTrading::Link>
 {
 public:
-
   TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  ~TAO_Link (void);
+  ~TAO_Link ();
 
   /**
    * BEGIN SPEC
@@ -708,7 +706,7 @@ public:
   // state.
   // END SPEC
 
-  virtual CosTrading::LinkNameSeq* list_links (void);
+  virtual CosTrading::LinkNameSeq* list_links ();
 
   // BEGIN SPEC
   // The list_links operation returns a list of the names of all
@@ -776,7 +774,7 @@ class TAO_Proxy :
 public:
   TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
-  ~TAO_Proxy (void);
+  ~TAO_Proxy ();
 
   virtual CosTrading::OfferId
     export_proxy (CosTrading::Lookup_ptr,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 2c613786e29..88b34092830 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -10,7 +10,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 TAO_Trader (TAO_Trader_Base::Trader_Components components)
 {
-
   // @@ Seth, we need a way to propagate the exception out.  This will
   // not work on platforms using environment variable.
   for (int i = LOOKUP_IF; i <= LINK_IF; i++)
@@ -79,7 +78,7 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
+TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader ()
 {
   // Remove Trading Components from POA
 
@@ -109,13 +108,13 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Offer_Database<MAP_LOCK_TYPE>&
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::offer_database (void)
+TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::offer_database ()
 {
   return this->offer_database_;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> ACE_Lock &
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock (void)
+TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock ()
 {
   return this->lock_;
 }
@@ -128,31 +127,31 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (void)
+TAO_Trader_Components<IF>::lookup_if ()
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (void)
+TAO_Trader_Components<IF>::register_if ()
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (void)
+TAO_Trader_Components<IF>::admin_if ()
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (void)
+TAO_Trader_Components<IF>::proxy_if ()
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (void)
+TAO_Trader_Components<IF>::link_if ()
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
 }
@@ -164,19 +163,19 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (void)
+TAO_Support_Attributes<IF>::supports_modifiable_properties ()
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (void)
+TAO_Support_Attributes<IF>::supports_dynamic_properties ()
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (void)
+TAO_Support_Attributes<IF>::supports_proxy_offers ()
 {
   return this->attrs_.supports_proxy_offers ();
 }
@@ -195,67 +194,67 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (void)
+TAO_Import_Attributes<IF>::def_search_card ()
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (void)
+TAO_Import_Attributes<IF>::max_search_card ()
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (void)
+TAO_Import_Attributes<IF>::def_match_card ()
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (void)
+TAO_Import_Attributes<IF>::max_match_card ()
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (void)
+TAO_Import_Attributes<IF>::def_return_card ()
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (void)
+TAO_Import_Attributes<IF>::max_return_card ()
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (void)
+TAO_Import_Attributes<IF>::max_list ()
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (void)
+TAO_Import_Attributes<IF>::def_hop_count ()
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (void)
+TAO_Import_Attributes<IF>::max_hop_count ()
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (void)
+TAO_Import_Attributes<IF>::def_follow_policy ()
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (void)
+TAO_Import_Attributes<IF>::max_follow_policy ()
 {
   return this->attrs_.max_follow_policy ();
 }
@@ -268,7 +267,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (void)
+TAO_Link_Attributes<IF>::max_link_follow_policy ()
 {
   return this->attrs_.max_link_follow_policy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index 187a4e1b0b6..91f2d0fcc1d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -70,13 +70,13 @@ public:
   TAO_Trader (Trader_Components components = LOOKUP);
 
   /// Destructor.
-  virtual ~TAO_Trader (void);
+  virtual ~TAO_Trader ();
 
   /// Accessor for the structure with all the service offers.
-  Offer_Database& offer_database (void);
+  Offer_Database& offer_database ();
 
   /// Returns the trader
-  ACE_Lock &lock (void);
+  ACE_Lock &lock ();
 
 protected:
   typedef TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> TRADER_SELF;
@@ -109,23 +109,23 @@ public:
   // = CosTrading::TraderComponents methods.
   /// Returns an object reference to the Lookup interface of the trader.
   /// Returns nil if the trader does not support Lookup interface.
-  virtual CosTrading::Lookup_ptr lookup_if (void);
+  virtual CosTrading::Lookup_ptr lookup_if ();
 
   /// Returns object reference for the Register interface of the trader.
   /// Returns nil if the trader does not support Register interface.
-  virtual CosTrading::Register_ptr register_if (void);
+  virtual CosTrading::Register_ptr register_if ();
 
   /// Returns object reference for the Link interface of the trader.
   /// Returns nil if the trader does not support Link interface.
-  virtual CosTrading::Link_ptr link_if (void);
+  virtual CosTrading::Link_ptr link_if ();
 
   /// Returns object reference to the Proxy interface of the trader.
   /// Returns nil if the trader does not support Proxy interface.
-  virtual CosTrading::Proxy_ptr proxy_if (void);
+  virtual CosTrading::Proxy_ptr proxy_if ();
 
   /// Returns object reference for the Admin interface of the trader.
   /// Returns nil if the trader does not support Admin interface.
-  virtual CosTrading::Admin_ptr admin_if (void);
+  virtual CosTrading::Admin_ptr admin_if ();
 
 private:
   const TAO_Trading_Components_i& comps_;
@@ -139,13 +139,13 @@ public:
 
   // = CosTrading::SupportAttributes methods.
 
-  virtual CORBA::Boolean supports_modifiable_properties (void);
+  virtual CORBA::Boolean supports_modifiable_properties ();
 
-  virtual CORBA::Boolean supports_dynamic_properties (void);
+  virtual CORBA::Boolean supports_dynamic_properties ();
 
-  virtual CORBA::Boolean supports_proxy_offers (void);
+  virtual CORBA::Boolean supports_proxy_offers ();
 
-  virtual CosTrading::TypeRepository_ptr type_repos (void);
+  virtual CosTrading::TypeRepository_ptr type_repos ();
 
 private:
   const TAO_Support_Attributes_i& attrs_;
@@ -159,37 +159,37 @@ public:
 
   // = CosTrading::ImportAttributes methods.
 
-  virtual CORBA::ULong def_search_card (void);
+  virtual CORBA::ULong def_search_card ();
 
-  virtual CORBA::ULong max_search_card (void);
+  virtual CORBA::ULong max_search_card ();
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
-  virtual CORBA::ULong def_match_card (void);
+  virtual CORBA::ULong def_match_card ();
 
-  virtual CORBA::ULong max_match_card (void);
+  virtual CORBA::ULong max_match_card ();
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
-  virtual CORBA::ULong def_return_card (void);
+  virtual CORBA::ULong def_return_card ();
 
-  virtual CORBA::ULong max_return_card (void);
+  virtual CORBA::ULong max_return_card ();
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
-  virtual CORBA::ULong max_list (void);
+  virtual CORBA::ULong max_list ();
 
-  virtual CORBA::ULong def_hop_count (void);
+  virtual CORBA::ULong def_hop_count ();
 
-  virtual CORBA::ULong max_hop_count (void);
+  virtual CORBA::ULong max_hop_count ();
 
-  virtual CosTrading::FollowOption def_follow_policy (void);
+  virtual CosTrading::FollowOption def_follow_policy ();
 
-  virtual CosTrading::FollowOption max_follow_policy (void);
+  virtual CosTrading::FollowOption max_follow_policy ();
 
 private:
   const TAO_Import_Attributes_i& attrs_;
@@ -202,7 +202,7 @@ public:
   TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
 
   // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (void);
+  virtual CosTrading::FollowOption max_link_follow_policy ();
 
 private:
   const TAO_Link_Attributes_i& attrs_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index b5efbed8b0e..f346d3dcad1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Trading_Serv_Export TAO_Property_Evaluator
 {
 public:
-
   TAO_Property_Evaluator(const CosTrading::PropertySeq& properties,
                          CORBA::Boolean supports_dp = 1);
 
@@ -121,7 +120,6 @@ private:
 class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator
 {
 public:
-
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
  ,
                                   CORBA::Boolean supports_dp = 1);
@@ -158,7 +156,6 @@ public:
   const CosTrading::Property* get_property (const char* property_name);
 
 private:
-
   TAO_Property_Evaluator_By_Name (const TAO_Property_Evaluator_By_Name&);
   TAO_Property_Evaluator_By_Name& operator= (const TAO_Property_Evaluator_By_Name&);
 
@@ -177,10 +174,10 @@ class TAO_Trading_Serv_Export TAO_Dynamic_Property
   : public virtual POA_CosTradingDynamic::DynamicPropEval
 {
 public:
-  TAO_Dynamic_Property (void) {}
-  virtual ~TAO_Dynamic_Property (void);
+  TAO_Dynamic_Property () {}
+  virtual ~TAO_Dynamic_Property ();
 
-  void destroy (void);
+  void destroy ();
 
   /// Dynamic property evaluation call-back method.
   virtual CORBA::Any* evalDP(const char* name,
@@ -264,7 +261,7 @@ public:
   // DuplicatePolicyName exception is raised.
   // END SPEC
 
-  ~TAO_Policies (void);
+  ~TAO_Policies ();
 
   CORBA::ULong search_card () const;
 
@@ -428,7 +425,6 @@ public:
                               const CosTrading::Link::LinkInfo& link_info) const;
 
 private:
-
   /// Reconclile a ULong property with its default.
   CORBA::ULong ulong_prop (POLICY_TYPE pol) const;
 
@@ -629,11 +625,11 @@ public:
 
   /// It's ok to consider more offers when lookup hasn't exceeded the
   /// cardinality values for searching and matching offers.
-  CORBA::Boolean ok_to_consider_more (void);
+  CORBA::Boolean ok_to_consider_more ();
 
   /// Signal that the Lookup method has matched an offer; decrement the
   /// match_card.
-  void matched_offer (void);
+  void matched_offer ();
 
   // = Return the limits applied.
   /**
@@ -647,7 +643,7 @@ public:
    * returned.
    * END SPEC
    */
-  CosTrading::PolicyNameSeq* limits_applied (void);
+  CosTrading::PolicyNameSeq* limits_applied ();
 
   /// Accessors to retrieve the adjusted cardinalities.
   CORBA::ULong search_card_remaining () const;
@@ -685,7 +681,7 @@ public:
   typedef CosTrading::Lookup::SpecifiedProps SPECIFIED_PROPS;
 
   /// An accomplice to g++'s insane lust for copy constructors.
-  TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {}
+  TAO_Property_Filter () : policy_ (CosTrading::Lookup::all) {}
 
   /// Verify that the specified properties are correct.
   TAO_Property_Filter (const SPECIFIED_PROPS& desired_props);
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/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 70f4fe30cee..a6c520ab1b1 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
 #include "tao/ORB_Constants.h"
 
-ORBInitializer::ORBInitializer (void)
+ORBInitializer::ORBInitializer ()
   : load_alert_ ()
 {
 }
@@ -34,7 +34,7 @@ ORBInitializer::post_init (
 
 
 TAO_LB_LoadAlert &
-ORBInitializer::load_alert (void)
+ORBInitializer::load_alert ()
 {
   return this->load_alert_;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index b0045236621..7e179cecec7 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -31,7 +31,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index c47830f82ad..90c8481eb15 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -22,7 +22,7 @@ public:
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
                                        Test::number cl_number);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index 1a3227e308a..de2cf0f85be 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -67,7 +67,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -141,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/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index d3e59a5cb51..22454390add 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -212,7 +212,6 @@ join_object_group (CORBA::ORB_ptr orb,
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -236,7 +235,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
 
-
   try
     {
       ORBInitializer *initializer = 0;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 032a70bbe8a..92b419a1ce0 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -6,7 +6,7 @@
 
 #include "tao/ORB_Constants.h"
 
-ORBInitializer::ORBInitializer (void)
+ORBInitializer::ORBInitializer ()
   : load_alert_ (),
     interceptor_ (0)
 {
@@ -52,7 +52,7 @@ ORBInitializer::post_init (
 
 
 TAO_LB_LoadAlert &
-ORBInitializer::load_alert (void)
+ORBInitializer::load_alert ()
 {
   return this->load_alert_;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index a2d731ec00a..9073cbcdbb8 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -21,12 +21,12 @@ RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
   this->location_[0].kind = CORBA::string_dup ("UUID");
 }
 
-RPS_Monitor::~RPS_Monitor (void)
+RPS_Monitor::~RPS_Monitor ()
 {
 }
 
 CosLoadBalancing::Location *
-RPS_Monitor::the_location (void)
+RPS_Monitor::the_location ()
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -41,7 +41,7 @@ RPS_Monitor::the_location (void)
 }
 
 CosLoadBalancing::LoadList *
-RPS_Monitor::loads (void)
+RPS_Monitor::loads ()
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 895f4baa45a..d83bd0c5fa0 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -32,7 +32,6 @@ class RPS_Monitor
   : public virtual POA_CosLoadBalancing::LoadMonitor
 {
 public:
-
   /// Constructor
   RPS_Monitor (ServerRequestInterceptor * interceptor);
 
@@ -42,7 +41,6 @@ public:
    * Methods required by the CosLoadBalancing::LoadMonitor interface.
    */
   //@{
-
   /// Return the location at which the LoadMonitor resides.
   /**
    * The returned "Location" is a sequence of length 1.
@@ -61,16 +59,14 @@ public:
   //@}
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
    * reference counting.
    */
-  ~RPS_Monitor (void);
+  ~RPS_Monitor ();
 
 private:
-
   /// The name of the location at which this LoadMonitor resides.
   CosLoadBalancing::Location location_;
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 09d65fc4c2d..7915d8f2a61 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -12,7 +12,6 @@ Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
                         Test::number  cl_number)
 {
-
   if (cl_number % 2 == 0)
   {
     for (int i = 1; i < 10000; i++)
@@ -25,7 +24,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index c47830f82ad..90c8481eb15 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -22,7 +22,7 @@ public:
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
                                        Test::number cl_number);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index 2af202455c5..05012b1fb74 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -1,22 +1,22 @@
 #include "ServerRequestInterceptor.h"
 
-ServerRequestInterceptor::ServerRequestInterceptor (void)
+ServerRequestInterceptor::ServerRequestInterceptor ()
   : request_count_ (0)
 {
 }
 
-ServerRequestInterceptor::~ServerRequestInterceptor (void)
+ServerRequestInterceptor::~ServerRequestInterceptor ()
 {
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
@@ -52,7 +52,7 @@ ServerRequestInterceptor::send_other (
 }
 
 CORBA::Long
-ServerRequestInterceptor::request_count (void)
+ServerRequestInterceptor::request_count ()
 {
   const CORBA::Long r = this->request_count_.value ();
   this->request_count_ = 0;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index d13ec9d6a4c..74e42791eb2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -47,7 +47,7 @@ class ServerRequestInterceptor
 {
 public:
   /// Constructor.
-  ServerRequestInterceptor (void);
+  ServerRequestInterceptor ();
 
   /**
    * @name Methods Required by the ServerRequestInterceptor
@@ -57,9 +57,9 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -77,7 +77,7 @@ public:
       PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
-  CORBA::Long request_count (void);
+  CORBA::Long request_count ();
 
 protected:
   /// Destructor.
@@ -85,7 +85,7 @@ protected:
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  ~ServerRequestInterceptor (void);
+  ~ServerRequestInterceptor ();
 
 private:
   /// The number of requests that have arrived on the server.
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/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 77f774eeef6..b9b51ce7053 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -29,7 +29,6 @@
 #include "ace/Barrier.h"
 
 
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const CORBA::Long experiment_id = 1;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 1720871c44f..93af9abe2dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -27,7 +27,6 @@
 #include "ace/Barrier.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int nthreads   = 0;
 int high_priority_period = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index 326d70b369a..b2d69704b43 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -26,7 +26,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index aa2c400f3af..3affd4e1a81 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -17,7 +17,7 @@ public:
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
                                        CORBA::Long workload_in_usecs);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 44cc2c67df1..1644dbca3b5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -28,9 +28,9 @@ public:
   {
   }
 
-  virtual void run_test (void) = 0;
+  virtual void run_test () = 0;
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     this->barrier_->wait ();
     try
@@ -67,7 +67,7 @@ public:
   {
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     for (int i = 0; i != this->iterations_; ++i)
       {
@@ -81,7 +81,6 @@ public:
           ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start;
 
           this->sample_history.sample (elapsed);
-
         } catch (const CORBA::Exception&) {
         }
       }
@@ -111,13 +110,13 @@ public:
   {
   }
 
-  void stop (void)
+  void stop ()
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     this->stopped_ = 1;
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     for (;;)
       {
@@ -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/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 14ed3bef69e..be8d7d607e5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -10,7 +10,7 @@ Callback::Callback (int iterations,
 }
 
 ACE_Sample_History &
-Callback::sample_history (void)
+Callback::sample_history ()
 {
   return this->sample_history_;
 }
@@ -27,7 +27,7 @@ Callback::sample (Test::Timestamp the_timestamp)
 }
 
 PortableServer::POA_ptr
-Callback::_default_POA (void)
+Callback::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
index 91c21047769..2dce97a8261 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
@@ -27,14 +27,14 @@ public:
             PortableServer::POA_ptr poa);
 
   /// Access the history of samples
-  ACE_Sample_History &sample_history (void);
+  ACE_Sample_History &sample_history ();
 
   //@{
   /** @name The RtecEventComm::PushCallback methods
    */
   virtual void sample (Test::Timestamp the_timestamp);
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index fa37c2c2ee1..2af0b2aa734 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -15,13 +15,13 @@ Session::sample (Test::Timestamp the_timestamp)
 }
 
 void
-Session::shutdown (void)
+Session::shutdown ()
 {
   Implicit_Deactivator deactivator (this);
 }
 
 PortableServer::POA_ptr
-Session::_default_POA (void)
+Session::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index fc611073c89..935d3bc9e97 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -17,9 +17,9 @@ public:
   // = The skeleton methods
   virtual void sample (Test::Timestamp the_timestamp);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   Test::Callback_var cb_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index b25dd442757..944fa5df865 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -19,13 +19,13 @@ Session_Factory::create_new_session (Test::Callback_ptr cb)
 }
 
 void
-Session_Factory::shutdown (void)
+Session_Factory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-Session_Factory::_default_POA (void)
+Session_Factory::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index 13665b0a280..a40b375bb4a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -17,9 +17,9 @@ public:
   // = The skeleton methods
   virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 76ac8596c38..c493bbfe72f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -34,9 +34,9 @@ public:
   {
   }
 
-  virtual void run_test (void) = 0;
+  virtual void run_test () = 0;
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     this->the_barrier_->wait ();
     try
@@ -72,7 +72,7 @@ public:
   {
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     Test::Callback_var cb =
       callback->_this ();
@@ -126,13 +126,13 @@ public:
   {
   }
 
-  void stop (void)
+  void stop ()
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     this->stopped_ = 1;
   }
 
-  virtual void run_test (void)
+  virtual void run_test ()
   {
     Test::Callback_var cb =
       callback->_this ();
@@ -158,7 +158,6 @@ public:
         try{
           CORBA::ULongLong dummy = 0;
           (void) session->sample (dummy);
-
         } catch (const CORBA::Exception&) {
         }
       }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index d29ccb9964f..58f8003d5dc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -26,7 +26,6 @@
 #include "ace/Barrier.h"
 
 
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const CORBA::Long experiment_id = 1;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index d9ab67712a4..31f9ccc903d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -26,7 +26,7 @@ public:
                   ACE_Barrier * the_barrier,
                   int period_in_usecs);
 
-  void stop(void);
+  void stop();
 
   virtual int svc ();
 
@@ -129,14 +129,14 @@ Scavenger_Task::Scavenger_Task(ACE_TCHAR const * endpoint,
 }
 
 void
-Scavenger_Task::stop(void)
+Scavenger_Task::stop()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->stopped_ = 1;
 }
 
 int
-Scavenger_Task::svc(void)
+Scavenger_Task::svc()
 {
   this->the_barrier_->wait ();
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting scavenger thread\n"));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 9e69761b528..a84d0aea668 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -61,7 +61,7 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Client_Group::disconnect (void)
+Client_Group::disconnect ()
 {
   Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
   Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
index 86d5de46f3e..9771c9565a0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
@@ -30,7 +30,7 @@ public:
    * We need a default constructor because this class is often used in
    * arrays.
    */
-  Client_Group (void);
+  Client_Group ();
 
   /// Initialize the consumer/supplier pair(s)
   /**
@@ -72,7 +72,7 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl
index 6f858db202d..fd557a776c3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE
-Client_Group::Client_Group (void)
+Client_Group::Client_Group ()
 {
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index cc8c9a1bc54..64b9ad83e9a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -66,7 +66,7 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Client_Pair::disconnect (void)
+Client_Pair::disconnect ()
 {
   Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
   Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
index d2a3e8c656b..fb28e230ceb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
@@ -30,7 +30,7 @@ public:
    * We need a default constructor because this class is often used in
    * arrays.
    */
-  Client_Pair (void);
+  Client_Pair ();
 
   /// Initialize the consumer/supplier pair
   /**
@@ -75,7 +75,7 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl
index 68caec3c217..b6918b8b631 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE
-Client_Pair::Client_Pair (void)
+Client_Pair::Client_Pair ()
 {
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 3e0a502b12b..a8061afd993 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -60,7 +60,7 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -79,7 +79,7 @@ Consumer::disconnect (void)
 }
 
 ACE_Sample_History &
-Consumer::sample_history (void)
+Consumer::sample_history ()
 {
   return this->sample_history_;
 }
@@ -108,7 +108,7 @@ Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_supplier_ =
@@ -116,7 +116,7 @@ Consumer::disconnect_push_consumer (void)
 }
 
 PortableServer::POA_ptr
-Consumer::_default_POA (void)
+Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 852ec158906..b113107cadd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -38,17 +38,17 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   /// Access the history of samples
-  ACE_Sample_History &sample_history (void);
+  ACE_Sample_History &sample_history ();
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_consumer ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index b2d7abaab8c..f47b21d8dac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -32,7 +32,7 @@ Control::Control (size_t peers_expected,
 {
 }
 
-Control::~Control (void)
+Control::~Control ()
 {
   delete[] this->peers_;
 }
@@ -113,18 +113,14 @@ Control::join (Federated_Test::Peer_ptr peer)
                 this->peers_[j]->setup_loopback (experiment_id,
                                                  base_event_type);
 
-              ACE_auto_ptr_reset (disconnects[lcount],
-                                  new Loopback_Disconnect (
-                                        loopbacks[lcount].in ()));
+              disconnects[lcount].reset (new Loopback_Disconnect (loopbacks[lcount].in ()));
               lcount++;
 
               loopbacks[lcount] =
                 this->peers_[j]->setup_loopback (experiment_id,
                                                  base_event_type + 2);
 
-              ACE_auto_ptr_reset (disconnects[lcount],
-                                  new Loopback_Disconnect (
-                                        loopbacks[lcount].in ()));
+              disconnects[lcount].reset (new Loopback_Disconnect (loopbacks[lcount].in ()));
               lcount++;
             }
         }
@@ -153,7 +149,7 @@ Control::join (Federated_Test::Peer_ptr peer)
 }
 
 PortableServer::POA_ptr
-Control::_default_POA (void)
+Control::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
index 75a79fc653f..9bd10c31d2b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -29,14 +29,14 @@ public:
            PortableServer::POA_ptr poa);
 
   /// Destructor
-  virtual ~Control (void);
+  virtual ~Control ();
 
   //@{
   /** @name The Federated_Test::Control methods
    */
   virtual void join (Federated_Test::Peer_ptr peer);
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 08b2b33d1b0..8a8d41b4139 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -11,7 +11,7 @@ EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
 }
 
-EC_Destroyer::~EC_Destroyer (void)
+EC_Destroyer::~EC_Destroyer ()
 {
   try{
     this->ec_->destroy ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
index f4078e534df..fd43d0b6760 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
@@ -31,7 +31,7 @@ public:
    * @todo This method could benefit from the error logging described
    * in Servant_var.cpp
    */
-  ~EC_Destroyer (void);
+  ~EC_Destroyer ();
 
 private:
   /// The event channel
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
index 27ae34b7d98..75224f06c73 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
@@ -26,13 +26,13 @@ public:
   Implicit_Deactivator& operator= (Implicit_Deactivator& rhs);
 
   /// Destructor
-  ~Implicit_Deactivator (void);
+  ~Implicit_Deactivator ();
 
   /// Assignment operator
   Implicit_Deactivator& operator= (PortableServer::Servant servant);
 
   /// Release the servant, i.e. the destructor does not deactivate anything
-  void release (void);
+  void release ();
 
 private:
   /// The POA
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl
index b0807f25919..eaea98cfb36 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE void
-Implicit_Deactivator::release (void)
+Implicit_Deactivator::release ()
 {
   this->id_ = 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index 2b3fb36040b..3e1d3770922 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -23,7 +23,7 @@ Loopback::Loopback (CORBA::Long experiment_id,
 }
 
 void
-Loopback::disconnect (void)
+Loopback::disconnect ()
 {
   Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
index 343d42eeb33..36a75f3e24e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -31,7 +31,7 @@ public:
   //@{
   /** @name The Federated_Test::Loopback methods
    */
-  virtual void disconnect (void);
+  virtual void disconnect ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 345057c7172..cc0c39a05cb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -56,7 +56,7 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Loopback_Consumer::disconnect (void)
+Loopback_Consumer::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -83,7 +83,7 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Loopback_Consumer::disconnect_push_consumer (void)
+Loopback_Consumer::disconnect_push_consumer ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_supplier_ =
@@ -91,7 +91,7 @@ Loopback_Consumer::disconnect_push_consumer (void)
 }
 
 PortableServer::POA_ptr
-Loopback_Consumer::_default_POA (void)
+Loopback_Consumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index c67aec4f208..52fccda55b8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -33,14 +33,14 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_consumer ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index a4ce22f8232..908d4b06f0f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -40,7 +40,7 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Loopback_Pair::disconnect (void)
+Loopback_Pair::disconnect ()
 {
   Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
   Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
index d21244b7387..947d3798a07 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
@@ -30,7 +30,7 @@ public:
    * We need a default constructor because this class is often used in
    * arrays.
    */
-  Loopback_Pair (void);
+  Loopback_Pair ();
 
   /**
    * @param experiment_id For tests that run multiple experiments
@@ -54,7 +54,7 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl
index a338fed194f..15ae716ce5a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE
-Loopback_Pair::Loopback_Pair (void)
+Loopback_Pair::Loopback_Pair ()
 {
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index f5fb3d79e2c..a0882566973 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -48,7 +48,7 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Loopback_Supplier::disconnect (void)
+Loopback_Supplier::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -101,7 +101,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source)
 }
 
 void
-Loopback_Supplier::disconnect_push_supplier (void)
+Loopback_Supplier::disconnect_push_supplier ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_consumer_ =
@@ -109,7 +109,7 @@ Loopback_Supplier::disconnect_push_supplier (void)
 }
 
 PortableServer::POA_ptr
-Loopback_Supplier::_default_POA (void)
+Loopback_Supplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 7144ce82d48..dc4c43c99ff 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -37,15 +37,15 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   void push (const RtecEventComm::EventSet &events);
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_supplier ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
index 3636ba44692..e3823cddb70 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
@@ -75,15 +75,12 @@ Low_Priority_Setup (int consumer_count,
                             this->clients_[j].supplier (),
                             barrier);
       this->tasks_[j].thr_mgr (&this->thr_mgr_);
-      ACE_auto_ptr_reset (this->stoppers_[j],
-                          new Send_Task_Stopper (thread_priority,
-                                                 thread_sched_class,
-                                                 &this->tasks_[j]));
+      this->stoppers_[j].reset (new Send_Task_Stopper (thread_priority, thread_sched_class, &this->tasks_[j]));
     }
 }
 
 template<class Client_Type> void
-Low_Priority_Setup<Client_Type>::stop_all_threads (void)
+Low_Priority_Setup<Client_Type>::stop_all_threads ()
 {
   ACE_DEBUG ((LM_DEBUG, "Stopping:"));
   for (int i = 0; i != this->nthreads_; ++i)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
index 4a7d23bd95c..9c69b56917b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
@@ -51,7 +51,7 @@ public:
                       ACE_Barrier *barrier);
 
   /// Stop all running threads
-  void stop_all_threads (void);
+  void stop_all_threads ();
 
   /// Collect the stats from all the clients
   void collect_basic_stats (ACE_Basic_Stats &stats);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index 75efcf6017a..d47dddb16dc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -16,7 +16,7 @@ ORB_Holder::ORB_Holder (int &argc, ACE_TCHAR *argv[],
 {
 }
 
-ORB_Holder::~ORB_Holder (void)
+ORB_Holder::~ORB_Holder ()
 {
   try{
     this->orb_->destroy ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
index bf6af28b4a8..24640eae3dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
@@ -31,11 +31,11 @@ public:
    * @todo This method could benefit from the error logging described
    * in Servant_var.cpp
    */
-  ~ORB_Holder (void);
+  ~ORB_Holder ();
 
   /// Access the underlying ORB, using the canonical CORBA memory
   /// management model
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Implicit conversion to CORBA::ORB_ptr
   /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl
index 7d7371f190a..1add77034d2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE CORBA::ORB_ptr
-ORB_Holder::orb (void)
+ORB_Holder::orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 4fda1aca169..7789e6f28f9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -16,7 +16,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h
index fc7ece30b54..cd19e3a4acc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h
@@ -27,7 +27,7 @@ public:
   ORB_Task (CORBA::ORB_ptr orb);
 
   /// Run the event loop
-  int svc (void);
+  int svc ();
 
   /// Smart-pointer operator
   CORBA::ORB_ptr operator-> () const;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index 9023da05e18..a71ccc09284 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -10,7 +10,7 @@
 #include "ORB_Task_Activator.inl"
 #endif /* __ACE_INLINE__ */
 
-ORB_Task_Activator::~ORB_Task_Activator (void)
+ORB_Task_Activator::~ORB_Task_Activator ()
 {
   if (this->task_ == 0)
     return;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h
index cecd975359e..123e7d6bd4d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.h
@@ -29,7 +29,7 @@ public:
                       ORB_Task *task);
 
   /// Destructor, stop the task and wait for it
-  ~ORB_Task_Activator (void);
+  ~ORB_Task_Activator ();
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 2017a94ba4b..ccd880bebe7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -38,12 +38,12 @@ Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
     RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 }
 
-Peer_Base::~Peer_Base (void)
+Peer_Base::~Peer_Base ()
 {
 }
 
 void
-Peer_Base::shutdown (void)
+Peer_Base::shutdown ()
 {
   {
     EC_Destroyer ec_destroyer (this->event_channel_.in ());
@@ -55,7 +55,7 @@ Peer_Base::shutdown (void)
 }
 
 CORBA::Object_ptr
-Peer_Base::channel (void)
+Peer_Base::channel ()
 {
   return CORBA::Object::_duplicate (this->event_channel_.in ());
 }
@@ -105,7 +105,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
 }
 
 PortableServer::POA_ptr
-Peer_Base::_default_POA (void)
+Peer_Base::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 7d12128f02e..b10fc3c5770 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -31,22 +31,22 @@ public:
              RTServer_Setup &rtserver_setup);
 
   /// Destructor
-  virtual ~Peer_Base (void);
+  virtual ~Peer_Base ();
 
   //@{
   /** @name The Federated_Test::Peer methods
    */
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   virtual CORBA::Object_ptr
-      channel (void);
+      channel ();
 
   virtual void connect (Federated_Test::Peer_ptr remote_peer);
 
   Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
                                                CORBA::Long base_event_type);
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index 00786c73bde..95529604032 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -37,6 +37,6 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
   policy_list[0]->destroy ();
 }
 
-PriorityBand_Setup::~PriorityBand_Setup (void)
+PriorityBand_Setup::~PriorityBand_Setup ()
 {
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
index f0f23d54db3..1b0c6cd0a9d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
@@ -32,7 +32,7 @@ public:
   /**
    * It is a no-op, but it shuts up g++
    */
-  ~PriorityBand_Setup (void);
+  ~PriorityBand_Setup ();
 };
 
 #endif /* TAO_PERF_RTEC_PRIORITYBAND_SETUP_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
index 14a4131bfb2..b3cf176933e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
@@ -37,7 +37,7 @@ public:
   int use_rt_corba () const;
 
   /// Return the underlying RTCORBA_Setup pointer
-  RTCORBA_Setup *rtcorba_setup (void);
+  RTCORBA_Setup *rtcorba_setup ();
 
 private:
   int use_rt_corba_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl
index 42071dbb049..f866c65c836 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl
@@ -11,7 +11,7 @@ RTClient_Setup::use_rt_corba () const
 }
 
 ACE_INLINE RTCORBA_Setup *
-RTClient_Setup::rtcorba_setup (void)
+RTClient_Setup::rtcorba_setup ()
 {
   return this->rtcorba_setup_.get ();
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
index 03f667f3c6b..f84f16b36e3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
@@ -28,7 +28,7 @@ public:
   RTPOA_Setup (CORBA::ORB_ptr orb,
                const RTCORBA_Setup &rtcorba_setup);
 
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl
index 5efd85a0570..8411921e9e4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE PortableServer::POA_ptr
-RTPOA_Setup::poa (void)
+RTPOA_Setup::poa ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
index e47418236c2..1df03597255 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
@@ -31,7 +31,7 @@ public:
                   int nthreads);
 
   /// Return the POA configured by the RTPOA_Setup
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl
index 102c3f7651b..458071902f0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl
@@ -5,7 +5,7 @@
  */
 
 ACE_INLINE PortableServer::POA_ptr
-RTServer_Setup::poa (void)
+RTServer_Setup::poa ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
index 3dd562582f1..1ddb29e57e0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
@@ -13,7 +13,7 @@
 #include "RT_Class.inl"
 #endif /* __ACE_INLINE__ */
 
-RT_Class::RT_Class (void)
+RT_Class::RT_Class ()
   : prc_sched_class_ (ACE_SCHED_FIFO)
   , thr_sched_class_ (THR_SCHED_FIFO)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h
index 09c7381a4d9..053c5b3d8a5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h
@@ -23,7 +23,7 @@ class TAO_RTEC_Perf_Export RT_Class
 {
 public:
   /// Constructor
-  RT_Class (void);
+  RT_Class ();
 
   /** @name Return the test scheduling parameters
    */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 187083f2e32..5461015c222 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -11,7 +11,7 @@
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
 
-Send_Task::Send_Task (void)
+Send_Task::Send_Task ()
   : iterations_ (0)
   , period_in_usecs_ (0)
   , startup_sleep_ (0)
@@ -42,14 +42,14 @@ Send_Task::init (int iterations,
 }
 
 void
-Send_Task::stop (void)
+Send_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->stop_ = 1;
 }
 
 int
-Send_Task::svc (void)
+Send_Task::svc ()
 {
   if (this->barrier_ == 0)
     return -1;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
index fe51de17e49..1a81ac7064e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
@@ -28,7 +28,7 @@ class TAO_RTEC_Perf_Export Send_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Send_Task (void);
+  Send_Task ();
 
   /// This is for compilers that are a PITA complaining that we are
   /// hiding something.
@@ -46,10 +46,10 @@ public:
              ACE_Barrier *barrier);
 
   /// Run the experiment
-  int svc (void);
+  int svc ();
 
   /// Stop the experiment
-  void stop (void);
+  void stop ();
 
 private:
   int iterations_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
index c9f89e370d5..997d86b9029 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
@@ -10,7 +10,7 @@
 #include "Send_Task_Stopper.inl"
 #endif /* __ACE_INLINE__ */
 
-Send_Task_Stopper::~Send_Task_Stopper (void)
+Send_Task_Stopper::~Send_Task_Stopper ()
 {
   if (this->task_ == 0)
     return;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h
index 4ce7b82f017..0bcc0c76555 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.h
@@ -28,7 +28,7 @@ public:
                      Send_Task *task);
 
   /// Destructor, stop the task and wait for it
-  ~Send_Task_Stopper (void);
+  ~Send_Task_Stopper ();
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index dc97130f944..00765d26048 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -52,7 +52,7 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -88,7 +88,7 @@ Supplier::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->proxy_consumer_ =
@@ -96,7 +96,7 @@ Supplier::disconnect_push_supplier (void)
 }
 
 PortableServer::POA_ptr
-Supplier::_default_POA (void)
+Supplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index b60a44281bc..abf5158972d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -38,15 +38,15 @@ public:
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   void push (const RtecEventComm::EventSet &events);
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (void);
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void disconnect_push_supplier ();
+  virtual PortableServer::POA_ptr _default_POA ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index a75014c780a..c45d24df28d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -44,6 +44,6 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb,
   policy_list[0]->destroy ();
 }
 
-SyncScope_Setup::~SyncScope_Setup (void)
+SyncScope_Setup::~SyncScope_Setup ()
 {
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
index 75689632305..818bd412fb7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
@@ -32,7 +32,7 @@ public:
   /**
    * It is a no-op, but it shuts up g++
    */
-  ~SyncScope_Setup (void);
+  ~SyncScope_Setup ();
 
 private:
   /// Implement the shared code between both constructors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp
index 6af0a4eded0..5a0d22ea8d2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.cpp
@@ -41,7 +41,7 @@ Task_Activator<Task>::Task_Activator (int priority,
 }
 
 template<class Task>
-Task_Activator<Task>::~Task_Activator (void)
+Task_Activator<Task>::~Task_Activator ()
 {
   if (this->task_ == 0)
     return;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h
index 5a8f9ecf2b5..51f65fd5895 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h
@@ -63,10 +63,10 @@ public:
    * cooperative termination protocol in the destructor of the derived
    * class.
    */
-  ~Task_Activator (void);
+  ~Task_Activator ();
 
   /// Release the task, do not terminate it
-  void release (void);
+  void release ();
 
 protected:
   Task *task_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index e04a1d22fcd..8627d18ee88 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -1,10 +1,10 @@
 #include "Connection_Manager.h"
 
-Connection_Manager::Connection_Manager (void)
+Connection_Manager::Connection_Manager ()
 {
 }
 
-Connection_Manager::~Connection_Manager (void)
+Connection_Manager::~Connection_Manager ()
 {
 }
 
@@ -214,7 +214,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::find_receivers (void)
+Connection_Manager::find_receivers ()
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -464,7 +464,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (void)
+Connection_Manager::connect_to_sender ()
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -570,9 +570,8 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
   if( streamctrl_any.in() >>= streamctrl )
   {
      // Any still owns the pointer, so we duplicate it
-     AVStreams::StreamCtrl::_duplicate( streamctrl );
-     this->streamctrls_.bind (flowname,
-                             streamctrl);
+     AVStreams::StreamCtrl::_duplicate( streamctrl);
+     this->streamctrls_.bind (flowname, streamctrl);
   }
 }
 
@@ -582,24 +581,23 @@ Connection_Manager::destroy (const ACE_CString &flowname)
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
 
-  this->streamctrls_.unbind (flowname );
-
+  this->streamctrls_.unbind (flowname);
 }
 
 Connection_Manager::Receivers &
-Connection_Manager::receivers (void)
+Connection_Manager::receivers ()
 {
   return this->receivers_;
 }
 
 Connection_Manager::Protocol_Objects &
-Connection_Manager::protocol_objects (void)
+Connection_Manager::protocol_objects ()
 {
   return this->protocol_objects_;
 }
 
 Connection_Manager::StreamCtrls &
-Connection_Manager::streamctrls (void)
+Connection_Manager::streamctrls ()
 {
   return this->streamctrls_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 654488b0b08..1db47f8201c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -36,12 +36,11 @@ class Endpoint_Addresses
 class Connection_Manager
 {
 public:
-
   /// Constructor
-  Connection_Manager (void);
+  Connection_Manager ();
 
   /// Destructor
-  ~Connection_Manager (void);
+  ~Connection_Manager ();
 
   /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
@@ -60,10 +59,10 @@ public:
                        AVStreams::MMDevice_ptr receiver);
 
   /// Connect to the sender that we found.
-  void connect_to_sender (void);
+  void connect_to_sender ();
 
   /// Destroy all streams.
-  void destroy (void);
+  void destroy ();
 
   /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
@@ -85,7 +84,6 @@ public:
           Protocol_Objects;
 
 
-
   // Map of streamctrl.
   typedef ACE_Hash_Map_Manager<ACE_CString,
                                AVStreams::StreamCtrl_var,
@@ -99,17 +97,14 @@ public:
           EP_Addr;
 
   // Map accessors.
-  Receivers &receivers (void);
-  Protocol_Objects &protocol_objects (void);
-  StreamCtrls &streamctrls (void);
+  Receivers &receivers ();
+  Protocol_Objects &protocol_objects ();
+  StreamCtrls &streamctrls ();
 
   void load_ep_addr (const char* file_name);
 
 protected:
-
-
-
-  void find_receivers (void);
+  void find_receivers ();
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 167b84ac85e..1f3f044273f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -41,7 +41,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -79,7 +79,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Distributer_Callback::end_stream\n"));
@@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Distributer::Distributer (void)
+Distributer::Distributer ()
   : sender_name_ ("sender")
   , distributer_name_ ("distributer")
   , done_ (0)
@@ -98,12 +98,12 @@ Distributer::Distributer (void)
 {
 }
 
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
 {
 }
 
 Connection_Manager &
-Distributer::connection_manager (void)
+Distributer::connection_manager ()
 {
   return this->connection_manager_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 687d48db000..9d3ffed6471 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -27,9 +27,8 @@
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Distributer_Receiver_Callback (void);
+  Distributer_Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Count of the frames passing through us.
@@ -112,10 +111,10 @@ class Distributer
 {
 public:
   /// Constructor
-  Distributer (void);
+  Distributer ();
 
   /// Destructor.
-  ~Distributer (void);
+  ~Distributer ();
 
   /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -128,7 +127,7 @@ public:
   void done (int);
 
   /// Accessor to connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
 protected:
   /// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 768ec577f22..607a97e84d1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -70,13 +70,12 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     output_file_name_ (ACE_TEXT ("output")),
     addr_file_ (ACE_TEXT ("addr_file")),
@@ -85,7 +84,7 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -166,7 +165,7 @@ Receiver::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_TString
-Receiver::output_file_name (void)
+Receiver::output_file_name ()
 {
   return this->output_file_name_;
 }
@@ -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/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 32dd67bdff7..863f5d6aafa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -27,9 +27,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -77,10 +76,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -89,7 +88,7 @@ public:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Name of the output file.
-  ACE_TString output_file_name (void);
+  ACE_TString output_file_name ();
 
 protected:
   /// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index eda4570e7eb..8739741efa0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -38,7 +38,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *flowname,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     frame_count_ (0),
     filename_ (ACE_TEXT("input")),
@@ -101,7 +101,6 @@ Sender::init (int argc, ACE_TCHAR *argv[])
     return result;
 
 
-
   // Parse the command line arguments
   result =
     this->parse_args (argc, argv);
@@ -149,7 +148,7 @@ Sender::init (int argc, ACE_TCHAR *argv[])
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -257,7 +256,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
     }
   catch (const CORBA::Exception& ex)
@@ -269,7 +267,7 @@ Sender::pace_data (void)
 }
 
 Connection_Manager &
-Sender::connection_manager (void)
+Sender::connection_manager ()
 {
   return this->connection_manager_;
 }
@@ -306,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/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 9c723e92832..15dc9543efa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -58,17 +58,17 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Accessor to the connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
 private:
   /// Method to parse the command line arguments.
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 87785bb6e65..c4a529fc542 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -33,7 +33,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1),
       mb_ (BUFSIZ)
 {
@@ -103,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -123,7 +123,6 @@ Receiver_Callback::handle_destroy (void)
           ex._tao_print_exception (
             "Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
         }
 
     }
@@ -131,7 +130,7 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     frame_rate_ (30),
     input_file_ (0),
@@ -141,7 +140,7 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -246,13 +245,13 @@ Receiver::init (int argc,
 }
 
 TAO_AV_Protocol_Object*
-Receiver::protocol_object (void)
+Receiver::protocol_object ()
 {
   return this->protocol_object_;
 }
 
 FILE *
-Receiver::input_file (void)
+Receiver::input_file ()
 {
   return this->input_file_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index cabbbcc2e92..e84bb472b2f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -28,9 +28,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -40,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -87,10 +86,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
@@ -100,9 +99,9 @@ public:
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// Set the protocol object corresponding to the transport protocol chosen.
-  TAO_AV_Protocol_Object * protocol_object (void);
+  TAO_AV_Protocol_Object * protocol_object ();
 
-  FILE * input_file (void);
+  FILE * input_file ();
 
 protected:
   /// The Naming Service Client.
@@ -135,5 +134,4 @@ protected:
 
   /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 4ab1e54dc56..0c607516030 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -33,7 +33,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender_Callback::Sender_Callback (void)
+Sender_Callback::Sender_Callback ()
   : frame_count_ (1)
 {
 }
@@ -73,7 +73,7 @@ Sender_Callback::receive_frame (ACE_Message_Block *frame,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -95,13 +95,13 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Sender::eof (void)
+Sender::eof ()
 {
   return this->eof_;
 }
 
 void
-Sender::shutdown (void)
+Sender::shutdown ()
 {
   try
   {
@@ -152,7 +152,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -282,7 +282,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -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/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index bf531089d2b..5bbc4cc5e4a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -27,9 +27,8 @@
 class Sender_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Sender_Callback (void);
+  Sender_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  //  int handle_destroy (void);
+  //  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -87,28 +86,28 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
-  int eof (void);
+  int eof ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index c3639d2f62e..92013d8ce7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -1,11 +1,11 @@
 #include "Connection_Manager.h"
 #include "tao/debug.h"
 
-Connection_Manager::Connection_Manager (void)
+Connection_Manager::Connection_Manager ()
 {
 }
 
-Connection_Manager::~Connection_Manager (void)
+Connection_Manager::~Connection_Manager ()
 {
 }
 
@@ -95,7 +95,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::find_receivers (void)
+Connection_Manager::find_receivers ()
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -159,7 +159,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
 }
 
 void
-Connection_Manager::connect_to_receivers (void)
+Connection_Manager::connect_to_receivers ()
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -316,7 +316,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (void)
+Connection_Manager::connect_to_sender ()
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -394,10 +394,9 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
   {
     // the CORBA::Any_var owns the pointer, so we should
     // _duplicate it before passing it around
-    AVStreams::StreamCtrl::_duplicate( streamctrl );
+    AVStreams::StreamCtrl::_duplicate( streamctrl);
     this->streamctrls_.unbind(flowname);
-    this->streamctrls_.bind (flowname,
-                             streamctrl);
+    this->streamctrls_.bind (flowname, streamctrl);
   }
 }
 
@@ -551,19 +550,19 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
 }
 
 Connection_Manager::Receivers &
-Connection_Manager::receivers (void)
+Connection_Manager::receivers ()
 {
   return this->receivers_;
 }
 
 Connection_Manager::Protocol_Objects &
-Connection_Manager::protocol_objects (void)
+Connection_Manager::protocol_objects ()
 {
   return this->protocol_objects_;
 }
 
 Connection_Manager::StreamCtrls &
-Connection_Manager::streamctrls (void)
+Connection_Manager::streamctrls ()
 {
   return this->streamctrls_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 587edfb50fa..8668d308985 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -32,12 +32,11 @@
 class Connection_Manager
 {
 public:
-
   /// Constructor
-  Connection_Manager (void);
+  Connection_Manager ();
 
   /// Destructor
-  ~Connection_Manager (void);
+  ~Connection_Manager ();
 
   /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
@@ -48,7 +47,7 @@ public:
                           AVStreams::MMDevice_ptr sender);
 
   /// Connect to the receivers that we found.
-  void connect_to_receivers (void);
+  void connect_to_receivers ();
 
   /// Bind receiver to the sender.
   void bind_to_sender (const ACE_CString &sender_name,
@@ -56,7 +55,7 @@ public:
                        AVStreams::MMDevice_ptr receiver);
 
   /// Connect to the sender that we found.
-  void connect_to_sender (void);
+  void connect_to_sender ();
 
   /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
@@ -93,13 +92,12 @@ public:
           StreamCtrls;
 
   // Map accessors.
-  Receivers &receivers (void);
-  Protocol_Objects &protocol_objects (void);
-  StreamCtrls &streamctrls (void);
+  Receivers &receivers ();
+  Protocol_Objects &protocol_objects ();
+  StreamCtrls &streamctrls ();
 
 protected:
-
-  void find_receivers (void);
+  void find_receivers ();
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 535b16c0b06..5a7d703a2e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -9,7 +9,7 @@
 typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
 
 // constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
 {
 }
 
@@ -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,25 +118,22 @@ 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;
-
 }
 
 
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
   : frame_count_ (1)
 {
 }
 
 ACE_CString &
-Distributer_Receiver_Callback::flowname (void)
+Distributer_Receiver_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -181,7 +177,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
 {
   /// Called when the sender requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -196,7 +192,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
 }
 
 ACE_CString &
-Distributer_Sender_Callback::flowname (void)
+Distributer_Sender_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -208,7 +204,7 @@ Distributer_Sender_Callback::flowname (const ACE_CString &flowname)
 }
 
 int
-Distributer_Sender_Callback::handle_destroy (void)
+Distributer_Sender_Callback::handle_destroy ()
 {
   /// Called when the sender requests the stream to be shutdown.
 
@@ -224,7 +220,7 @@ Distributer_Sender_Callback::handle_destroy (void)
   return 0;
 }
 
-Distributer::Distributer (void)
+Distributer::Distributer ()
   : distributer_receiver_mmdevice_ (0),
     sender_name_ ("sender"),
     distributer_name_ ("distributer"),
@@ -233,18 +229,18 @@ Distributer::Distributer (void)
 {
 }
 
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
 {
 }
 
 void
-Distributer::stream_created (void)
+Distributer::stream_created ()
 {
   ++this->stream_count_;
 }
 
 void
-Distributer::stream_destroyed (void)
+Distributer::stream_destroyed ()
 {
   --this->stream_count_;
 
@@ -254,7 +250,7 @@ Distributer::stream_destroyed (void)
 
 
 Connection_Manager &
-Distributer::connection_manager (void)
+Distributer::connection_manager ()
 {
   return this->connection_manager_;
 }
@@ -374,7 +370,7 @@ Distributer::done () const
 }
 
 void
-Distributer::shut_down (void)
+Distributer::shut_down ()
 {
   try
     {
@@ -391,7 +387,6 @@ Distributer::shut_down (void)
                                                                      sender_mmdevice.in ());
 
     //  DISTRIBUTER::instance ()->connection_manager ().destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -439,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/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 1a4a1038377..e4c61ab7f7b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -25,14 +25,11 @@
  */
 class Signal_Handler : public ACE_Event_Handler
 {
-
 public:
-
-  Signal_Handler (void);
+  Signal_Handler ();
 
   /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-
 };
 
 
@@ -46,9 +43,8 @@ public:
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   //// Constructor.
-  Distributer_Receiver_Callback (void);
+  Distributer_Receiver_Callback ();
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -58,10 +54,10 @@ public:
 
   /// Called when the sender is done sending data and wants to close
   /// down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback.
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -83,21 +79,17 @@ private:
  */
 class Distributer_Sender_Callback : public TAO_AV_Callback
 {
-
 public:
-
   //// Called when the sender has finished reading the file and wants
   //// to close down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback.
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
-
   ACE_CString flowname_;
-
 };
 
 /**
@@ -174,10 +166,10 @@ class Distributer
 {
 public:
   //// Constructor
-  Distributer (void);
+  Distributer ();
 
   //// Destructor.
-  ~Distributer (void);
+  ~Distributer ();
 
   //// Initialize data components.
   int init (int argc,
@@ -192,16 +184,16 @@ public:
   void done (bool);
 
   //// Accessor to connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
   //// Called when stream created
-  void stream_created (void);
+  void stream_created ();
 
   //// Called when stream destroyed
-  void stream_destroyed (void);
+  void stream_destroyed ();
 
   ////Unbind the sender and receiver from the Naming Service
-  void shut_down (void);
+  void shut_down ();
 
 protected:
   //// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 49d8fc18d9b..68262b9a5a5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -11,7 +11,7 @@ static int done = 0;
 /// Flag set when a signal is raised.
 
 // constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
 {
 }
 
@@ -68,19 +68,17 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
       /// Store the related streamctrl.
       connection_manager->add_streamctrl (flowname.c_str (),
                                          this);
-
     }
   return 1;
-
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
 
 ACE_CString &
-Receiver_Callback::flowname (void)
+Receiver_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -92,7 +90,7 @@ Receiver_Callback::flowname (const ACE_CString &flowname)
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   /// Called when the sender requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -136,7 +134,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     output_file_name_ ("output"),
     sender_name_ ("distributer"),
@@ -144,19 +142,18 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
-
 }
 
 ACE_CString
-Receiver::sender_name (void)
+Receiver::sender_name ()
 {
   return this->sender_name_;
 }
 
 ACE_CString
-Receiver::receiver_name (void)
+Receiver::receiver_name ()
 {
   return this->receiver_name_;
 }
@@ -247,13 +244,13 @@ Receiver::parse_args (int argc,
 }
 
 ACE_CString
-Receiver::output_file_name (void)
+Receiver::output_file_name ()
 {
   return this->output_file_name_;
 }
 
 void
-Receiver::shut_down (void)
+Receiver::shut_down ()
 {
   try
     {
@@ -264,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/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 681b8c7ebc9..812ab6f7916 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -25,14 +25,11 @@
  */
 class Signal_Handler : public ACE_Event_Handler
 {
-
 public:
-
-  Signal_Handler (void);
+  Signal_Handler ();
 
   /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-
 };
 
 /**
@@ -45,9 +42,8 @@ public:
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   //// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -55,10 +51,10 @@ public:
                      TAO_AV_frame_info *frame_info,
                      const ACE_Addr &peer_address);
 
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback.
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -103,10 +99,10 @@ class Receiver
 {
 public:
   //// Constructor
-  Receiver (void);
+  Receiver ();
 
   //// Destructor.
-  virtual ~Receiver (void);
+  virtual ~Receiver ();
 
   //// Initialize data components.
   int init (int argc,
@@ -117,12 +113,12 @@ public:
                   ACE_TCHAR **argv);
 
   //// Name of the output file.
-  ACE_CString output_file_name (void);
+  ACE_CString output_file_name ();
 
-  ACE_CString sender_name (void);
-  ACE_CString receiver_name (void);
+  ACE_CString sender_name ();
+  ACE_CString receiver_name ();
 
-  void shut_down (void);
+  void shut_down ();
 
 protected:
   //// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index b7b47d1a487..d8a91aecb9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -17,7 +17,7 @@ int g_shutdown = 0;
 /// Flag set when a signal is raised.
 
 // constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
 {
 }
 
@@ -31,13 +31,12 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
                     "In the signal handler\n"));
 
       g_shutdown = 1;
-
     }
   return 0;
 }
 
 ACE_CString &
-Sender_Callback::flowname (void)
+Sender_Callback::flowname ()
 {
   return this->flowname_;
 }
@@ -50,7 +49,7 @@ Sender_Callback::flowname (const ACE_CString &flowname)
 
 
 int
-Sender_Callback::handle_destroy (void)
+Sender_Callback::handle_destroy ()
 {
   SENDER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ());
 
@@ -129,7 +128,7 @@ Sender_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &flowspec)
   return 1;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     frame_count_ (0),
     filename_ ("input"),
@@ -140,7 +139,7 @@ Sender::Sender (void)
 {
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -148,7 +147,7 @@ Sender::~Sender (void)
 }
 
 void
-Sender::shut_down (void)
+Sender::shut_down ()
 {
   try
     {
@@ -157,7 +156,6 @@ Sender::shut_down (void)
 
       SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
                                                                 mmdevice.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -273,7 +271,7 @@ Sender::init (int argc,
 
 /// Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   /// The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -296,7 +294,6 @@ Sender::pace_data (void)
       /// Continue to send data till the file is read to the end.
       while (1)
         {
-
           if (g_shutdown == 1)
             {
               ACE_DEBUG ((LM_DEBUG,
@@ -327,7 +324,6 @@ Sender::pace_data (void)
               this->shut_down ();
 
               break;
-
             }
 
           this->mb_.wr_ptr (n);
@@ -366,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);
-
                 }
             }
 
@@ -397,7 +392,6 @@ Sender::pace_data (void)
 
           /// Reset the message block.
           this->mb_.reset ();
-
         } /// end while
 
     }
@@ -410,25 +404,25 @@ Sender::pace_data (void)
 }
 
 Connection_Manager &
-Sender::connection_manager (void)
+Sender::connection_manager ()
 {
   return this->connection_manager_;
 }
 
 //  void
-//  Sender::add_stream (void)
+//  Sender::add_stream ()
 //  {
 //    this->stream_count_++;
 //  }
 
 //  void
-//  Sender::remove_stream (void)
+//  Sender::remove_stream ()
 //  {
 //    this->stream_count_--;
 //  }
 
 //  int
-//  Sender::stream_alive (void)
+//  Sender::stream_alive ()
 //  {
 //    return this->stream_count_;
 //  }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index c179a105c2b..9d40a9f9312 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -25,14 +25,11 @@
  */
 class Signal_Handler : public ACE_Event_Handler
 {
-
 public:
-
-  Signal_Handler (void);
+  Signal_Handler ();
 
   /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-
 };
 
 
@@ -46,18 +43,16 @@ public:
  */
 class Sender_Callback : public TAO_AV_Callback
 {
-
 public:
-
   /**
    * Called when the sender has finished reading the file and wants
    * to close down the connection. Also called when the distributer
    * tears down the connection when it switches to a new sender.
    */
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Accessor methods for the flowname of the callback
-  ACE_CString &flowname (void);
+  ACE_CString &flowname ();
   void flowname (const ACE_CString &flowname);
 
 private:
@@ -110,22 +105,22 @@ class Sender
 {
 public:
   //// Constructor
-  Sender (void);
+  Sender ();
 
   //// Destructor
-  ~Sender (void);
+  ~Sender ();
 
-  void shut_down (void);
+  void shut_down ();
 
   //// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   //// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   //// Accessor to the connection manager.
-  Connection_Manager &connection_manager (void);
+  Connection_Manager &connection_manager ();
 
 private:
   //// Method to parse the command line arguments.
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 66094a47083..74372401d7c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -1,13 +1,13 @@
 #include "ftp.h"
 
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
   :count_ (0)
 {
 }
 
 int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
 {
   TAO_AV_CORE::instance ()->stop_run ();
   return 0;
@@ -73,7 +73,7 @@ FTP_Client_Callback::handle_timeout (void *)
   return 0;
 }
 
-FTP_Client_Producer::FTP_Client_Producer (void)
+FTP_Client_Producer::FTP_Client_Producer ()
   :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
 {
 }
@@ -155,19 +155,19 @@ Client::parse_args (int argc,
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 const char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_.c_str();
 }
 
 AVStreams::protocolSpec
-Client::protocols (void)
+Client::protocols ()
 {
   AVStreams::protocolSpec protocols (1);
   protocols.length (1);
@@ -178,25 +178,25 @@ Client::protocols (void)
 }
 
 const char *
-Client::format (void)
+Client::format ()
 {
   return "UNS:ftp";
 }
 
 const char *
-Client::address (void)
+Client::address ()
 
 {
   return this->address_.c_str ();
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
-Client::Client (void)
+Client::Client ()
   : fp_ (0),
     protocol_ (ACE_OS::strdup ("UDP")),
     orb_ (TAO_AV_CORE::instance ()->orb ()),
@@ -216,7 +216,6 @@ Client::init (int argc, ACE_TCHAR *argv[])
   CORBA::String_var ior;
   try
     {
-
       PortableServer::POAManager_var mgr
         = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
 
@@ -225,9 +224,9 @@ Client::init (int argc, ACE_TCHAR *argv[])
       this->parse_args (this->argc_, this->argv_);
 
       ACE_NEW_RETURN (this->streamendpoint_a_,
-                      TAO_StreamEndPoint_A, -1 );
+                      TAO_StreamEndPoint_A, -1);
 
-      ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 );
+      ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1);
       this->flowname_ = "Data";
 
       sep_a_ = this->streamendpoint_a_->_this();
@@ -259,7 +258,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   try
     {
@@ -281,7 +280,7 @@ Client::run (void)
                                         this->protocol_,
                                         &addr);
 
-      ACE_INET_Addr peer_addr (this->peer_addr_.c_str ());;
+      ACE_INET_Addr peer_addr (this->peer_addr_.c_str ());
       entry.set_peer_addr (&peer_addr);
 
       flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
@@ -292,7 +291,7 @@ Client::run (void)
 
 
       CORBA::Object_var obj_b = this->orb_->string_to_object("corbaname:rir:#Server_StreamEndPoint_b");
-      AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow ( obj_b.in() );
+      AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow (obj_b.in());
 
       CORBA::Boolean result =
         this->streamctrl_.bind (sep_a_.in(),
@@ -314,7 +313,6 @@ Client::run (void)
       this->orb_->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -354,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/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index ee8214651a8..805f58fd42c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -19,7 +19,7 @@ class FTP_Client_Producer
   :public virtual TAO_FlowProducer
 {
 public:
-  FTP_Client_Producer (void);
+  FTP_Client_Producer ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
   int set_protocol_object (const char *flowname,
@@ -32,9 +32,9 @@ class FTP_Client_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Client_Callback (void);
+  FTP_Client_Callback ();
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
@@ -49,15 +49,15 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Nul
 class Client
 {
 public:
-  Client (void);
+  Client ();
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  const char *flowname (void);
-  TAO_StreamCtrl* streamctrl (void);
-  AVStreams::protocolSpec protocols (void);
-  const char *format (void);
-  const char *address (void);
+  int run ();
+  FILE *file ();
+  const char *flowname ();
+  TAO_StreamCtrl* streamctrl ();
+  AVStreams::protocolSpec protocols ();
+  const char *format ();
+  const char *address ();
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 808d78b1227..1d1d5ffd14c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,6 +1,6 @@
 #include "server.h"
 
-FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
+FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint ()
   :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ())
 {
   AVStreams::protocolSpec protocols (2);
@@ -29,12 +29,12 @@ FTP_Server_FlowEndPoint::get_callback (const char *,
   return 0;
 }
 
-FTP_Server_Callback::FTP_Server_Callback (void)
+FTP_Server_Callback::FTP_Server_Callback ()
 {
 }
 
 int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -62,14 +62,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
 {
   CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
   orb->shutdown ();
   return 0;
 }
 
-Server::Server (void)
+Server::Server ()
   :orb_ (TAO_AV_CORE::instance ()->orb ()),
    poa_ (TAO_AV_CORE::instance ()->poa ())
 {
@@ -78,7 +78,7 @@ Server::Server (void)
 }
 
 AVStreams::protocolSpec
-Server::protocols (void)
+Server::protocols ()
 {
   AVStreams::protocolSpec protocols (2);
   protocols.length (2);
@@ -88,7 +88,7 @@ Server::protocols (void)
 }
 
 const char*
-Server::format (void)
+Server::format ()
 {
   return "UNS:ftp";
 }
@@ -123,7 +123,7 @@ Server::init (int argc,
 
       fep_b_obj_ = this->fep_b_->_this ();
 
-      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
+      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in());
 
      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %C\n", s1.in() ));
 
@@ -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)
     {
@@ -148,7 +146,7 @@ Server::init (int argc,
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   try
     {
@@ -196,7 +194,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE*
-Server::file (void)
+Server::file ()
 {
   return this->fp_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index 0901c0e4e69..3025cc70017 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -15,19 +15,19 @@ class FTP_Server_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Server_Callback (void);
-  virtual int handle_stop (void);
+  FTP_Server_Callback ();
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *,
                              const ACE_Addr &);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
 };
 
 class FTP_Server_FlowEndPoint
   :public TAO_FlowConsumer
 {
 public:
-  FTP_Server_FlowEndPoint (void);
+  FTP_Server_FlowEndPoint ();
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 };
@@ -35,17 +35,17 @@ public:
 class Server
 {
 public:
-  Server (void);
+  Server ();
   int init (int argc,
             ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  AVStreams::protocolSpec protocols (void);
-  CORBA::ORB_ptr orb (void);
+  int run ();
+  FILE *file ();
+  AVStreams::protocolSpec protocols ();
+  CORBA::ORB_ptr orb ();
   void orb (CORBA::ORB_ptr orb_in);
-  PortableServer::POA_ptr poa (void);
+  PortableServer::POA_ptr poa ();
   void poa (PortableServer::POA_ptr poa_in);
-  const char *format (void);
+  const char *format ();
 protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   TAO_Naming_Client my_naming_client_;
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..6b1135648a4 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)
     {
@@ -185,7 +184,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Ping_Recv::Ping_Recv (void)
+Ping_Recv::Ping_Recv ()
   :  TAO_FlowConsumer ("Ping",
                        ping_protocols,
                        "UNS:ping")
@@ -201,13 +200,13 @@ Ping_Recv::get_callback (const char *,
   return 0;
 }
 
-Ping_Recv_Callback::Ping_Recv_Callback (void)
+Ping_Recv_Callback::Ping_Recv_Callback ()
   : count_ (0)
 {
 }
 
 int
-Ping_Recv_Callback::handle_stop (void)
+Ping_Recv_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::stop"));
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
@@ -258,7 +257,7 @@ Ping_Recv_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Ping_Recv_Callback::handle_destroy (void)
+Ping_Recv_Callback::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::destroy\n"));
   return 0;
@@ -266,7 +265,7 @@ Ping_Recv_Callback::handle_destroy (void)
 
 // ****************************************************************
 
-Pong_Send::Pong_Send (void)
+Pong_Send::Pong_Send ()
   :  TAO_FlowProducer ("Pong",
                        pong_protocols,
                        "UNS:pong")
@@ -299,7 +298,7 @@ Pong_Send_Callback::handle_timeout (void *)
 }
 
 int
-Pong_Send_Callback::handle_end_stream (void)
+Pong_Send_Callback::handle_end_stream ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index b5623956b53..70e3d743bef 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -19,12 +19,12 @@
 class Ping_Recv_Callback : public TAO_AV_Callback
 {
 public:
-  Ping_Recv_Callback (void);
-  virtual int handle_stop (void);
+  Ping_Recv_Callback ();
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
                              const ACE_Addr &peer_address = ACE_Addr::sap_any);
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
  protected:
   int count_;
 };
@@ -32,7 +32,7 @@ public:
 class Ping_Recv : public TAO_FlowConsumer
 {
 public:
-  Ping_Recv (void);
+  Ping_Recv ();
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -45,13 +45,12 @@ private:
 class Pong_Send_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Ad-hoc method to send a response outside the context of a
   /// handle_timeout.
   int send_response (ACE_hrtime_t stamp);
 
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
 };
@@ -59,7 +58,7 @@ public:
 class Pong_Send : public TAO_FlowProducer
 {
 public:
-  Pong_Send (void);
+  Pong_Send ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 9911cbb775a..42d6dddf6b4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           mmdevice->add_fdev (pong_fdev.in ());
         }
 
-      orb->run ( );
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
@@ -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)
     {
@@ -203,7 +202,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Pong_Recv::Pong_Recv (void)
+Pong_Recv::Pong_Recv ()
   :  TAO_FlowConsumer ("Pong",
                        pong_protocols,
                        "UNS:pong")
@@ -220,7 +219,7 @@ Pong_Recv::get_callback (const char *,
 }
 
 int
-Pong_Recv_Callback::handle_stop (void)
+Pong_Recv_Callback::handle_stop ()
 {
   // ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::stop"));
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
@@ -260,7 +259,7 @@ Pong_Recv_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Pong_Recv_Callback::handle_destroy (void)
+Pong_Recv_Callback::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::destroy\n"));
   return 0;
@@ -268,7 +267,7 @@ Pong_Recv_Callback::handle_destroy (void)
 
 // ****************************************************************
 
-Ping_Send::Ping_Send (void)
+Ping_Send::Ping_Send ()
   :  TAO_FlowProducer ("Ping",
                        ping_protocols,
                        "UNS:ping")
@@ -284,7 +283,7 @@ Ping_Send::get_callback (const char *,
   return 0;
 }
 
-Ping_Send_Callback::Ping_Send_Callback (void)
+Ping_Send_Callback::Ping_Send_Callback ()
   :count_ (0)
 {
   this->timeout_ = ACE_Time_Value (2);
@@ -303,7 +302,6 @@ Ping_Send_Callback::get_timeout (ACE_Time_Value *&tv,
 int
 Ping_Send_Callback::handle_timeout (void *)
 {
-
   this->count_++;
 
   ACE_DEBUG ((LM_DEBUG, "Ping timeout frame %d\n", this->count_));
@@ -336,7 +334,7 @@ Ping_Send_Callback::handle_timeout (void *)
 }
 
 int
-Ping_Send_Callback::handle_end_stream (void)
+Ping_Send_Callback::handle_end_stream ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
index 637140564ed..065af4f4f5a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -17,17 +17,17 @@
 class Pong_Recv_Callback : public TAO_AV_Callback
 {
 public:
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
                              const ACE_Addr &peer_address = ACE_Addr::sap_any);
-  virtual int handle_destroy (void);
+  virtual int handle_destroy ();
 };
 
 class Pong_Recv : public TAO_FlowConsumer
 {
 public:
-  Pong_Recv (void);
+  Pong_Recv ();
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -40,10 +40,10 @@ private:
 class Ping_Send_Callback : public TAO_AV_Callback
 {
 public:
-  Ping_Send_Callback (void);
+  Ping_Send_Callback ();
 
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
 
@@ -54,13 +54,12 @@ private:
   /// Pre-allocate the message block to send...
   ACE_Message_Block frame_;
   int count_;
-
 };
 
 class Ping_Send : public TAO_FlowProducer
 {
 public:
-  Ping_Send (void);
+  Ping_Send ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 829afe4ed37..0cab42145e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -38,7 +38,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (0)
 {
 }
@@ -126,7 +126,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -140,23 +140,21 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
 
-
 int
 Receiver::init (int,
                 ACE_TCHAR *[])
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 6d15aa43d28..5a6cea84bdc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -18,8 +18,7 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
-  Receiver_Callback (void);
+  Receiver_Callback ();
   /// Constructor.
 
   /// Method that is called when there is data to be received from a
@@ -30,7 +29,7 @@ public:
 
   /// Called when the sender is done sending data and wants to close
   /// down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   /// Set the related stream control for this flow.
   void streamctrl (AVStreams::StreamCtrl_ptr streamctrl);
@@ -41,13 +40,11 @@ private:
 
   /// Related stream control.
   AVStreams::StreamCtrl_ptr streamctrl_;
-
 };
 
 // = AVStreams calls this class during connection setup.
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-
 public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
@@ -62,10 +59,10 @@ private:
 class Receiver
 {
 public:
-  Receiver (void);
+  Receiver ();
   /// Constructor
 
-  ~Receiver (void);
+  ~Receiver ();
   /// Destructor.
 
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 8f559e80797..2acff233303 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -63,7 +63,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   return 1;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -117,7 +117,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -237,10 +237,8 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
-
-
   // The time between two consecutive frames.
   inter_frame_time.set (1 / (double) this->frame_rate_);
 
@@ -331,7 +329,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
       // File reading is complete, destroy the stream.
@@ -386,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/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index b83bbeb5c48..68302f92daa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -53,14 +53,14 @@ SENDER_ENDPOINT_STRATEGY;
 class Sender
 {
 public:
-  Sender (void);
+  Sender ();
   /// Constructor
 
   int init (int argc,
             ACE_TCHAR *argv[]);
   /// Method to initialize the various data components.
 
-  int pace_data (void);
+  int pace_data ();
   /// Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -70,7 +70,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   /// Method to parse the command line arguments.
 
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
   /// Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index ecfa3b10ac3..b367afdda76 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -1,21 +1,20 @@
 #include "ftp.h"
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
   : count_ (0)
 {
 }
 
 int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
 {
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
 }
 
-FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint ()
   : callback_ (0)
 {
-
 }
 
 void
@@ -152,24 +151,24 @@ Client::parse_args (int argc,
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_;
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
-Client::Client (void)
+Client::Client ()
   :endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa (),this),
    client_mmdevice_ (&endpoint_strategy_),
    address_ (ACE_OS::strdup ("224.9.9.2:12345")),
@@ -182,7 +181,6 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-
   try
     {
       // Initialize the naming services
@@ -212,7 +210,6 @@ Client::bind_to_server (const char *name)
 int
 Client::init (int argc, ACE_TCHAR *argv[])
 {
-
   PortableServer::POAManager_var mgr
     = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
 
@@ -245,7 +242,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index ca1ffbe22be..18aa68d2b6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -16,8 +16,8 @@ class FTP_Client_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Client_Callback (void);
-  virtual int handle_end_stream (void);
+  FTP_Client_Callback ();
+  virtual int handle_end_stream ();
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
   virtual int handle_timeout (void *arg);
   virtual void get_timeout (ACE_Time_Value *&tv,
@@ -32,7 +32,7 @@ class FTP_Client_StreamEndPoint
   :public TAO_Client_StreamEndPoint
 {
 public:
-  FTP_Client_StreamEndPoint (void);
+  FTP_Client_StreamEndPoint ();
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -66,12 +66,12 @@ private:
 class Client
 {
 public:
-  Client (void);
+  Client ();
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  char *flowname (void);
-  TAO_StreamCtrl* streamctrl (void);
+  int run ();
+  FILE *file ();
+  char *flowname ();
+  TAO_StreamCtrl* streamctrl ();
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   int bind_to_server (const char *name);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 707c54a2bc7..b81370f01df 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -2,7 +2,7 @@
 
 int done = 0;
 
-FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint (void)
+FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint\n"));
 }
@@ -19,7 +19,7 @@ FTP_Server_StreamEndPoint::get_callback (const char *,
 }
 
 int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -47,14 +47,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::end_stream\n"));
   done = 1;
   return 0;
 }
 
-Server::Server (void)
+Server::Server ()
 {
   reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
                       TAO_AV_CORE::instance ()->poa ());
@@ -66,7 +66,6 @@ Server::init (int argc,
 {
   try
     {
-
       PortableServer::POAManager_var mgr
         = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
 
@@ -116,22 +115,21 @@ Server::init (int argc,
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb();
   try
     {
-
       while( !done )
       {
         CORBA::Boolean wp = orb->work_pending ();
         if (wp)
          {
-              orb->perform_work( );
+              orb->perform_work();
          }
       }
 
-      orb->shutdown( 1 );
+      orb->shutdown(true);
     }
     catch (const CORBA::Exception& ex)
     {
@@ -171,7 +169,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE*
-Server::file (void)
+Server::file ()
 {
   return this->fp_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index a20ed2ce30b..a260b4ae471 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -14,7 +14,7 @@ class FTP_Server_StreamEndPoint
   :public TAO_Server_StreamEndPoint
 {
 public:
-  FTP_Server_StreamEndPoint (void);
+  FTP_Server_StreamEndPoint ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
 };
@@ -23,21 +23,21 @@ class FTP_Server_Callback
   :public TAO_AV_Callback
 {
 public:
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *,
                              const ACE_Addr &);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
 };
 
 class Server
 {
 public:
-  Server (void);
+  Server ();
   int init (int argc,
             ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
+  int run ();
+  FILE *file ();
 protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 2a384f91291..7d435d90afb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -1,13 +1,13 @@
 #include "ftp.h"
 #include "tao/debug.h"
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
   :count_ (0)
 {
 }
 
 int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
 {
   TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
@@ -72,7 +72,7 @@ FTP_Client_Callback::handle_timeout (void *)
   return 0;
 }
 
-FTP_Client_Producer::FTP_Client_Producer (void)
+FTP_Client_Producer::FTP_Client_Producer ()
   :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
 {
 }
@@ -125,26 +125,25 @@ Client::parse_args (int argc, ACE_TCHAR *argv[])
         default:
           ACE_DEBUG ((LM_DEBUG,"Unknown option\n"));
           return -1;
-
         }
     }
   return 0;
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_;
 }
 
 AVStreams::protocolSpec
-Client::protocols (void)
+Client::protocols ()
 {
   AVStreams::protocolSpec protocols (1);
   protocols.length (1);
@@ -155,25 +154,25 @@ Client::protocols (void)
 }
 
 const char *
-Client::format (void)
+Client::format ()
 {
   return "UNS:ftp";
 }
 
 const char *
-Client::address (void)
+Client::address ()
 
 {
   return this->address_;
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
-Client::Client (void)
+Client::Client ()
   : client_mmdevice_ (&endpoint_strategy_),
     fdev_ (0),
     address_ (ACE_OS::strdup ("224.9.9.2:10002")),
@@ -181,7 +180,6 @@ Client::Client (void)
     protocol_ (ACE_OS::strdup ("UDP"))
 {
   endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ());
-
 }
 
 
@@ -273,7 +271,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client::run (void)
+Client::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 7144b72f254..458bdbf8479 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -16,7 +16,7 @@ class FTP_Client_Producer
   :public virtual TAO_FlowProducer
 {
 public:
-  FTP_Client_Producer (void);
+  FTP_Client_Producer ();
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
   int set_protocol_object (const char *flowname,
@@ -29,9 +29,9 @@ class FTP_Client_Callback
   :public TAO_AV_Callback
 {
 public:
-  FTP_Client_Callback (void);
+  FTP_Client_Callback ();
   virtual int handle_timeout (void *arg);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
   virtual void get_timeout (ACE_Time_Value *&tv,
                             void *&arg);
   //  virtual int get_frame (ACE_Message_Block *&block,TAO_AV_frame_info *&frame_info);
@@ -50,15 +50,15 @@ typedef TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer> FTP_Client_FDev;
 class Client
 {
 public:
-  Client (void);
+  Client ();
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  char *flowname (void);
-  TAO_StreamCtrl* streamctrl (void);
-  AVStreams::protocolSpec protocols (void);
-  const char *format (void);
-  const char *address (void);
+  int run ();
+  FILE *file ();
+  char *flowname ();
+  TAO_StreamCtrl* streamctrl ();
+  AVStreams::protocolSpec protocols ();
+  const char *format ();
+  const char *address ();
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   int bind_to_server (const char *name);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 568822bd25d..59ba69be705 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -1,6 +1,6 @@
 #include "server.h"
 
-FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
+FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint ()
   :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (),FTP_SERVER::instance ()->format ())
 {
   AVStreams::protocolSpec protocols (2);
@@ -30,7 +30,7 @@ FTP_Server_FlowEndPoint::get_callback (const char *,
 }
 
 int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -58,7 +58,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_SFP_Callback::end_stream\n"));
   CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
@@ -66,7 +66,7 @@ FTP_Server_Callback::handle_end_stream (void)
   return 0;
 }
 
-// FTP_Server_FDev::FTP_Server_FDev (void)
+// FTP_Server_FDev::FTP_Server_FDev ()
 //   :TAO_FDev ("Data")
 // {
 // }
@@ -86,14 +86,14 @@ FTP_Server_Callback::handle_end_stream (void)
 //   return endpoint->_this ();
 // }
 
-Server::Server (void)
+Server::Server ()
 {
   reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
                            TAO_AV_CORE::instance ()->poa ());
 }
 
 AVStreams::protocolSpec
-Server::protocols (void)
+Server::protocols ()
 {
   AVStreams::protocolSpec protocols (2);
   protocols.length (2);
@@ -103,7 +103,7 @@ Server::protocols (void)
 }
 
 const char*
-Server::format (void)
+Server::format ()
 {
   return "UNS:ftp";
 }
@@ -168,7 +168,7 @@ Server::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   try
     {
@@ -210,7 +210,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 FILE*
-Server::file (void)
+Server::file ()
 {
   return this->fp_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 5cec3a1236f..753935e0b05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -12,18 +12,18 @@ class FTP_Server_Callback
   :public TAO_AV_Callback
 {
 public:
-  virtual int handle_stop (void);
+  virtual int handle_stop ();
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info,
                              const ACE_Addr &);
-  virtual int handle_end_stream (void);
+  virtual int handle_end_stream ();
 };
 
 class FTP_Server_FlowEndPoint
   :public TAO_FlowConsumer
 {
 public:
-  FTP_Server_FlowEndPoint (void);
+  FTP_Server_FlowEndPoint ();
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 };
@@ -32,7 +32,7 @@ public:
 //   :public TAO_FDev
 // {
 // public:
-//   FTP_Server_FDev (void);
+//   FTP_Server_FDev ();
 //   virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
 //                                                        AVStreams::QoS & the_qos,
 //                                                        CORBA::Boolean_out met_qos,
@@ -48,13 +48,13 @@ typedef TAO_FDev <TAO_FlowProducer, FTP_Server_FlowEndPoint> FTP_Server_FDev;
 class Server
 {
 public:
-  Server (void);
+  Server ();
   int init (int argc,
             ACE_TCHAR *argv[]);
-  int run (void);
-  FILE *file (void);
-  AVStreams::protocolSpec protocols (void);
-  const char *format (void);
+  int run ();
+  FILE *file ();
+  AVStreams::protocolSpec protocols ();
+  const char *format ();
 protected:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 15f68fb1acb..e7989d81d56 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -40,7 +40,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1),
       mb_ (BUFSIZ)
 {
@@ -66,7 +66,6 @@ Receiver_Callback::flowname (const char* flow_name)
                 "%C File Opened Successfully\n",
                 this->flowname_.c_str ()));
 
-
 }
 
 int
@@ -104,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -115,7 +114,7 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0),
     frame_rate_ (30),
     frame_count_ (0),
@@ -124,7 +123,7 @@ Receiver::Receiver (void)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -217,7 +216,7 @@ Receiver::init (int argc,
 }
 
 TAO_AV_Protocol_Object*
-Receiver::protocol_object (void)
+Receiver::protocol_object ()
 {
   return this->protocol_object_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index 83448da9579..0f5cdd0207e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -28,9 +28,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -40,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   void flowname (const char*);
 
@@ -55,7 +54,6 @@ private:
 
   /// File handle of the file into which received data is written.
   FILE *output_file_;
-
 };
 
 /**
@@ -90,10 +88,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
@@ -103,7 +101,7 @@ public:
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// Set the protocol object corresponding to the transport protocol chosen.
-  TAO_AV_Protocol_Object * protocol_object (void);
+  TAO_AV_Protocol_Object * protocol_object ();
 
 protected:
   /// The Naming Service Client.
@@ -133,5 +131,4 @@ protected:
 
   /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 805b34997c8..bcd859a1f5b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -52,7 +52,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 void
-Sender::shutdown (void)
+Sender::shutdown ()
 {
   // File reading is complete, destroy the stream.
   AVStreams::flowSpec stop_spec;
@@ -60,7 +60,6 @@ Sender::shutdown (void)
 
       // Shut the orb down.
   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
 }
 
 int
@@ -97,7 +96,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -229,7 +228,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -335,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/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index e26e31aa300..1d1c5311c02 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -61,26 +61,26 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
@@ -117,5 +117,4 @@ private:
 
   /// Protocol object corresponding to the transport protocol selected.
   ProtocolObject_Set protocol_object_;
-
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 4767b8cb342..034592b6f83 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -9,11 +9,11 @@ ACE_High_Res_Timer last_frame_sent_time;
 ACE_Time_Value inter_frame_time;
 // The time that should lapse between two consecutive frames sent.
 
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
 {
 }
 
-FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint ()
 {
 }
 
@@ -36,7 +36,7 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Client::Client (void)
+Client::Client ()
   :client_mmdevice_ (&endpoint_strategy_),
    count_ (0),
    address_ (0),
@@ -99,26 +99,26 @@ Client::parse_args (int argc,
 }
 
 FILE *
-Client::file (void)
+Client::file ()
 {
   return this->fp_;
 }
 
 char*
-Client::flowname (void)
+Client::flowname ()
 {
   return this->flowname_;
 }
 
 TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
 {
   return &this->streamctrl_;
 }
 
 
 int
-Client::frame_rate (void)
+Client::frame_rate ()
 {
   return this->frame_rate_;
 }
@@ -126,7 +126,7 @@ Client::frame_rate (void)
 
 // Method to get the object reference of the server
 int
-Client::bind_to_server (void)
+Client::bind_to_server ()
 {
   // Initialize the naming services
   if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -278,9 +278,8 @@ Client::init (int argc,
 
 // Method to send data at the specified rate
 int
-Client::pace_data (void)
+Client::pace_data ()
 {
-
   // Rate at which frames of data need to be sent.
   this->frame_rate_ = CLIENT::instance ()->frame_rate ();
 
@@ -303,7 +302,6 @@ Client::pace_data (void)
 
   try
     {
-
       // Continue to send data till the file is read to the end.
       while (1)
         {
@@ -377,7 +375,6 @@ Client::pace_data (void)
 
           // Reset the mb.
           this->mb.reset ();
-
         } // end while
 
       // Since the file is read stop the stream.
@@ -386,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/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index bc2d2f3a855..f7d997fb99c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -11,7 +11,6 @@
 //=============================================================================
 
 
-
 #ifndef TAO_AV_FTP_H
 #define TAO_AV_FTP_H
 
@@ -36,7 +35,7 @@ class FTP_Client_Callback : public TAO_AV_Callback
 {
 public:
   ///Constructor
-  FTP_Client_Callback (void);
+  FTP_Client_Callback ();
 };
 
 
@@ -51,10 +50,9 @@ public:
  */
 class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
-
 public:
   /// Constructor
-  FTP_Client_StreamEndPoint (void);
+  FTP_Client_StreamEndPoint ();
 
   /// Create the application client callback and return its handle to the
   /// AVStreams for further application callbacks
@@ -85,7 +83,7 @@ class Client
 {
 public:
   /// Constructor
-  Client (void);
+  Client ();
 
   /// Method to initialize the various data components.
   int init (int argc,
@@ -95,26 +93,26 @@ public:
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// File handle from which data is read to be sent.
-  FILE *file (void);
+  FILE *file ();
 
   /// The stream control interface that manages the stream set up
-  TAO_StreamCtrl* streamctrl (void);
+  TAO_StreamCtrl* streamctrl ();
 
   /// name of the flow set up.
-  char *flowname (void);
+  char *flowname ();
 
   /// The requested frame rate for sending each frame of data read from the file.
-  int frame_rate (void);
+  int frame_rate ();
 
 private:
   /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the ftp client to the server
-  int bind_to_server (void);
+  int bind_to_server ();
 
   /// The reacfive strategy of the client.
   ENDPOINT_STRATEGY endpoint_strategy_;
@@ -163,7 +161,6 @@ private:
 
   /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object* protocol_object_;
-
 };
 
 typedef ACE_Unmanaged_Singleton<Client,ACE_Null_Mutex> CLIENT;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 27c0cc9c762..7dfca4aa58d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -51,7 +51,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-FTP_Server_Callback::handle_destroy (void)
+FTP_Server_Callback::handle_destroy ()
 {
   // Called when the ftp client requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -60,12 +60,12 @@ FTP_Server_Callback::handle_destroy (void)
   return 0;
 }
 
-Server::Server (void)
+Server::Server ()
   : mmdevice_ (0)
 {
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
   delete this->mmdevice_;
 }
@@ -187,13 +187,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       while ( !done )
       {
-        if ( orb->work_pending( ) )
+        if ( orb->work_pending())
         {
           orb->perform_work ();
         }
       }
 
-      orb->shutdown( 1 );
+      orb->shutdown(1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 9e79d0ccaea..fea72eda173 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -26,9 +26,7 @@
  */
 class FTP_Server_Callback : public TAO_AV_Callback
 {
-
 public:
-
   // Method that is called when there is data to be received from the ftp client.
   int receive_frame (ACE_Message_Block *frame,
                      TAO_AV_frame_info *frame_info,
@@ -36,7 +34,7 @@ public:
 
   // Called when the ftp client has finished reading the file and wants
   // to close4 down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 };
 
 /**
@@ -71,10 +69,10 @@ class Server
 {
 public:
   /// Constructor
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index fd8a2e09260..f52576c9482 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -19,7 +19,7 @@ TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
 
 
 int
-TimeStamp_Protocol_Object::handle_input (void)
+TimeStamp_Protocol_Object::handle_input ()
 {
   ssize_t n = this->transport_->recv (this->frame_->rd_ptr (),
                                       this->frame_->size ());
@@ -33,7 +33,7 @@ TimeStamp_Protocol_Object::handle_input (void)
 }
 
 //  int
-//  TimeStamp_Protocol_Object::handle_input (void)
+//  TimeStamp_Protocol_Object::handle_input ()
 //  {
 //    iovec iov;
 //    int iovcnt;
@@ -88,7 +88,6 @@ TimeStamp_Protocol_Object::handle_input (void)
 //        }
 //      else
 //        {
-
 //      ACE_DEBUG ((LM_DEBUG,
 //                  "(%N|%l) Frame Size %d\n",
 //                  n));
@@ -168,18 +167,18 @@ TimeStamp_Protocol_Object::send_frame (const char* buf,
 
 /// end the stream.
 int
-TimeStamp_Protocol_Object::destroy (void)
+TimeStamp_Protocol_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   return 0;
 }
 
 
-TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory (void)
+TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory ()
 {
 }
 
-TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory (void)
+TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory ()
 {
 }
 
@@ -237,5 +236,3 @@ ACE_STATIC_SVC_DEFINE (TimeStamp_Protocol_Factory,
 
 
 
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index f940cb1133a..4e0b055a32f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -16,7 +16,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
   TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
                              TAO_AV_Transport *transport);
 
-  virtual int handle_input (void);
+  virtual int handle_input ();
 
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
@@ -30,7 +30,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
                           size_t len);
 
   /// end the stream.
-  virtual int destroy (void);
+  virtual int destroy ();
 
  private:
   /// Pre-allocated memory to receive the data...
@@ -41,8 +41,8 @@ class TAO_TS_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac
 {
  public:
   /// Initialization hook.
-  TimeStamp_Protocol_Factory (void);
-  virtual ~TimeStamp_Protocol_Factory (void);
+  TimeStamp_Protocol_Factory ();
+  virtual ~TimeStamp_Protocol_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int match_protocol (const char *flow_string);
   // Note : Some platforms still don't support Covariant returns
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index e470d872208..77b08b6b154 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -20,7 +20,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -68,7 +68,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -78,12 +78,12 @@ Receiver_Callback::handle_destroy (void)
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 1d8ccea084b..872f4213484 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -27,9 +27,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -77,10 +76,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index ec3f5548c13..330e26f925e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -85,7 +85,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -205,7 +205,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -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/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index e1e92fced3c..806320d3b2d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -58,14 +58,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -75,7 +75,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/README b/TAO/orbsvcs/tests/AVStreams/README
index 0da167d0893..f8afb0c5fe8 100644
--- a/TAO/orbsvcs/tests/AVStreams/README
+++ b/TAO/orbsvcs/tests/AVStreams/README
@@ -1,5 +1,3 @@
-
-
 TAO Audio/Video Streaming service
 ---------------------------------
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 08e7e6c15ab..364a896a791 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -39,7 +39,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -69,7 +69,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
 {
   // Called when the sender requests the stream to be shutdown.
   try
@@ -104,12 +104,12 @@ Distributer::sender_protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 TAO_AV_Protocol_Object *
-Distributer::sender_protocol_object (void)
+Distributer::sender_protocol_object ()
 {
   return this->sender_protocol_object_;
 }
 
-Distributer::Distributer (void)
+Distributer::Distributer ()
   : distributer_receiver_mmdevice_ (0),
     distributer_sender_mmdevice_ (0),
     sender_protocol_object_ (0),
@@ -119,7 +119,7 @@ Distributer::Distributer (void)
 {
 }
 
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
 {
 }
 
@@ -263,7 +263,7 @@ Distributer::init (int /*argc*/,
 }
 
 TAO_StreamCtrl *
-Distributer::receiver_streamctrl (void)
+Distributer::receiver_streamctrl ()
 {
   return this->receiver_streamctrl_;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 071fc07d339..fa3ac21e854 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -27,9 +27,8 @@
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Distributer_Receiver_Callback (void);
+  Distributer_Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Count of the frames passing through us.
@@ -112,10 +111,10 @@ class Distributer
 {
 public:
   /// Constructor
-  Distributer (void);
+  Distributer ();
 
   /// Destructor.
-  ~Distributer (void);
+  ~Distributer ();
 
   /// Initialize data components.
   int init (int argc,
@@ -126,11 +125,11 @@ public:
                          const ACE_CString &mmdevice_name);
 
   /// Get the stream control of the receiver
-  TAO_StreamCtrl *receiver_streamctrl (void);
+  TAO_StreamCtrl *receiver_streamctrl ();
 
   /// Accessor methods to set/get our sender protocol object
   int sender_protocol_object  (TAO_AV_Protocol_Object *object);
-  TAO_AV_Protocol_Object *sender_protocol_object (void);
+  TAO_AV_Protocol_Object *sender_protocol_object ();
 
   // Flag to know when we are done.
   int done () const;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index c5d8103778f..01c127152ad 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (1)
 {
 }
@@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -70,18 +70,17 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index 1d8ccea084b..872f4213484 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -27,9 +27,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -39,7 +38,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -77,10 +76,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 740430dec90..b874d5fb03c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -50,7 +50,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -171,7 +171,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -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_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 6b3e764d532..7b3a97863aa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -58,14 +58,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 26ad37fdce5..83dfc47aa97 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -7,7 +7,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 void
 Receiver_Stats::accumulate (const Receiver_Stats &rhs)
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
index 8fb1f0083e1..3ca0e7fa23a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
@@ -33,7 +33,7 @@ public:
    * The number of samples is pre-allocated, and cannot changes once
    * the class is initialized.
    */
-  Receiver_Stats (void);
+  Receiver_Stats ();
 
   /// The number of samples received so far
   ACE_UINT32 samples_count () const;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
index cde3e4b96ea..e27a75f3a6e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
@@ -1,5 +1,5 @@
 ACE_INLINE
-Receiver_Stats::Receiver_Stats (void)
+Receiver_Stats::Receiver_Stats ()
   : samples_count_ (0)
   , min_ (0)
   , min_at_ (0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index d1ee8185118..65b377646a3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (0)
 {
 }
@@ -115,7 +115,7 @@ Receiver_Callback::dump_samples (const char* file)
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -131,18 +131,17 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
@@ -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/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 21a7eece79a..c1ecdd5966c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -28,9 +28,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -40,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
   void dump_samples (const char* file);
 
@@ -49,7 +48,6 @@ private:
   int frame_count_;
 
   Receiver_Stats stats_;
-
 };
 
 /**
@@ -69,7 +67,6 @@ public:
 private:
   /// Receiver application callback.
   Receiver_Callback callback_;
-
 };
 
 /**
@@ -84,10 +81,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
@@ -104,6 +101,4 @@ protected:
 
   /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-
-
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 48b4b51d641..1ef57c5fc35 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -32,7 +32,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -139,7 +139,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -290,7 +290,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -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/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 54c3a285e89..dfd7069736a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -58,14 +58,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -75,7 +75,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
@@ -129,5 +129,4 @@ private:
   int num_peer_sec_addrs_;
 
   long max_frame_count_;
-
 };
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 a4b8f17c4d0..1dda9921bb7 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
@@ -18,7 +18,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
   return 0;
 }
 
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
   : frame_count_ (0)
 {
 }
@@ -57,7 +57,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 }
 
 int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
 {
   // Called when the distributer requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
@@ -71,23 +71,21 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
 }
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : mmdevice_ (0)
 {
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
 }
 
 
-
 int
 Receiver::init (int,
                 ACE_TCHAR *[])
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 89a97c1a1cd..39981ceb659 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -28,9 +28,8 @@
 class Receiver_Callback : public TAO_AV_Callback
 {
 public:
-
   /// Constructor.
-  Receiver_Callback (void);
+  Receiver_Callback ();
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -40,7 +39,7 @@ public:
 
   // Called when the sender is done sending data and wants to close
   // down the connection.
-  int handle_destroy (void);
+  int handle_destroy ();
 
 private:
   /// Keeping a count of the incoming frames.
@@ -78,10 +77,10 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   /// Destructor.
-  ~Receiver (void);
+  ~Receiver ();
 
   /// Initialize data components.
   int init (int argc,
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 0c9d41de402..e75a3ebf319 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
@@ -56,7 +56,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-Sender::Sender (void)
+Sender::Sender ()
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
@@ -183,7 +183,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -340,10 +340,8 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (void)
+Sender::pace_data ()
 {
-
-
   // The time between two consecutive frames.
   inter_frame_time.set (1.0 / this->frame_rate_);
 
@@ -466,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/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index c3a323f966f..36c44d8c2f2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -60,14 +60,14 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender ();
 
   /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Method to pace and send data from a file.
-  int pace_data (void);
+  int pace_data ();
 
   /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -80,7 +80,7 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
   /// Method that binds the sender to the receiver.
-  int bind_to_receiver (void);
+  int bind_to_receiver ();
 
   /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 37148f5d58f..cbe94d65983 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -11,15 +11,14 @@ class Time_impl :
 {
 public:
   virtual TimeModule::TimeOfDay
-    get_gmt (void);
+    get_gmt ();
 
-  void Shutdown (void);
+  void Shutdown ();
 };
 
 
-TimeModule::TimeOfDay Time_impl::get_gmt (void)
+TimeModule::TimeOfDay Time_impl::get_gmt ()
 {
-
   time_t time_now   = ACE_OS::time(0);
   struct tm *time_p = ACE_OS::gmtime(&time_now);
 
@@ -33,7 +32,7 @@ TimeModule::TimeOfDay Time_impl::get_gmt (void)
 }
 
 void
-Time_impl::Shutdown (void)
+Time_impl::Shutdown ()
 {
   ACE_OS::exit(0);
 }
@@ -41,7 +40,6 @@ Time_impl::Shutdown (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize orb
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index 64e3ab0b89a..ff10ea68735 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -28,13 +28,13 @@ Test_i::Test_i (CORBA::ORB_ptr orb) :
     }
 }
 
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
   this->policies_[0]->destroy ();
 }
 
 int
-Test_i::try_and_create_POA (void)
+Test_i::try_and_create_POA ()
 {
   try
     {
@@ -62,7 +62,7 @@ Test_i::try_and_create_POA (void)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
    orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index cc58a7f592a..8170db6196d 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -13,12 +13,12 @@ public:
    Test_i (CORBA::ORB_ptr orb);
 
    /// Destructor
-   ~Test_i (void);
+   ~Test_i ();
 
    /// Try and create a persistant POA
-   int try_and_create_POA (void);
+   int try_and_create_POA ();
 
-   void shutdown (void);
+   void shutdown ();
 
 protected:
    CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index e5be4e90c2f..77444fc3533 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -52,7 +52,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index 402016611d7..22d2ae7e2a2 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -45,7 +45,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Add an operation to the interface.
       // First get some useful things.
       //
-      ACE_DEBUG((LM_DEBUG, ". Get primitive (void)\n"));
+      ACE_DEBUG((LM_DEBUG, ". Get primitive ()\n"));
       CORBA::PrimitiveDef_var voidPrimitive =
          ifr->get_primitive( CORBA::pk_void) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (char)\n"));
@@ -115,7 +115,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                       contextIds) ;
 
 
-
       // Create operation list.
       //
       CORBA::NVList_var opList ;
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index c3e99f7402e..8f6b6f604db 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -8,20 +8,19 @@
 #include "orbsvcs/CosNamingC.h"
 
 
-
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
   {
     CORBA::Object_var ncRef =
         orb_->string_to_object(
-            "corbaloc:iiop:10.175.12.99:15025/NameService" );
+            "corbaloc:iiop:10.175.12.99:15025/NameService");
 
     CORBA::PolicyList policies;
 
@@ -32,8 +31,7 @@ ORB_Task::svc (void)
 
     policies.length(1);
     policies[0] = orb_->create_policy(
-      Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-      timeoutAny );
+      Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeoutAny);
 
     CORBA::Object_var object = ncRef->_set_policy_overrides(
       policies, CORBA::SET_OVERRIDE );
@@ -41,7 +39,7 @@ ORB_Task::svc (void)
     policies[0]->destroy();
 
     CosNaming::NamingContext_var namingContext =
-      CosNaming::NamingContext::_narrow( object.in() );
+      CosNaming::NamingContext::_narrow( object.in());
     namingContext->_non_existent();
   }
   catch ( const CORBA::TRANSIENT&)
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index 511c16107ea..4a29671bfd8 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
@@ -15,12 +15,11 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  int init (void);
+  int init ();
   // Initialize the ORB etc.
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index ee0007dd5bc..31316978ce2 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -79,7 +79,6 @@ int
 ACE_TMAIN (int argc,
       ACE_TCHAR *argv[])
 {
-
   Manager manager;
 
   try
@@ -118,7 +117,7 @@ ACE_TMAIN (int argc,
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
   :orb_ (0),
    merged_set_ (0)
 {
@@ -147,7 +146,7 @@ Manager::init (int argc,
 }
 
 int
-Manager::make_merged_iors (void)
+Manager::make_merged_iors ()
 {
   // First  server
   object_primary =
@@ -187,7 +186,7 @@ Manager::make_merged_iors (void)
 }
 
 int
-Manager::set_properties (void)
+Manager::set_properties ()
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -229,7 +228,7 @@ Manager::set_properties (void)
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   try
     {
@@ -246,7 +245,7 @@ Manager::run (void)
 }
 
 int
-Manager::write_to_file (void)
+Manager::write_to_file ()
 {
   //
   CORBA::String_var iorref =
@@ -268,7 +267,7 @@ Manager::write_to_file (void)
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return this->orb_.in ();
 }
@@ -513,7 +512,7 @@ int run_full_shutdown_test (Simple_Server_ptr server)
 }
 
 int
-Client_i::init (void)
+Client_i::init ()
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 540af93a4ae..74eb1df0b67 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -13,8 +13,7 @@
 class Manager
 {
 public:
-
-  Manager (void);
+  Manager ();
   // Ctor
 
   void init (int argc,
@@ -22,19 +21,19 @@ public:
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (void);
+  int make_merged_iors ();
   // Merges the different IORS
 
-  int set_properties (void);
+  int set_properties ();
   // Sets the properties for the profiles
 
-  int run (void);
+  int run ();
   // Run the  ORB event loop..
 
-  int write_to_file (void);
+  int write_to_file ();
   // Write the merged IOR to a file
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
   // Return the pointer to the copy of our ORB
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
index 16a49ae7da4..5d95c8c9c61 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
@@ -102,7 +102,7 @@ sub run_single {
         $status = 1;
     }
 
-    $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval());
+    $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval(), {self_crash => 1});
 
     if ($server1_status != 0) {
         print STDERR "ERROR: server 1 returned $server_status\n";
@@ -183,14 +183,14 @@ sub run_merged {
         $status = 1;
     }
 
-    $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval() + 5);
+    $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval() + 5, {self_crash => 1});
 
     if ($server1_status != 0) {
         print STDERR "ERROR: server 1 returned $server_status\n";
         $status = 1;
     }
 
-    $server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval() + 5);
+    $server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval() + 5, {self_crash => 1});
 
     if ($server_status != 0) {
         print STDERR "ERROR: server 2 returned $server_status\n";
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_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 2979804966c..73da3a1b889 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, const char* key)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 char*
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%C)> executing remote_call()\n", _key.in()));
 
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index d19daef2f93..87404054b51 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -15,11 +15,11 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb, const char* key);
   // ctor
 
-  Simple_Server_i (void);
+  Simple_Server_i ();
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (void);
+  char* remote_call ();
 
   char* shutdown (const char* key);
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index 59a997ec94b..f3cd250942b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -26,11 +26,10 @@ public:
   Client_i (CORBA::ORB_ptr orb);
 
   /// Initialize the ORB etc.
-  int init (void);
+  int init ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index ab461eda26e..4472202635c 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 
 #include "Server_Request_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
   : server_interceptor_ ()
 {
 }
@@ -37,7 +37,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index ed531adfc9e..d8ca966bf5b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
@@ -39,9 +39,8 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -49,10 +48,9 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
-
   /// Pointer to the server request interceptor.  ORB is responsible
   /// for storage.
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index 0795ed687ce..c84ab8e88c8 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -6,12 +6,12 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
     : request_forwarded_ (0)
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
@@ -23,13 +23,13 @@ Server_Request_Interceptor::forward_reference (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -38,7 +38,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr //
     )
 {
-
 }
 
 void
@@ -91,8 +90,6 @@ Server_Request_Interceptor::receive_request (
           "object_group_ref_version is %d\n", group_component.object_group_ref_version));
         }
     }
-
-  return;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index 38b1816f083..7b752e9d8b3 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -33,12 +33,11 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_reference (const char* iorstr);
@@ -53,9 +52,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -74,7 +73,6 @@ public:
   //@}
 
 private:
-
   /// References to the two objects used in this test.
   CORBA::String_var iorstr_;
     int request_forwarded_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 2e3634eef67..99e5e9ab739 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -112,7 +112,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
 {
   //no-op
 }
@@ -139,7 +139,7 @@ Manager::init (int& argc,
 }
 
 int
-Manager::make_merged_iors (void)
+Manager::make_merged_iors ()
 {
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
@@ -260,7 +260,7 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   try
     {
@@ -308,7 +308,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const ACE_TCHAR *ior_output_file)
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return this->orb_.in ();
 }
@@ -448,7 +448,7 @@ int run_test (Simple_Server_ptr server)
 }
 
 int
-Client_i::init (void)
+Client_i::init ()
 {
   char iogrstr[1024];
   ACE_OS::sprintf (iogrstr, "file://%s", ACE_TEXT_ALWAYS_CHAR (first_iogr_file));
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index f8241ccd2f4..047620f5d42 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -12,8 +12,7 @@
 class Manager
 {
 public:
-
-  Manager (void);
+  Manager ();
   // Ctor
 
   void init (int& argc,
@@ -21,20 +20,19 @@ public:
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (void);
+  int make_merged_iors ();
   // Merges the different IORS
 
   /// Run the  ORB event loop..
-  int run (void);
+  int run ();
 
   /// Write the merged IOGRs to a file
-  int write_to_files (void);
+  int write_to_files ();
 
   /// Return the pointer to the copy of our ORB
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
-
   /// Write the merged IOGRs to a file
   int write_to_file (CORBA::Object_ptr ior, const ACE_TCHAR* ior_output_file);
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
index 5b03a2c6a1d..0a37ebe4341 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
@@ -150,14 +150,14 @@ if ($client_status != 0) {
     $status = 1;
 }
 
-$server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval());
+$server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval(), {self_crash => 1});
 
 if ($server_status < 0) {
     print STDERR "ERROR: server 1 returned $server_status\n";
     $status = 1;
 }
 
-$server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval());
+$server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval(), {self_crash => 1});
 
 if ($server_status < 0) {
     print STDERR "ERROR: server 2 returned $server_status\n";
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index b029a16325a..8db5270df68 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -47,8 +47,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
-
   try
     {
       Server_ORBInitializer *temp_initializer = 0;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index 306ab9f96e6..0ff6c3fa130 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, const char* key)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 char*
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%C)> executing remote_call()\n", _key.in()));
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 392ba9fcdea..5b6e84639df 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -15,11 +15,11 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb, const char* key);
   // ctor
 
-  Simple_Server_i (void);
+  Simple_Server_i ();
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (void);
+  char* remote_call ();
 
   char* shutdown (const char* key);
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index e0dafe75c04..a47abab6868 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -11,19 +11,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Hello::throw_exception (void)
+Hello::throw_exception ()
 {
   throw Test::MyException ();
 }
@@ -38,7 +38,7 @@ Hello::call_me_back (Test::Hello_ptr me)
 
 // Nested sequence step 2 - This op called by the server on the client
 CORBA::Boolean
-Hello::call_back (void)
+Hello::call_back ()
 {
   CORBA::Boolean result = server_->check_request_id ();
   return result;
@@ -46,7 +46,7 @@ Hello::call_back (void)
 
 // Nested sequence step 3 - This op called by the client on the server
 CORBA::Boolean
-Hello::check_request_id (void)
+Hello::check_request_id ()
 {
   // The server request interceptor will have set this public static member
   // false if the same retention id has been used twice
@@ -54,7 +54,7 @@ Hello::check_request_id (void)
 }
 
 CORBA::ULong
-Hello::drop_down_dead (void)
+Hello::drop_down_dead ()
 {
   return server_id_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index aa5305f1866..5b58bbb8183 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -19,19 +19,19 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void throw_exception (void);
+  virtual void throw_exception ();
 
   virtual CORBA::Boolean call_me_back (Test::Hello_ptr me);
 
-  virtual CORBA::Boolean call_back (void);
+  virtual CORBA::Boolean call_back ();
 
-  virtual CORBA::Boolean check_request_id (void);
+  virtual CORBA::Boolean check_request_id ();
 
-  virtual CORBA::ULong drop_down_dead (void);
+  virtual CORBA::ULong drop_down_dead ();
 
   static CORBA::Boolean ids_differ_;
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index 03d34cf3108..34d392ea77e 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -9,7 +9,6 @@ void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
 {
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index 407a3fbf348..2e0996ae463 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -23,17 +23,14 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
          PortableInterceptor::ORBInitInfo_ptr info);
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index b23cba1c322..1d41831d853 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -9,7 +9,6 @@ void
 Server_ORBInitializer2::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
 {
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index f129227aee5..370c4c2d481 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -23,17 +23,14 @@ class Server_ORBInitializer2 :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
          PortableInterceptor::ORBInitInfo_ptr info);
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index 27b6c365b28..97b3505f83b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -11,25 +11,25 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor ()
 : orb_ (0),
   client_id_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor ()
 {
 }
 
 
 char *
-TAO249_ServerRequest_Interceptor::name (void)
+TAO249_ServerRequest_Interceptor::name ()
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor");
 }
 
 void
-TAO249_ServerRequest_Interceptor::destroy (void)
+TAO249_ServerRequest_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index 2377c6e4250..00bd3d8fea5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -22,12 +22,11 @@ class TAO249_ServerRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
-
 /// Constructor.
-TAO249_ServerRequest_Interceptor (void);
+TAO249_ServerRequest_Interceptor ();
 
 /// Destructor.
-~TAO249_ServerRequest_Interceptor (void);
+~TAO249_ServerRequest_Interceptor ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -39,9 +38,9 @@ TAO249_ServerRequest_Interceptor (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void);
+virtual char * name ();
 
-virtual void destroy (void);
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -59,7 +58,6 @@ virtual void send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 private:
-
 CORBA::ORB_var orb_;
 
 CORBA:: Long client_id_;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index c2425cca81a..50f3f99a44f 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -13,25 +13,25 @@
 #include "Hello.h"
 #include "ace/OS_NS_sys_time.h"
 
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 ()
 : orb_ (0),
   client_id_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 ()
 {
 }
 
 
 char *
-TAO249_ServerRequest_Interceptor2::name (void)
+TAO249_ServerRequest_Interceptor2::name ()
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
-TAO249_ServerRequest_Interceptor2::destroy (void)
+TAO249_ServerRequest_Interceptor2::destroy ()
 {
 }
 
@@ -175,7 +175,7 @@ catch (const CORBA::Exception& ex)
 }
 
 TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
+TAO249_ServerRequest_Interceptor2::get_now ()
 {
   // 1582...
   const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 11dedcb34eb..1e2765ca15b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -23,12 +23,11 @@ class TAO249_ServerRequest_Interceptor2
   public virtual ::CORBA::LocalObject
 {
 public:
-
 /// Constructor.
-TAO249_ServerRequest_Interceptor2 (void);
+TAO249_ServerRequest_Interceptor2 ();
 
 /// Destructor.
-~TAO249_ServerRequest_Interceptor2 (void);
+~TAO249_ServerRequest_Interceptor2 ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -40,9 +39,9 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void);
+virtual char * name ();
 
-virtual void destroy (void);
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -61,10 +60,9 @@ virtual void send_other (
 //@}
 
 protected:
-  TimeBase::TimeT get_now (void);
+  TimeBase::TimeT get_now ();
 
 private:
-
 CORBA::ORB_var orb_;
 
 CORBA::Long client_id_;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index ead055e510d..a0b18143cae 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -6,7 +6,6 @@
 #include "Hello.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 949c7fe30e2..caa1748ee64 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -8,7 +8,6 @@
 #include "ace/Auto_Ptr.h"
 
 
-
 //const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 CORBA::ULong number_of_servers = 0;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
index 42309b06223..45db7ba8bed 100755
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
@@ -100,7 +100,7 @@ if ($client_status != 0) {
 
 
 for ($i = 0; $i < $number_of_servers; $i++) {
-    $server_status = $SV[$i]->WaitKill ($servers[$i]->ProcessStopWaitInterval());
+    $server_status = $SV[$i]->WaitKill ($servers[$i]->ProcessStopWaitInterval(), {self_crash => 1});
 
     if ($server_status < 0) {
         print STDERR "ERROR: server $i returned $server_status\n";
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index f983ad306dd..968cfa836ca 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -161,8 +161,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0);
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 23ba5d49388..042ec8802dd 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index b5d6d3241fd..17735f62984 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -1,26 +1,23 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Hello::ping (void)
+Hello::ping ()
 {
-  return;
 }
 
 void
-Hello::throw_location_forward (void)
+Hello::throw_location_forward ()
 {
-  return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index 93461daa94d..4ca11570043 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -19,11 +19,11 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void throw_location_forward (void);
+  virtual void throw_location_forward ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index 5becd14b268..8b6ebd8a2b5 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -5,7 +5,7 @@
 #include "tao/Exception.h"
 
 
-Server_ORBInitializer2::Server_ORBInitializer2 (void)
+Server_ORBInitializer2::Server_ORBInitializer2 ()
   : sri_ (0)
 {
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index 4bafa4e0a52..8ab29827aa2 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -25,8 +25,7 @@ class Server_ORBInitializer2 :
   public virtual ::CORBA::LocalObject
 {
 public:
-
-  Server_ORBInitializer2 (void);
+  Server_ORBInitializer2 ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -35,7 +34,6 @@ public:
   void set_server_iogr (CORBA::Object_ptr obj);
 
 private:
-
   /// Register the necessary interceptors.
   void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index ef1519b4a3d..720ac6d87dc 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -14,24 +14,24 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 ()
 : orb_ (0),
   expired_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 ()
 {
 }
 
 char *
-TAO249_ServerRequest_Interceptor2::name (void)
+TAO249_ServerRequest_Interceptor2::name ()
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
-TAO249_ServerRequest_Interceptor2::destroy (void)
+TAO249_ServerRequest_Interceptor2::destroy ()
 {
 }
 
@@ -111,7 +111,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
 }
 
 TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
+TAO249_ServerRequest_Interceptor2::get_now ()
 {
   // 1582...
   const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 22e5cc5d3a7..7646627fd8c 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -23,12 +23,11 @@ class TAO249_ServerRequest_Interceptor2
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  TAO249_ServerRequest_Interceptor2 (void);
+  TAO249_ServerRequest_Interceptor2 ();
 
   /// Destructor.
-  ~TAO249_ServerRequest_Interceptor2 (void);
+  ~TAO249_ServerRequest_Interceptor2 ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -45,33 +44,27 @@ public:
   virtual void destroy ();
 
   virtual void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Object_var server_iogr_;
 
 protected:
-  TimeBase::TimeT get_now (void);
+  TimeBase::TimeT get_now ();
 
 private:
-
   CORBA::ORB_var orb_;
 
   CORBA::Boolean expired_;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index 43d8a6a7c1e..240fd36b5a8 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -6,7 +6,6 @@
 #include "Hello.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 74a4a85be49..cd96b6ae330 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -163,8 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0);
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index daf613de7ad..982b2378a0b 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -3,26 +3,24 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Hello::ping (void)
+Hello::ping ()
 {
-  return;
 }
 
 CORBA::Boolean
-Hello::has_ft_request_service_context (void)
+Hello::has_ft_request_service_context ()
 {
   return ServerRequest_Interceptor2::has_ft_request_sc_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index 5f48cef8b47..0d37a35b486 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -19,11 +19,11 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual CORBA::Boolean has_ft_request_service_context (void);
+  virtual CORBA::Boolean has_ft_request_service_context ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index df9db17965f..17f53a73de3 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -9,7 +9,6 @@ void
 Server_ORBInitializer2::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
 {
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index f129227aee5..370c4c2d481 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -23,17 +23,14 @@ class Server_ORBInitializer2 :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
          PortableInterceptor::ORBInitInfo_ptr info);
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 25eac5e2ed5..8edbe615942 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -17,23 +17,23 @@
 CORBA::Boolean
 ServerRequest_Interceptor2::has_ft_request_sc_ = false;
 
-ServerRequest_Interceptor2::ServerRequest_Interceptor2 (void)
+ServerRequest_Interceptor2::ServerRequest_Interceptor2 ()
 : orb_ (0)
 {
 }
 
-ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void)
+ServerRequest_Interceptor2::~ServerRequest_Interceptor2 ()
 {
 }
 
 char *
-ServerRequest_Interceptor2::name (void)
+ServerRequest_Interceptor2::name ()
 {
   return CORBA::string_dup ("ServerRequest_Interceptor2");
 }
 
 void
-ServerRequest_Interceptor2::destroy (void)
+ServerRequest_Interceptor2::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 4a114e34de9..5e2354ef9fc 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -22,12 +22,11 @@ class ServerRequest_Interceptor2
   public virtual ::CORBA::LocalObject
 {
 public:
-
 /// Constructor.
-ServerRequest_Interceptor2 (void);
+ServerRequest_Interceptor2 ();
 
 /// Destructor.
-~ServerRequest_Interceptor2 (void);
+~ServerRequest_Interceptor2 ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -39,9 +38,9 @@ ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (void);
+virtual char * name ();
 
-virtual void destroy (void);
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -62,7 +61,6 @@ virtual void send_other (
 static CORBA::Boolean has_ft_request_sc_;
 
 private:
-
 CORBA::ORB_var orb_;
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index a70b3b6b156..03c2aec6dab 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -6,7 +6,6 @@
 #include "Hello.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior");
 const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior");
 
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index 6fe6f190c88..a1bab4f341a 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -84,7 +84,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
 }
 
 /// Thread entry point
-int Client_Task::svc (void)
+int Client_Task::svc ()
 {
   try
     {
@@ -128,7 +128,7 @@ int Client_Task::svc (void)
 
       if (!collocated_server->_is_collocated())
         { // Collocation is disabled, just skip the test - it has no sense.
-          ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n") );
+          ACE_DEBUG ((LM_ERROR, "Test has no sense, because collocation is disabled.\n"));
         }
       else
         {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index fdaebf1da66..c13b3f15298 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -7,7 +7,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (CORBA::ORB_ptr corb,
     ACE_Thread_Manager *thr_mgr,
@@ -20,7 +19,7 @@ public:
      CORBA::ULong group_version);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var corb_;
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index f7904897fff..45c28d07769 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
@@ -55,7 +55,7 @@ Server_Task::svc (void)
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
 
-          ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_) );
+          ACE_DEBUG ((LM_ERROR, "(%P): Server's IOR was written to file: %s.\n", output_));
         }
 
       // Signal the main thread before we call orb->run ();
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
index 881b0dddb18..4010d61c399 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
@@ -15,7 +15,7 @@ public:
     ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index f0be3e754a6..66e0c5144a9 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -7,14 +7,13 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 }
 
 // virtual
-void TestImpl::myMethod (void)
+void TestImpl::myMethod ()
 {
-  ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
+  ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n"));
 }
 
-
 // virtual
-void TestImpl::shutdown (void)
+void TestImpl::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index 6e31010ec83..7e19e202d18 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -8,9 +8,9 @@ public:
   TestImpl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void myMethod (void);
+  virtual void myMethod ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index 783d061e8fe..9c67a08bdf2 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -115,7 +115,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   if (failed)
     {
-      ACE_DEBUG ((LM_ERROR, "Test failed.\n") );
+      ACE_DEBUG ((LM_ERROR, "Test failed.\n"));
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index 5b23d33f306..0ce11d8abb5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -1,20 +1,19 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
index c11d9ebe239..7e9b59fda89 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -6,7 +6,7 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
 }
 
 void
-NsShutdown::shutdown (void)
+NsShutdown::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
index 1a6c841d700..c849efdebb5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
@@ -13,7 +13,7 @@ public:
   /// Constructor
   NsShutdown (CORBA::ORB_ptr orb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
index fe585143468..133eb6a7e0e 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -3,7 +3,6 @@
 #include "ace/Get_Opt.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
 bool shutdown_nsmain = false;
 
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index 444ace92c12..6a3ba02a1d6 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -61,7 +61,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
 
 int TestTask::svc()
 {
-
   try {
     // Start the Naming Service tasks
     namingServiceA_.activate();
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
index a0dc4495e41..57073f3c85a 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
 
 int TestTask::svc()
 {
-
   try {
     // Get reference to Root POA
     CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index 81d7d7081fe..20c682d5dc3 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -1,7 +1,6 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
@@ -10,17 +9,15 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
 
 void
 Hello::ping ()
 {
-  return;
 }
 
 void
 Hello::throw_location_forward ()
 {
-  return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
index bcbbebb7f2d..bb3257e2aca 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
@@ -5,7 +5,7 @@
 #include "tao/Exception.h"
 
 
-Server_ORBInitializer2::Server_ORBInitializer2 (void)
+Server_ORBInitializer2::Server_ORBInitializer2 ()
   : sri_ (0)
 {
 }
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index 4bafa4e0a52..8ab29827aa2 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -25,8 +25,7 @@ class Server_ORBInitializer2 :
   public virtual ::CORBA::LocalObject
 {
 public:
-
-  Server_ORBInitializer2 (void);
+  Server_ORBInitializer2 ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -35,7 +34,6 @@ public:
   void set_server_iogr (CORBA::Object_ptr obj);
 
 private:
-
   /// Register the necessary interceptors.
   void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index cb01b6ce8e3..16c7694ca22 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -16,13 +16,13 @@
 
 int invocation_count = 0;
 
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 ()
 : orb_ (0),
   expired_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
+TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 ()
 {
 }
 
@@ -60,8 +60,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
 
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (IOP::FT_REQUEST
-                                   );
+    ri->get_request_service_context (IOP::FT_REQUEST);
 
 
   TAO_InputCDR cdr (reinterpret_cast <const char*>
@@ -138,7 +137,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
 }
 
 TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
+TAO249_ServerRequest_Interceptor2::get_now ()
 {
   // 1582...
   const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index 22e5cc5d3a7..7646627fd8c 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -23,12 +23,11 @@ class TAO249_ServerRequest_Interceptor2
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  TAO249_ServerRequest_Interceptor2 (void);
+  TAO249_ServerRequest_Interceptor2 ();
 
   /// Destructor.
-  ~TAO249_ServerRequest_Interceptor2 (void);
+  ~TAO249_ServerRequest_Interceptor2 ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -45,33 +44,27 @@ public:
   virtual void destroy ();
 
   virtual void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      );
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
   CORBA::Object_var server_iogr_;
 
 protected:
-  TimeBase::TimeT get_now (void);
+  TimeBase::TimeT get_now ();
 
 private:
-
   CORBA::ORB_var orb_;
 
   CORBA::Boolean expired_;
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index 9bb5cb60097..a54dca9e813 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -6,7 +6,6 @@
 #include "Hello.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -49,11 +48,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior );
+        orb->string_to_object(ior);
 
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
 
       if (CORBA::is_nil (hello.in ()))
@@ -86,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..d25bf498762 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -50,7 +50,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors );
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -72,18 +72,13 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
 
   // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              );
+  CORBA::Boolean retval = iorm->set_property (&iogr_prop, new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
-      retval = iorm->set_primary (&iogr_prop,
-                                  new_ref.in (),
-                                  new_ref.in ()
-                                  );
+      retval = iorm->set_primary (&iogr_prop, new_ref.in (), new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -101,21 +96,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     );
-
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
-
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
-
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,31 +121,24 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               );
-
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          );
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              );
-
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-
         }
 
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -167,29 +151,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       );
-
+      my_poa->activate_object_with_id (server_id.in (), hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () );
-
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
-
+        orb->object_to_string (hello.in ());
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         );
-
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() );
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
       CORBA::Object_var iortmp =
         orb->string_to_object (ior.in ());
@@ -198,7 +174,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () );
+        orb->object_to_string (iogr.in ());
 
 
       // Output the IOR to the <ior_output_file>
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index d8c46266d98..1a59d8c484a 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -1,7 +1,6 @@
 #include "Hello.h"
 
 
-
 CORBA::Boolean
 Hello::normal_context_ok_ = 0;
 
@@ -16,7 +15,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
index 9c9670f5b46..4d0d1796c93 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
@@ -6,27 +6,19 @@
 
 
 void
-Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    )
+Server_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 {
-
 }
 
 void
-Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    )
+Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
-  this->register_server_request_interceptors (info
-                                              );
-
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    )
+    PortableInterceptor::ORBInitInfo_ptr info)
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
@@ -38,9 +30,5 @@ Server_ORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        );
-
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
-
-
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
index 4903df3c1c3..afa5abe2f14 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
@@ -23,20 +23,13 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         );
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          );
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register the necessary interceptors.
-  void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         );
-
+  void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index e2c58cf865d..9afa555a78e 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -10,13 +10,13 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor ()
 : orb_ (0),
   client_id_ (0)
 {
 }
 
-TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
+TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor ()
 {
 }
 
@@ -49,9 +49,7 @@ TAO249_ServerRequest_Interceptor::receive_request (
   try
   {
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                       );
-
+      ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
     TAO_InputCDR cdr (reinterpret_cast <const char*>
                      (sc->context_data.get_buffer ()),
@@ -65,7 +63,6 @@ TAO249_ServerRequest_Interceptor::receive_request (
                                CORBA::COMPLETED_NO);
       }
 
-
     cdr.reset_byte_order (static_cast <int> (byte_order));
 
     Hello::normal_context_ok_ = 0;
@@ -91,7 +88,6 @@ catch (const CORBA::Exception& ex)
   }
 
 
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
index aa0aee92ea5..00bd3d8fea5 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
@@ -22,12 +22,11 @@ class TAO249_ServerRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
-
 /// Constructor.
-TAO249_ServerRequest_Interceptor (void);
+TAO249_ServerRequest_Interceptor ();
 
 /// Destructor.
-~TAO249_ServerRequest_Interceptor (void);
+~TAO249_ServerRequest_Interceptor ();
 
 /**
  * @name Methods Required by the Server Request Interceptor
@@ -44,27 +43,21 @@ virtual char * name ();
 virtual void destroy ();
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  );
+  PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    );
+    PortableInterceptor::ServerRequestInfo_ptr ri);
 //@}
 private:
-
 CORBA::ORB_var orb_;
 
 CORBA:: Long client_id_;
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 04aab458c3c..6d70dc6b4e4 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -6,7 +6,6 @@
 #include "Hello.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -46,7 +45,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       char *argv1[] = { CLIENT, 0 };
 
       CORBA::ORB_var orb1 =
-      CORBA::ORB_init (one, argv1, "orb1" );
+      CORBA::ORB_init (one, argv1, "orb1");
 
       int three = 3;
       char OPTION[] = "-ORBFTSendFullGroupTC"; // Copy const into non-const storage.
@@ -57,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       try
         {
           orb2 =
-            CORBA::ORB_init (three, argv2, "orb2" );
+            CORBA::ORB_init (three, argv2, "orb2");
         }
       catch (const CORBA::BAD_PARAM&)
         {
@@ -69,10 +68,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb1->string_to_object (ior );
+        orb1->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -94,10 +93,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
       tmp =
-        orb2->string_to_object (ior );
+        orb2->string_to_object (ior);
 
       hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 281c701abdd..0db83fcb9b7 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -48,7 +48,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors );
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -70,18 +70,13 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
 
   // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              );
+  CORBA::Boolean retval = iorm->set_property (&iogr_prop, new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
-      retval = iorm->set_primary (&iogr_prop,
-                                  new_ref.in (),
-                                  new_ref.in ()
-                                  );
+      retval = iorm->set_primary (&iogr_prop, new_ref.in (), new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -99,21 +94,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     );
-
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
-
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
-
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
-
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -123,36 +113,25 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               );
-
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          );
-
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
-        root_poa->create_POA ("my_poa",
-                              poa_manager.in (),
-                              policies
-                              );
-
+        root_poa->create_POA ("my_poa", poa_manager.in (), policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-
         }
 
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -165,38 +144,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       );
-
-
-      CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () );
-
+      my_poa->activate_object_with_id (server_id.in (),hello_impl);
 
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+      CORBA::Object_var hello = my_poa->id_to_reference (server_id.in ());
 
+      CORBA::String_var ior = orb->object_to_string (hello.in ());
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         );
-
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() );
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
       CORBA::Object_var server = orb->string_to_object (ior.in ());
 
       CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, server.in ());
 
-
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () );
-
+        orb->object_to_string (iogr.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -210,7 +177,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-
       orb->run ();
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
index 7cf1bdd9bc1..5fef6eaaef2 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
@@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[])
     }
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
+    Messenger_var messenger = Messenger::_narrow( obj.in());
     if (CORBA::is_nil(messenger.in())) {
       std::cerr << "Argument is not a Messenger reference" << std::endl;
       return 1;
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
index a6575d05a1e..7ff5461dfcb 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
@@ -98,7 +98,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
 
-
       CosNotification::EventTypeSeq added (1);
       CosNotification::EventTypeSeq removed (1);
       added.length (1);
@@ -115,7 +114,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
 
-
       PortableServer::POAManager_var poa_manager = poa->the_POAManager();
 
       poa_manager->activate();
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
index 5095a179afd..632ebfabf87 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
@@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[])
   }
 
   return 0;
-
 }
 
 
@@ -78,5 +77,3 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 
 
 
-
-
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index d17f53abbe8..f889b69ae73 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -10,7 +10,6 @@
 Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
-
   CORBA::Object_var naming_obj =
     orb_->resolve_initial_references ("NameService");
 
@@ -76,7 +75,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 }
 
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -85,7 +84,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message)
 {
-
   ACE_OS::printf("Message from: %s\nSubject:      %s\nMessage:      %s\n",
                  user_name, subject, message);
   //cout << "Message from: " << user_name << endl;
@@ -121,6 +119,5 @@ CORBA::Boolean Messenger_i::send_message (
   consumer_proxy_->push_structured_event(event);
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index 561676e19d7..90cb0343cef 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -10,7 +10,7 @@ class  Messenger_i : public POA_Messenger
  public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
@@ -26,4 +26,3 @@ class  Messenger_i : public POA_Messenger
 
 
 
-
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index 1b5912e316b..54f32b3c9ea 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -11,13 +11,11 @@ public:
     StructuredEventConsumer_i(CORBA::ORB_ptr orb);
 
     virtual void push_structured_event(
-      const CosNotification::StructuredEvent &notification
-                                       );
+      const CosNotification::StructuredEvent &notification);
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-                              );
+        const CosNotification::EventTypeSeq & removed);
 
    virtual void disconnect_structured_push_consumer();
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index b11df7abb34..75ebbf9449a 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 152a368249e..d235de89f49 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -15,8 +15,7 @@ public:
 
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-                                      );
+        const CosNotification::EventTypeSeq & removed);
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
index d1a4c81904f..d59755cc7ce 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
@@ -1,7 +1,6 @@
 #include "Test_impl.h"
 
 
-
 Server_impl::Server_impl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
index 34e9ae8b7a4..ff97ec813f6 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
@@ -3,7 +3,6 @@
 #include "TestC.h"
 
 
-
 const ACE_TCHAR *ior_server = 0;
 
 int
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
index db1b3a6a5ea..4eb878ed19e 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
@@ -4,7 +4,6 @@
 #include "orbsvcs/PortableGroup/GOA.h"
 
 
-
 const ACE_TCHAR *uipmc_url = 0;
 const ACE_TCHAR *ior_output_file = 0;
 
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
index 45d43b27eca..04d12398ace 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
@@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
     client_interceptor = cri;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
index 55063792acd..346b31b2b5a 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
@@ -33,7 +33,6 @@ class ClientORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
index 3c88fae18c2..776f2b80058 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
@@ -7,12 +7,12 @@
   CORBA::Boolean
   ClientRequest_Interceptor::success_flag_ = 0;
 
-  ClientRequest_Interceptor::ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::ClientRequest_Interceptor ()
     : name_ ("ClientRequest_Interceptor")
   {
   }
 
-  ClientRequest_Interceptor::~ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::~ClientRequest_Interceptor ()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
index 53d5ad3bed2..1ba41d68aba 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
@@ -28,10 +28,9 @@ class ClientRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
+ClientRequest_Interceptor ();
 
-ClientRequest_Interceptor (void);
-
-~ClientRequest_Interceptor (void);
+~ClientRequest_Interceptor ();
 
 /// Canonical name of the interceptor.
 virtual char * name ();
@@ -52,10 +51,8 @@ virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 static CORBA::Boolean success_flag_;
 
 private:
-
 /// Name of the interceptor
 const char *name_;
-
 };
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 15d7b298abc..4dc06d51e34 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -1,7 +1,6 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
@@ -16,5 +15,5 @@ Hello::get_string ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index c214c911fcc..58d437c5f68 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -6,7 +6,6 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -62,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         orb->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 951ccc19cb7..f62002d9634 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -39,10 +39,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index 5b23d33f306..0ce11d8abb5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -1,20 +1,19 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
index c11d9ebe239..7e9b59fda89 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
@@ -6,7 +6,7 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
 }
 
 void
-NsShutdown::shutdown (void)
+NsShutdown::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
index 1a6c841d700..c849efdebb5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
@@ -13,7 +13,7 @@ public:
   /// Constructor
   NsShutdown (CORBA::ORB_ptr orb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
index cc4ea47298a..10d56888f1a 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
@@ -3,7 +3,6 @@
 #include "ace/Get_Opt.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
 bool shutdown_nsmain = false;
 int test_count = 10;
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index 444ace92c12..6a3ba02a1d6 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -61,7 +61,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
 
 int TestTask::svc()
 {
-
   try {
     // Start the Naming Service tasks
     namingServiceA_.activate();
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
index a0dc4495e41..57073f3c85a 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
@@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
 
 int TestTask::svc()
 {
-
   try {
     // Get reference to Root POA
     CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
index 189f408731f..e9840f46d6e 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
@@ -53,7 +53,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
index ec19adb739f..0106a7436b7 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
@@ -9,7 +9,7 @@ UIPMC_Object_Impl::UIPMC_Object_Impl (CORBA::ORB_ptr orb,
 {
 }
 
-UIPMC_Object_Impl::~UIPMC_Object_Impl (void)
+UIPMC_Object_Impl::~UIPMC_Object_Impl ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
index 25aad8e5c45..ae2aa913035 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
@@ -9,7 +9,7 @@ class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object
 {
 public:
   UIPMC_Object_Impl (CORBA::ORB_ptr orb, CORBA::ULong num_threads);
-  ~UIPMC_Object_Impl (void);
+  ~UIPMC_Object_Impl ();
 
   // The skeleton methods
   virtual void process ();
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index d299fbe0924..a03559bd56a 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -4,7 +4,6 @@
 #include "TestC.h"
 
 
-
 Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr,
@@ -17,7 +16,7 @@ Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -71,5 +70,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
index 0f02aee45e9..2961144d06f 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
@@ -15,7 +15,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (CosNaming::NamingContext_ptr root_context,
                CORBA::ORB_ptr corb,
@@ -23,7 +22,7 @@ public:
                CORBA::Boolean result);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CosNaming::NamingContext_var root_context_;
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index d12a6c3eba5..ae17e626300 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -4,7 +4,6 @@
 #include "tao/Strategies/advanced_resource.h"
 
 
-
   Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
@@ -13,7 +12,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -55,7 +54,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
index 9b72cfaecad..8b398a90449 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
index f4bdbbf8f0c..b909a5aef7c 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
@@ -28,7 +28,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   CosNaming::NamingContext_var root_context_;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index d1be2fba532..89ff1865f37 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -24,9 +24,8 @@
 #include "ace/OS_NS_fcntl.h"
 
 
-
 // Constructor.
-CC_Client::CC_Client (void)
+CC_Client::CC_Client ()
   : naming_service_ (0),
     cc_factory_ior_file_ (0),
     cc_factory_key_ (0),
@@ -40,7 +39,7 @@ CC_Client::CC_Client (void)
 {
 }
 
-CC_Client::~CC_Client (void)
+CC_Client::~CC_Client ()
 {
   // Free resources and close the ior files.
   if (this->cc_factory_ior_file_)
@@ -82,7 +81,7 @@ CC_Client::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-CC_Client::parse_args (void)
+CC_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dc:sf:k:xbhe:"));
   int c;
@@ -142,7 +141,7 @@ CC_Client::parse_args (void)
 // Execute client example code.
 
 int
-CC_Client::run (void)
+CC_Client::run ()
 {
   int tests_run = 0;
   // Tells whether any tests have been run
@@ -205,7 +204,7 @@ CC_Client::run (void)
 // This function runs basic tests concerned with only one lock set
 
 int
-CC_Client::run_basic_tests (void)
+CC_Client::run_basic_tests ()
 {
   Test_Single_Lock_With_Mode t1 (naming_service_,
                                  CosConcurrencyControl::read);
@@ -338,7 +337,7 @@ CC_Client::run_extended_tests (ACE_TCHAR *params)
 }
 
 void
-CC_Client::print_usage (void)
+CC_Client::print_usage ()
 {
   ACE_ERROR ((LM_ERROR,
               "usage:  %s"
@@ -354,7 +353,7 @@ CC_Client::print_usage (void)
 }
 
 int
-CC_Client::init_naming_service (void)
+CC_Client::init_naming_service ()
 {
   try
     {
@@ -423,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_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index 475c869b6c8..0902623fd3f 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -28,7 +28,7 @@
 #define _CC_CLIENT_H_
 
 // Stuff to be used by the command file parser
-int ace_cc_yyparse(void);
+int ace_cc_yyparse();
 int line_no = 1;
 char line_buf[500];
 CC_CommandList *cmdlist;
@@ -49,30 +49,30 @@ class CC_Client
 {
 public:
   /// Default constructor.
-  CC_Client (void);
+  CC_Client ();
 
   /// Destructor.
-  ~CC_Client (void);
+  ~CC_Client ();
 
   /// Run the test.
-  int run (void);
+  int run ();
 
   /// Initialize the test with the parameters from the command line.
   int init (int argc, ACE_TCHAR **argv);
 
 private:
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Function to parse the command line arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Function to read the ior from the given file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Runs the basic tests (on a single lock set). Returns CC_SUCCESS
   /// upon success CC_FAIL otherwise.
-  int run_basic_tests (void);
+  int run_basic_tests ();
 
   /// Runs the extended tests (on more lock sets). Returns CC_SUCCESS
   /// upon success CC_FAIL otherwise.
@@ -131,6 +131,6 @@ private:
   ACE_TCHAR *script_file_;
 
   /// Prints out the options to the program.
-  void print_usage (void);
+  void print_usage ();
 };
 #endif /* !defined (_CC_CLIENT_H_) */
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 01abae4bab0..1ccbf5f46c1 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -20,7 +20,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-CC_Command::~CC_Command(void)
+CC_Command::~CC_Command()
 {
 }
 
@@ -29,7 +29,7 @@ int CC_Command::execute()
   return 0;
 }
 
-CC_Command::CC_Command(void)
+CC_Command::CC_Command()
 {
 }
 
@@ -88,7 +88,7 @@ CC_Start_Cmd::~CC_Start_Cmd()
     }
 }
 
-int CC_Start_Cmd::execute(void)
+int CC_Start_Cmd::execute()
 {
   if (excep_)
     {
@@ -136,7 +136,7 @@ CC_CreateLockSet_Cmd::~CC_CreateLockSet_Cmd()
     }
 }
 
-int CC_CreateLockSet_Cmd::execute(void)
+int CC_CreateLockSet_Cmd::execute()
 {
   if(excep_)
     {
@@ -165,7 +165,7 @@ int CC_CreateLockSet_Cmd::execute(void)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("CC_CreateLockSet_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_CreateLockSet_Cmd::execute()");
     }
 
   return 1; // CC_SUCCESS
@@ -185,7 +185,7 @@ CC_Lock_Cmd::~CC_Lock_Cmd()
   ACE_OS::free (this->name_);
 }
 
-int CC_Lock_Cmd::execute(void)
+int CC_Lock_Cmd::execute()
 {
   if(excep_)
     {
@@ -206,7 +206,7 @@ int CC_Lock_Cmd::execute(void)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("CC_Lock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_Lock_Cmd::execute()");
       return 0;
     }
   return 1; // CC_SUCCESS
@@ -226,7 +226,7 @@ CC_UnLock_Cmd::~CC_UnLock_Cmd()
   ACE_OS::free (this->name_);
 }
 
-int CC_UnLock_Cmd::execute(void)
+int CC_UnLock_Cmd::execute()
 {
   if(excep_)
     {
@@ -244,11 +244,10 @@ int CC_UnLock_Cmd::execute(void)
       CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
       ccls->unlock (mode_);
-
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_UnLock_Cmd::execute()");
       return 0;
     }
   return 1; // CC_SUCCESS
@@ -268,7 +267,7 @@ CC_TryLock_Cmd::~CC_TryLock_Cmd()
   ACE_OS::free (this->name_);
 }
 
-int CC_TryLock_Cmd::execute(void)
+int CC_TryLock_Cmd::execute()
 {
   if(excep_)
     {
@@ -302,7 +301,7 @@ int CC_TryLock_Cmd::execute(void)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("CC_TryLock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_TryLock_Cmd::execute()");
       return 0;
     }
 
@@ -328,7 +327,7 @@ CC_ChangeMode_Cmd::~CC_ChangeMode_Cmd()
   ACE_OS::strdup (this->name_);
 }
 
-int CC_ChangeMode_Cmd::execute(void)
+int CC_ChangeMode_Cmd::execute()
 {
   if(excep_)
     {
@@ -347,11 +346,10 @@ int CC_ChangeMode_Cmd::execute(void)
       CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
       ccls->change_mode (held_mode_, new_mode_);
-
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("CC_ChangeMode_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_ChangeMode_Cmd::execute()");
     }
   return 1; // CC_SUCCESS
 }
@@ -365,7 +363,7 @@ CC_Sleep_Cmd::~CC_Sleep_Cmd()
 {
 }
 
-int CC_Sleep_Cmd::execute(void)
+int CC_Sleep_Cmd::execute()
 {
   if(excep_)
     {
@@ -390,7 +388,7 @@ CC_Repeat_Cmd::~CC_Repeat_Cmd()
 {
 }
 
-int CC_Repeat_Cmd::execute(void)
+int CC_Repeat_Cmd::execute()
 {
   if(excep_)
     {
@@ -415,7 +413,7 @@ CC_Wait_Cmd::~CC_Wait_Cmd()
   ACE_OS::free (this->prompt_);
 }
 
-int CC_Wait_Cmd::execute(void)
+int CC_Wait_Cmd::execute()
 {
   if (excep_)
     {
@@ -439,13 +437,13 @@ CC_Excep_Cmd::CC_Excep_Cmd (const char *excep)
   //  printf("CC_Excep_Cmd::CC_Excep_Cmd: excep: %s\n", excep);
 }
 
-CC_Excep_Cmd::~CC_Excep_Cmd(void)
+CC_Excep_Cmd::~CC_Excep_Cmd()
 {
   ACE_OS::free (this->ex_);
 }
 
 int
-CC_Excep_Cmd::execute(void)
+CC_Excep_Cmd::execute()
 {
   ACE_OS::printf ("Executing excep command (expected: %s)\n", ex_);
   // First we check to see if an exception has occurred. If not we fail
@@ -469,16 +467,16 @@ CC_Excep_Cmd::execute(void)
     }
 }
 
-CC_Dummy_Cmd::CC_Dummy_Cmd(void)
+CC_Dummy_Cmd::CC_Dummy_Cmd()
 {
 }
 
-CC_Dummy_Cmd::~CC_Dummy_Cmd(void)
+CC_Dummy_Cmd::~CC_Dummy_Cmd()
 {
 }
 
 int
-CC_Dummy_Cmd::execute(void)
+CC_Dummy_Cmd::execute()
 {
   return 1; // CC_SUCCESS
 }
@@ -488,13 +486,13 @@ CC_Print_Cmd::CC_Print_Cmd (const char * message)
 {
 }
 
-CC_Print_Cmd::~CC_Print_Cmd(void)
+CC_Print_Cmd::~CC_Print_Cmd()
 {
   ACE_OS::free(msg_);
 }
 
 int
-CC_Print_Cmd::execute(void)
+CC_Print_Cmd::execute()
 {
   ACE_OS::printf ("%s\n", msg_);
   return 1; // CC_SUCCESS
@@ -515,7 +513,7 @@ CC_Lookup_Cmd::~CC_Lookup_Cmd()
 }
 
 int
-CC_Lookup_Cmd::execute(void)
+CC_Lookup_Cmd::execute()
 {
   if(excep_)
     {
@@ -540,11 +538,10 @@ CC_Lookup_Cmd::execute(void)
             CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
           cc_lockset_ = ccls;
-
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)");
+          ex._tao_print_exception ("CC_UnLock_Cmd::execute()");
         }
     }
   return 1; // CC_SUCCESS
@@ -555,17 +552,17 @@ CC_CommandElem::CC_CommandElem(CC_Command *cmd, CC_CommandElem *next)
 {
 }
 
-CC_CommandElem::~CC_CommandElem(void)
+CC_CommandElem::~CC_CommandElem()
 {
 }
 
-CC_Command *CC_CommandElem::GetCommand(void)
+CC_Command *CC_CommandElem::GetCommand()
 {
   return cmd_;
 }
 
 CC_CommandElem *
-CC_CommandElem::GetNext(void)
+CC_CommandElem::GetNext()
 {
   return next_;
 }
@@ -576,13 +573,13 @@ CC_CommandElem::SetNext(CC_CommandElem *next)
   next_ = next;
 }
 
-CC_CommandList::CC_CommandList(void)
+CC_CommandList::CC_CommandList()
   : head_ (0), last_ (0), times_ (1)
 {
   ACE_OS::printf("CC_CommandList::CC_CommandList\n");
 }
 
-CC_CommandList::~CC_CommandList(void)
+CC_CommandList::~CC_CommandList()
 {
 }
 
@@ -604,7 +601,7 @@ CC_CommandList::add(CC_Command *cmd)
 }
 
 int
-CC_CommandList::execute(void)
+CC_CommandList::execute()
 {
   CC_CommandElem *current = head_;
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index f9ef4ad6875..3e322c09dac 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -32,7 +32,7 @@ class CC_Command
 {
  public:
   /// Destructor
-  virtual ~CC_Command(void);
+  virtual ~CC_Command();
 
   /// Abstract execute method
   virtual int execute() = 0;
@@ -44,7 +44,7 @@ class CC_Command
     GetLockSet (const char *lock_set_name);
 
   /// Default constructor. We do not want instances of this class
-  CC_Command(void);
+  CC_Command();
 
   /**
    * The last exception raised in one of the test commands. This variable
@@ -83,7 +83,7 @@ class CC_Start_Cmd : public CC_Command
 
   /// Start the child process. The current version does not wait for the
   /// process to terminate.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name of the script file
@@ -110,7 +110,7 @@ class CC_CreateLockSet_Cmd : public CC_Command
 
   /// Executes the command, i.e. creates the lock set and binds the name
   /// in the naming service.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name used to bind in the naming service.
@@ -137,7 +137,7 @@ class CC_Lock_Cmd:public CC_Command
 
   /// Executes the command, i.e. looks up the lock set with the requested
   /// name in the naming server and executes the lock command on that lock set.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -170,7 +170,7 @@ class CC_UnLock_Cmd:public CC_Command
    * name in the naming server and executes the unlock command on that
    * lock set.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -203,7 +203,7 @@ class CC_TryLock_Cmd:public CC_Command
    * name in the naming server and executes the try_lock command on that
    * lock set.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -237,7 +237,7 @@ class CC_ChangeMode_Cmd:public CC_Command
    * name in the naming server and executes the change_mode command on that
    * lock set.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
@@ -269,7 +269,7 @@ class CC_Sleep_Cmd:public CC_Command
   virtual ~CC_Sleep_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
 
  private:
   /// The number of seconds to sleep
@@ -295,7 +295,7 @@ class CC_Repeat_Cmd:public CC_Command
   virtual ~CC_Repeat_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
  private:
   /// The number of times the commands should be repeated
   int times_;
@@ -320,7 +320,7 @@ class CC_Wait_Cmd:public CC_Command
   virtual ~CC_Wait_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The prompt to print on the screen
@@ -343,14 +343,14 @@ class CC_Excep_Cmd : public CC_Command
   CC_Excep_Cmd (const char *excep);
 
   /// Destructor.
-  virtual ~CC_Excep_Cmd(void);
+  virtual ~CC_Excep_Cmd();
 
   /**
    * Executes the command. Checks to see if the excep_ class variable is set,
    * and if that's the case check that it is of the expected type. If not the
    * test fails.
    */
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The string representation of the expected exception
@@ -369,13 +369,13 @@ class CC_Dummy_Cmd: public CC_Command
 {
  public:
   /// Constructor.
-  CC_Dummy_Cmd(void);
+  CC_Dummy_Cmd();
 
   /// Destructor.
-  virtual ~CC_Dummy_Cmd(void);
+  virtual ~CC_Dummy_Cmd();
 
   /// Executes the command, i.e. does nothing.
-  virtual int execute(void);
+  virtual int execute();
 
  private:
 };
@@ -395,10 +395,10 @@ public:
   CC_Print_Cmd (const char *message);
 
   /// Destructor.
-  virtual ~CC_Print_Cmd(void);
+  virtual ~CC_Print_Cmd();
 
   /// Executes the command.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// Holds the message to print
@@ -425,12 +425,11 @@ public:
 
   /// Executes the command, i.e. looks up the lock set with the requested
   /// name in the naming server and sets the cc_lockset_ variable.
-  virtual int execute(void);
+  virtual int execute();
 
 private:
   /// The name to look up in the naming service.
   char *name_;
-
 };
 
 /**
@@ -449,13 +448,13 @@ class CC_CommandElem
   CC_CommandElem (CC_Command *cmd, CC_CommandElem *next);
 
   /// Destructor.
-  ~CC_CommandElem(void);
+  ~CC_CommandElem();
 
   /// Returns a pointer to the command in this element
-  CC_Command *GetCommand(void);
+  CC_Command *GetCommand();
 
   /// Returns the pointer to the next element
-  CC_CommandElem *GetNext(void);
+  CC_CommandElem *GetNext();
 
   /// Sets the next pointer
   void SetNext(CC_CommandElem *next);
@@ -481,16 +480,16 @@ class CC_CommandList
 {
  public:
   /// Constructor.
-  CC_CommandList(void);
+  CC_CommandList();
 
   /// Destructor.
-  ~CC_CommandList(void);
+  ~CC_CommandList();
 
   /// Adds the command to the list
   int add(CC_Command *cmd);
 
   /// Executes all the commands in the list from head to tail
-  int execute(void);
+  int execute();
 
   /// Sets the number of times to repeat the script
   void setrepeat(int times);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 044596b76b3..a6e3b6a798c 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -32,7 +32,7 @@
 #include "ace/OS_NS_stdio.h"
 
 void ace_cc_yyerror (const char* s);
-int ace_cc_yylex(void);
+int ace_cc_yylex();
 
 extern int line_no;
 extern char line_buf[500];
@@ -54,7 +54,6 @@ typedef union {
 #endif
 
 
-
 #define ACE_CC_YYFINAL    66
 #define ACE_CC_YYFLAG   -32768
 #define ACE_CC_YYNTBASE 24
@@ -413,7 +412,6 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 
 
-
 /* The user can define ACE_CC_YYPARSE_PARAM as the name of an argument to be passed
    into ace_cc_yyparse.  The argument should have type void *.
    It should actually point to an object.
@@ -438,7 +436,7 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count)
 #ifdef ACE_CC_YYPARSE_PARAM
 int ace_cc_yyparse (void *);
 #else
-int ace_cc_yyparse (void);
+int ace_cc_yyparse ();
 #endif
 #endif
 
@@ -739,7 +737,6 @@ ace_cc_yyreduce:
 
 
   switch (ace_cc_yyn) {
-
 case 2:
 { cmdlist->add(new CC_Sleep_Cmd(0));
          /* dummy to check exeption in the last command */
@@ -804,7 +801,7 @@ case 20:
     break;}
 case 21:
 { cmdlist->setrepeat(ace_cc_yyvsp[-1].num);
-                          ace_cc_yyval.command = new CC_Dummy_Cmd();;
+                          ace_cc_yyval.command = new CC_Dummy_Cmd();
     break;}
 case 22:
 { ace_cc_yyval.command = new CC_Excep_Cmd(ace_cc_yyvsp[-1].id); ;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index f0b111d5ec7..b9a1d4ecdb6 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -16,7 +16,6 @@
 #include "ace/Log_Msg.h"
 
 
-
 CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   : cc_factory_key_ (0),
     orb_ (0),
@@ -27,7 +26,7 @@ CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   instance_ = this;
 }
 
-CC_naming_service::CC_naming_service(void)
+CC_naming_service::CC_naming_service()
   : cc_factory_key_ (0),
     orb_ (0),
     factory_ (0)
@@ -44,7 +43,7 @@ CC_naming_service::Init(CORBA::ORB_var orb)
     throw CORBA::INTERNAL ();
 }
 
-CC_naming_service::~CC_naming_service (void)
+CC_naming_service::~CC_naming_service ()
 {
   //  if(instance_!=0)
   // delete instance_;
@@ -52,7 +51,7 @@ CC_naming_service::~CC_naming_service (void)
 }
 
 CC_naming_service *
-CC_naming_service::Instance(void)
+CC_naming_service::Instance()
 {
   if(instance_ == 0)
     {
@@ -119,13 +118,13 @@ CC_naming_service::bind_name (const char *n,
 }
 
 CosConcurrencyControl::LockSetFactory_var
-CC_naming_service::get_lock_set_factory (void)
+CC_naming_service::get_lock_set_factory ()
 {
   return this->factory_;
 }
 
 int
-CC_naming_service::init_naming_service (void)
+CC_naming_service::init_naming_service ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 05f8032d130..1fa453174d1 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -37,7 +37,7 @@ public:
   CC_naming_service (CORBA::ORB_var orb_);
 
   /// Default destructor.
-  ~CC_naming_service (void);
+  ~CC_naming_service ();
 
   /// Initialization method must be called after first call of Instance()
   /// in order to initialize the object correctly
@@ -52,14 +52,14 @@ public:
                   CORBA::Object_ptr obj);
 
   /// Gets the cc lock set factory which is common for all tests.
-  CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
+  CosConcurrencyControl::LockSetFactory_var get_lock_set_factory ();
 
   /// The naming service object is a singleton
-  static CC_naming_service *Instance(void);
+  static CC_naming_service *Instance();
 
 private:
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Key of factory obj ref.
   char *cc_factory_key_;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 84a8735d485..60a98f4fc27 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -36,7 +36,7 @@ char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_TestUtils::create_lock_set (void)
+CC_TestUtils::create_lock_set ()
 {
   // Create the lock set and return an obj ref corresponding to the
   // key.
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index a9176e5874e..bf1f3791ec0 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -24,7 +24,7 @@ class CC_TestUtils
 
   /// Creates a lock set by means of th lock set factory in the concurrency
   /// service server.
-  static CosConcurrencyControl::LockSet_ptr create_lock_set (void);
+  static CosConcurrencyControl::LockSet_ptr create_lock_set ();
  private:
 };
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index ff947dd64eb..0dc8df76628 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -20,12 +20,12 @@ CC_Test::CC_Test (CC_naming_service *ns)
 {
 }
 
-CC_Test::~CC_Test (void)
+CC_Test::~CC_Test ()
 {
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_Test::create_lock_set (void)
+CC_Test::create_lock_set ()
 {
   // Create the lock set and return an obj ref corresponding to the
   // key.
@@ -79,7 +79,7 @@ Test_Single_Lock_With_Mode::Test_Single_Lock_With_Mode (CC_naming_service *namin
 {
 }
 
-Test_Single_Lock_With_Mode::~Test_Single_Lock_With_Mode (void)
+Test_Single_Lock_With_Mode::~Test_Single_Lock_With_Mode ()
 {
 }
 
@@ -152,7 +152,7 @@ Test_Setup_LockSet::Test_Setup_LockSet (CC_naming_service *naming_service,
 {
 }
 
-Test_Setup_LockSet::~Test_Setup_LockSet (void)
+Test_Setup_LockSet::~Test_Setup_LockSet ()
 {
 }
 
@@ -192,7 +192,7 @@ Test_Use_Already_Created_LockSet (CC_naming_service *naming_service,
 {
 }
 
-Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
+Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet ()
 {
 }
 
@@ -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)
     {
@@ -230,7 +229,7 @@ Test_Unlock_Already_Created_LockSet (CC_naming_service *naming_service,
 {
 }
 
-Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
+Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet ()
 {
 }
 
@@ -265,7 +264,7 @@ Test_Release_Not_Held_Lock::Test_Release_Not_Held_Lock (CC_naming_service *namin
 {
 }
 
-Test_Release_Not_Held_Lock::~Test_Release_Not_Held_Lock (void)
+Test_Release_Not_Held_Lock::~Test_Release_Not_Held_Lock ()
 {
 }
 
@@ -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/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 0582031aede..d07b084c718 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -40,7 +40,7 @@ public:
   CC_Test (CC_naming_service *ns);
 
   /// Destructor
-  virtual ~CC_Test (void);
+  virtual ~CC_Test ();
 
   /// Run the test times_to_run number of times. Returns CC_SUCCESS on
   /// success CC_FAIL otherwise.
@@ -48,7 +48,7 @@ public:
 
   /// Create a new lock set using the default global lock set factory
   /// from the naming service.
-  CosConcurrencyControl::LockSet_ptr create_lock_set (void);
+  CosConcurrencyControl::LockSet_ptr create_lock_set ();
 
   /// Returns a human readable string from the lock mode enum.
   char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode);
@@ -79,7 +79,7 @@ public:
                               CosConcurrencyControl::lock_mode mode);
 
   /// Destructor
-  virtual ~Test_Single_Lock_With_Mode (void);
+  virtual ~Test_Single_Lock_With_Mode ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -107,7 +107,7 @@ public:
                       char *name);
 
   /// Destructor
-  virtual ~Test_Setup_LockSet (void);
+  virtual ~Test_Setup_LockSet ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -135,7 +135,7 @@ public:
                                    char *name);
 
   /// Destructor
-  virtual ~Test_Use_Already_Created_LockSet (void);
+  virtual ~Test_Use_Already_Created_LockSet ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -163,7 +163,7 @@ public:
                                        char *name);
 
   /// Destructor
-  virtual ~Test_Unlock_Already_Created_LockSet (void);
+  virtual ~Test_Unlock_Already_Created_LockSet ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
@@ -188,7 +188,7 @@ public:
                                 CosConcurrencyControl::lock_mode mode_);
 
   /// Destructor
-  virtual ~Test_Release_Not_Held_Lock (void);
+  virtual ~Test_Release_Not_Held_Lock ();
 
   /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
index ac1562263fb..40321000308 100644
--- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
@@ -610,7 +610,6 @@ ACE_CC_YY_DECL
 
 
 
-
   if ( ace_cc_yy_init )
     {
     ace_cc_yy_init = 0;
@@ -1309,7 +1308,7 @@ ACE_CC_YY_BUFFER_STATE new_buffer;
 
 
 #ifdef ACE_CC_YY_USE_PROTOS
-void ace_cc_yy_load_buffer_state( void )
+void ace_cc_yy_load_buffer_state()
 #else
 void ace_cc_yy_load_buffer_state()
 #endif
@@ -1372,7 +1371,6 @@ ACE_CC_YY_BUFFER_STATE b;
   }
 
 
-
 #ifdef ACE_CC_YY_USE_PROTOS
 void ace_cc_yy_init_buffer( ACE_CC_YY_BUFFER_STATE b, FILE *file )
 #else
@@ -1592,7 +1590,6 @@ char msg[];
   }
 
 
-
 /* Redefine ace_cc_yyless() so it works in section 3 code. */
 
 #undef ace_cc_yyless
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..3074ea3b246 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)
     {
@@ -114,7 +113,7 @@ MTD_Task::svc ()
 }
 
 void
-MTD_Task::run_iteration (void)
+MTD_Task::run_iteration ()
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 4864aa04f86..db266b65cc2 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -26,10 +26,10 @@ public:
         int use_callbacks);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
   /// Run a single iteration of the test
-  void run_iteration (void);
+  void run_iteration ();
 
 private:
   /// The event channel used on the test
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 8ad7a6de0f8..f962621288c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -25,7 +25,7 @@ deactivate_servant (PortableServer::Servant servant)
 }
 
 
-RND_Driver::RND_Driver (void)
+RND_Driver::RND_Driver ()
   :  nsuppliers_ (4),
      nconsumers_ (4),
      max_recursion_ (1)
@@ -326,7 +326,7 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin)
 }
 
 void
-RND_Consumer::disconnect (void)
+RND_Consumer::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -344,7 +344,7 @@ RND_Consumer::push (const CORBA::Any &event)
 }
 
 void
-RND_Consumer::disconnect_push_consumer (void)
+RND_Consumer::disconnect_push_consumer ()
 {
 }
 
@@ -376,7 +376,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin)
 }
 
 void
-RND_Supplier::disconnect (void)
+RND_Supplier::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -388,7 +388,7 @@ RND_Supplier::disconnect (void)
 }
 
 void
-RND_Supplier::push_new_event (void)
+RND_Supplier::push_new_event ()
 {
   CORBA::Any event;
   CORBA::Long recursion = 0;
@@ -415,12 +415,12 @@ RND_Supplier::push (CORBA::Any &event)
 }
 
 void
-RND_Supplier::disconnect_push_supplier (void)
+RND_Supplier::disconnect_push_supplier ()
 {
 }
 
 int
-RND_Supplier::svc (void)
+RND_Supplier::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "Thread %t started\n"));
   int percent = 10;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index b273a714725..2f1f0cb015e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -35,10 +35,10 @@ public:
   RND_Consumer (RND_Driver *driver);
 
   void push (const CORBA::Any &event);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin);
-  void disconnect (void);
+  void disconnect ();
 
 protected:
   /// The driver
@@ -68,16 +68,16 @@ class RND_Supplier
 {
 public:
   /// Constructor
-  RND_Supplier (void);
+  RND_Supplier ();
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event...
-  void push_new_event (void);
+  void push_new_event ();
   void push (CORBA::Any &event);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Active method
   virtual int svc ();
@@ -91,7 +91,7 @@ private:
 };
 
 inline
-RND_Supplier::RND_Supplier (void)
+RND_Supplier::RND_Supplier ()
 {
 }
 
@@ -100,7 +100,7 @@ RND_Supplier::RND_Supplier (void)
 class RND_Driver
 {
 public:
-  RND_Driver (void);
+  RND_Driver ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 2a800d6cd5a..702214b989d 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -26,7 +26,7 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-CEC_Counting_Consumer::disconnect (void)
+CEC_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -79,7 +79,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&)
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (void)
+CEC_Counting_Consumer::disconnect_push_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -113,7 +113,7 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (void)
+CEC_Pull_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -131,7 +131,7 @@ CEC_Pull_Counting_Consumer::disconnect (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (void)
+CEC_Pull_Counting_Consumer::pull ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -180,7 +180,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -214,20 +214,20 @@ CEC_Counting_Consumer_Task::svc ()
 }
 
 void
-CEC_Counting_Consumer_Task::stop (void)
+CEC_Counting_Consumer_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-CEC_Counting_Consumer_Task::pull_count (void)
+CEC_Counting_Consumer_Task::pull_count ()
 {
   return this->pull_count_;
 }
 
 void
-CEC_Counting_Consumer_Task::run (void)
+CEC_Counting_Consumer_Task::run ()
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index 1fe0e7dbb14..7147c487958 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -36,7 +36,7 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
@@ -46,7 +46,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const CORBA::Any& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
@@ -79,18 +79,18 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
   void dump_results (int expected_count, int tolerance);
 
-  CORBA::Any *pull (void);
+  CORBA::Any *pull ();
   CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
   /// The skeleton methods.
-  virtual void disconnect_pull_consumer (void);
+  virtual void disconnect_pull_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
@@ -116,13 +116,13 @@ public:
                               int milliseconds = 0);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong pull_count (void);
+  void stop ();
+  CORBA::ULong pull_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The consumer we are turning into an active object
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 6032d54f33a..734fae09013 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -2,8 +2,7 @@
 #include "ace/OS_NS_unistd.h"
 
 
-
-CEC_Counting_Supplier::CEC_Counting_Supplier (void)
+CEC_Counting_Supplier::CEC_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0)
 {
@@ -26,7 +25,7 @@ CEC_Counting_Supplier::connect (
 }
 
 void
-CEC_Counting_Supplier::disconnect (void)
+CEC_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -57,7 +56,7 @@ CEC_Counting_Supplier::push (const CORBA::Any&)
 }
 
 void
-CEC_Counting_Supplier::disconnect_push_supplier (void)
+CEC_Counting_Supplier::disconnect_push_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
@@ -91,20 +90,20 @@ CEC_Counting_Supplier_Task::svc ()
 }
 
 void
-CEC_Counting_Supplier_Task::stop (void)
+CEC_Counting_Supplier_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-CEC_Counting_Supplier_Task::push_count (void)
+CEC_Counting_Supplier_Task::push_count ()
 {
   return this->push_count_;
 }
 
 void
-CEC_Counting_Supplier_Task::run (void)
+CEC_Counting_Supplier_Task::run ()
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -134,7 +133,7 @@ CEC_Counting_Supplier_Task::run (void)
 
 // ****************************************************************
 
-CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
+CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0)
 {
@@ -157,7 +156,7 @@ CEC_Pull_Counting_Supplier::connect (
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect (void)
+CEC_Pull_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -175,7 +174,7 @@ CEC_Pull_Counting_Supplier::disconnect (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (void)
+CEC_Pull_Counting_Supplier::pull ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     throw CosEventComm::Disconnected ();
@@ -218,7 +217,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index f505200c8fb..73ee061f1c3 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -32,19 +32,19 @@ class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSuppl
 {
 public:
   /// Constructor
-  CEC_Counting_Supplier (void);
+  CEC_Counting_Supplier ();
 
   // = The CosEventComm::PushSupplier methods
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push an event.
   void push (const CORBA::Any& events);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
@@ -65,13 +65,13 @@ public:
                               int milliseconds = 0);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong push_count (void);
+  void stop ();
+  CORBA::ULong push_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The supplier we are turning into an active object
@@ -103,18 +103,18 @@ class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::Pull
 {
 public:
   /// Constructor
-  CEC_Pull_Counting_Supplier (void);
+  CEC_Pull_Counting_Supplier ();
 
   // = The CosEventComm::PullSupplier methods
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  void disconnect (void);
+  void disconnect ();
 
   // The PullSupplier methods.
-  CORBA::Any* pull (void);
+  CORBA::Any* pull ();
   CORBA::Any* try_pull (CORBA::Boolean_out has_event);
-  virtual void disconnect_pull_supplier (void);
+  virtual void disconnect_pull_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 685fcba8db5..d2a9f33c2a1 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -25,7 +25,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Driver::Driver (void)
+Driver::Driver ()
   : n_consumers_ (1),
     event_count_ (100),
     event_a_ (ACE_ES_EVENT_UNDEFINED),
@@ -75,7 +75,7 @@ Driver::run (int argc, ACE_TCHAR* argv[])
                   this->event_a_,
                   this->event_b_,
 
-                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 
       if (this->pid_file_name_ != 0)
         {
@@ -274,7 +274,7 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel)
 }
 
 void
-Driver::disconnect_consumers (void)
+Driver::disconnect_consumers ()
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -380,11 +380,10 @@ Test_Consumer::connect (int event_a,
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ());
-
 }
 
 void
-Test_Consumer::disconnect (void)
+Test_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -403,6 +402,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Consumer::disconnect_push_consumer (void)
+Test_Consumer::disconnect_push_consumer ()
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 1294bcf411b..625bbcf9b55 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -37,11 +37,11 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
@@ -64,7 +64,7 @@ class Driver
   // = DESCRIPTION
   //
 public:
-  Driver (void);
+  Driver ();
 
   enum {
     MAX_CONSUMERS = 16
@@ -85,7 +85,7 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
index d44792d6a43..3a946c12854 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
@@ -2,7 +2,6 @@
 #include "tao/CDR.h"
 
 
-
 CORBA::Boolean
 operator<< (TAO_OutputCDR& cdr, ECM_Data& x)
 {
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 587936448f3..66b26fc2ac2 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -15,8 +15,7 @@
 #include "ace/OS_NS_errno.h"
 
 
-
-ECMS_Driver::ECMS_Driver (void)
+ECMS_Driver::ECMS_Driver ()
   : n_suppliers_ (1),
     event_count_ (100),
     event_period_ (100),
@@ -70,7 +69,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* argv[])
                   this->event_a_,
                   this->event_b_,
 
-                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 
       if (this->pid_file_name_ != 0)
         {
@@ -287,7 +286,7 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel)
 }
 
 void
-ECMS_Driver::activate_suppliers (void)
+ECMS_Driver::activate_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -296,7 +295,7 @@ ECMS_Driver::activate_suppliers (void)
 }
 
 void
-ECMS_Driver::disconnect_suppliers (void)
+ECMS_Driver::disconnect_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -436,7 +435,7 @@ Test_Supplier::connect (const char* name,
 }
 
 void
-Test_Supplier::disconnect (void)
+Test_Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -471,7 +470,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (void)
+Test_Supplier::disconnect_push_supplier ()
 {
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -483,7 +482,7 @@ int Test_Supplier::supplier_id () const
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-Test_Supplier::consumer_proxy (void)
+Test_Supplier::consumer_proxy ()
 {
   return this->consumer_proxy_.in ();
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 9726d936a7e..de843e6632f 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -32,7 +32,7 @@ class Test_Supplier : public ACE_Task<ACE_SYNCH>
 public:
   Test_Supplier (ECMS_Driver *driver);
 
-  int svc (void);
+  int svc ();
   // Run the test, just forwards to the driver
 
   void connect (const char* name,
@@ -41,16 +41,16 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id () const;
   // The supplier ID.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void);
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy ();
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
@@ -80,7 +80,7 @@ class ECMS_Driver
   // = DESCRIPTION
   //
 public:
-  ECMS_Driver (void);
+  ECMS_Driver ();
 
   enum {
     MAX_SUPPLIERS = 16
@@ -107,10 +107,10 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
-  void activate_suppliers (void);
+  void activate_suppliers ();
   // Activate the suppliers, i.e. they start generating events.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 9874912832e..6c9004deb79 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Consumer::Consumer (void)
+Consumer::Consumer ()
   : event_count_ (0)
 {
 }
@@ -38,7 +38,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   try
     {
@@ -81,7 +81,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index a3f09d10e17..401740731d9 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -20,19 +20,19 @@ class Consumer : public POA_RtecEventComm::PushConsumer
   //   It simply subscribes to one event type.
   //
 public:
-  Consumer (void);
+  Consumer ();
   // Constructor
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 464cd574c18..876f00d0c1b 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -26,7 +26,6 @@ static const int data_items = 60000;
 void *
 run_orb_within_thread (void *)
 {
-
   while (! terminate_threads)
     {
       try
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index c0e4a5641a7..0b4c78f6b54 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-Supplier::Supplier (void)
+Supplier::Supplier ()
 {
 }
 
@@ -32,7 +32,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   // Disconnect from the EC
   try
@@ -51,7 +51,7 @@ Supplier::disconnect (void)
 }
 
 void
-Supplier::perform_push (void)
+Supplier::perform_push ()
 {
   try
     {
@@ -71,7 +71,7 @@ Supplier::perform_push (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 3f131c1d4fa..8f848d01721 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -21,21 +21,21 @@ class Supplier : public POA_RtecEventComm::PushSupplier
   //   method is invoked it pushes the event through the event service
   //
 public:
-  Supplier (void);
+  Supplier ();
   // Constructor
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the event channel
 
-  void perform_push (void);
+  void perform_push ();
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index a21e9be6afa..cfba8db9ba9 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -21,7 +21,7 @@
 #include "EC_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
-ECM_Driver::ECM_Driver (void)
+ECM_Driver::ECM_Driver ()
   : event_period_ (250000),
     event_count_ (100),
     config_filename_ (0),
@@ -70,7 +70,7 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[])
                   this->event_count_,
 
                   this->config_filename_?this->config_filename_:ACE_TEXT("nil"),
-                  this->pid_filename_?this->pid_filename_:ACE_TEXT("nil")) );
+                  this->pid_filename_?this->pid_filename_:ACE_TEXT("nil")));
 
       int i;
       for (i = 0; i < this->local_federations_count_; ++i)
@@ -86,7 +86,6 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[])
                j < this->local_federations_[i]->supplier_types ();
                ++j)
             {
-
               ACE_DEBUG ((LM_DEBUG,
                           "    name = <%s>\n"
                           "    ipadd = <%x>\n",
@@ -172,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)
     {
@@ -216,7 +214,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-ECM_Driver::close_federations (void)
+ECM_Driver::close_federations ()
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -253,7 +251,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-ECM_Driver::close_senders (void)
+ECM_Driver::close_senders ()
 {
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
@@ -279,7 +277,7 @@ ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 void
-ECM_Driver::close_receivers (void)
+ECM_Driver::close_receivers ()
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -288,7 +286,7 @@ ECM_Driver::close_receivers (void)
 }
 
 void
-ECM_Driver::dump_results (void)
+ECM_Driver::dump_results ()
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -371,7 +369,7 @@ ECM_Driver::parse_args (int argc, ACE_TCHAR *argv [])
 }
 
 int
-ECM_Driver::parse_config_file (void)
+ECM_Driver::parse_config_file ()
 {
   FILE* cfg = 0;
   if (this->config_filename_ != 0)
@@ -568,7 +566,7 @@ ECM_Federation::ECM_Federation (char* name,
     }
 }
 
-ECM_Federation::~ECM_Federation (void)
+ECM_Federation::~ECM_Federation ()
 {
   delete[] this->consumer_ipaddr_;
   delete[] this->supplier_ipaddr_;
@@ -607,13 +605,13 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
 }
 
 void
-ECM_Federation::close (void)
+ECM_Federation::close ()
 {
   this->sender_->shutdown ();
 }
 
 RtecUDPAdmin::AddrServer_ptr
-ECM_Federation::addr_server (void)
+ECM_Federation::addr_server ()
 {
   return this->addr_server_._this ();
 }
@@ -658,7 +656,7 @@ ECM_Supplier::open (const char* name,
 }
 
 void
-ECM_Supplier::close (void)
+ECM_Supplier::close ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -712,13 +710,13 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events)
 }
 
 void
-ECM_Supplier::disconnect_push_supplier (void)
+ECM_Supplier::disconnect_push_supplier ()
 {
   // this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 void
-ECM_Supplier::disconnect_push_consumer (void)
+ECM_Supplier::disconnect_push_consumer ()
 {
 }
 
@@ -788,7 +786,7 @@ ECM_Consumer::connect (unsigned int *seed)
 }
 
 void
-ECM_Consumer::disconnect (void)
+ECM_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -801,7 +799,7 @@ ECM_Consumer::disconnect (void)
 }
 
 void
-ECM_Consumer::close (void)
+ECM_Consumer::close ()
 {
   try
     {
@@ -825,7 +823,7 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-ECM_Consumer::disconnect_push_consumer (void)
+ECM_Consumer::disconnect_push_consumer ()
 {
 }
 
@@ -857,7 +855,7 @@ ECM_Local_Federation::ECM_Local_Federation (ECM_Federation *federation,
            CORBA::Boolean[this->consumer_types ()]);
 }
 
-ECM_Local_Federation::~ECM_Local_Federation (void)
+ECM_Local_Federation::~ECM_Local_Federation ()
 {
   delete mcast_eh_;
   delete[] this->subscription_subset_;
@@ -884,7 +882,7 @@ ECM_Local_Federation::open (int event_count,
 }
 
 void
-ECM_Local_Federation::close (void)
+ECM_Local_Federation::close ()
 {
   this->consumer_.close ();
 
@@ -1013,11 +1011,10 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
     qos.get_SupplierQOS ();
   this->receiver_->connect (qos_copy);
 
-
 }
 
 void
-ECM_Local_Federation::close_receiver (void)
+ECM_Local_Federation::close_receiver ()
 {
   this->receiver_->shutdown ();
   this->mcast_eh_->shutdown ();
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 1311ca53bf9..a472b11e5b6 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -86,7 +86,7 @@ public:
   // Constructor, it assumes ownership of the buffers, strings must be
   // allocated using CORBA::string_alloc(), buffers using operator new.
 
-  ~ECM_Federation (void);
+  ~ECM_Federation ();
   // Dtor
 
   const char* name () const;
@@ -117,13 +117,13 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect the UDP sender to the EC.
 
-  void close (void);
+  void close ();
   // Close the UDP sender, disconnect from the EC
 
   int sender_local_addr (ACE_INET_Addr& addr);
   // Return the sender local address
 
-  RtecUDPAdmin::AddrServer_ptr addr_server (void);
+  RtecUDPAdmin::AddrServer_ptr addr_server ();
   // This address server can be used to convert event headers
   // (type,source) to UDP addresses (ipaddr,port)
 
@@ -169,7 +169,7 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
@@ -180,11 +180,11 @@ public:
   // The supplier ID.
 
   void push (const RtecEventComm::EventSet& events);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   ECM_Local_Federation* federation_;
@@ -222,17 +222,17 @@ public:
              unsigned int *seed);
   // This method connects the consumer to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   void connect (unsigned int *seed);
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   ECM_Local_Federation* federation_;
@@ -255,14 +255,14 @@ public:
   ECM_Local_Federation (ECM_Federation *federation,
                         ECM_Driver *driver);
   // Constructor.
-  ~ECM_Local_Federation (void);
+  ~ECM_Local_Federation ();
   // Destructor
 
   void open (int event_count,
              RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // Connect both the supplier and the consumer.
 
-  void close (void);
+  void close ();
   // Disconnect everybody from the EC
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
@@ -283,7 +283,7 @@ public:
                       TAO_ECG_Refcounted_Endpoint ignore_from);
   // Connect the UDP receiver to the EC.
 
-  void close_receiver (void);
+  void close_receiver ();
   // Close the UDP receiver, disconnect from the EC
 
   void dump_results () const;
@@ -386,7 +386,7 @@ class ECM_Driver
   //   receive and send multicast messages, etc.
   //
 public:
-  ECM_Driver (void);
+  ECM_Driver ();
 
   enum {
     MAX_EVENTS = 1024,
@@ -414,7 +414,7 @@ private:
   void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Activate all the federations
 
-  void close_federations (void);
+  void close_federations ();
   // Close the federations, i.e. disconnect from the EC, deactivate
   // the objects, etc.
 
@@ -425,19 +425,19 @@ private:
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
-  void close_senders (void);
+  void close_senders ();
   // Close all the senders to cleanup resources.
 
-  void close_receivers (void);
+  void close_receivers ();
   // Close all the receivers to cleanup resources.
 
-  int shutdown (void);
+  int shutdown ();
   // Called when the main thread.
 
   int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line arguments
 
-  int parse_config_file (void);
+  int parse_config_file ();
   // parse the command line arguments
 
   int parse_name_list (FILE* file, int n, char** names,
@@ -448,7 +448,7 @@ private:
                    const char* error_msg);
   // skip the blanks in the file.
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results to the standard output.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index feeff227a42..c0f9d476954 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -25,7 +25,7 @@
 # include <sys/lwp.h> /* for _lwp_self */
 #endif /* sun */
 
-Test_ECG::Test_ECG (void)
+Test_ECG::Test_ECG ()
   : lcl_name_ ("Test_ECG"),
     rmt_name_ (""),
     scheduling_type_ (Test_ECG::ss_runtime),
@@ -205,7 +205,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
                   this->lpc_event_b_,
 
                   this->schedule_file_?this->schedule_file_:ACE_TEXT("nil"),
-                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                  this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 
       print_priority_info ("Test_ECG::run (Main)");
 
@@ -263,7 +263,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
         default:
           ACE_ERROR ((LM_WARNING, "Unknown scheduling type %d\n",
                       this->scheduling_type_));
-          /*FALLTHROUGH*/
+          ACE_FALLTHROUGH;
         case Test_ECG::ss_global:
           break;
 
@@ -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
@@ -599,7 +598,7 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
 }
 
 void
-Test_ECG::disconnect_suppliers (void)
+Test_ECG::disconnect_suppliers ()
 {
   for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
     {
@@ -656,7 +655,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 }
 
 void
-Test_ECG::disconnect_consumers (void)
+Test_ECG::disconnect_consumers ()
 {
   for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
@@ -893,7 +892,7 @@ Test_ECG::push_consumer (void *consumer_cookie,
 }
 
 void
-Test_ECG::wait_until_ready (void)
+Test_ECG::wait_until_ready ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ready_mon, this->ready_mtx_);
   while (!this->ready_)
@@ -904,7 +903,6 @@ void
 Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
                              RtecEventComm::PushConsumer_ptr consumer)
 {
-
   this->running_suppliers_--;
   if (this->running_suppliers_ != 0)
     return;
@@ -947,7 +945,7 @@ Test_ECG::shutdown_consumer (int id)
 }
 
 int
-Test_ECG::shutdown (void)
+Test_ECG::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
 
@@ -961,7 +959,7 @@ Test_ECG::shutdown (void)
 }
 
 void
-Test_ECG::dump_results (void)
+Test_ECG::dump_results ()
 {
   const int bufsize = 512;
   ACE_TCHAR buf[bufsize];
@@ -1261,7 +1259,7 @@ Test_Supplier::open (const char* name,
 }
 
 void
-Test_Supplier::close (void)
+Test_Supplier::close ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -1389,7 +1387,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Supplier::disconnect_push_supplier (void)
+Test_Supplier::disconnect_push_supplier ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1398,7 +1396,7 @@ Test_Supplier::disconnect_push_supplier (void)
 }
 
 void
-Test_Supplier::disconnect_push_consumer (void)
+Test_Supplier::disconnect_push_consumer ()
 {
 }
 
@@ -1460,7 +1458,7 @@ Test_Consumer::open (const char* name,
 }
 
 void
-Test_Consumer::close (void)
+Test_Consumer::close ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1478,7 +1476,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Consumer::disconnect_push_consumer (void)
+Test_Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 57c4b31dc6e..a45e6f85f68 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -53,7 +53,7 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   void activate (const char* name,
@@ -61,11 +61,11 @@ public:
                  RtecEventChannelAdmin::EventChannel_ptr ec);
 
   void push (const RtecEventComm::EventSet& events);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id () const;
@@ -96,7 +96,6 @@ private:
 
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC (as a supplier) using this proxy.
-
 };
 
 class Test_Consumer : public POA_RtecEventComm::PushConsumer
@@ -119,11 +118,11 @@ public:
              RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void close (void);
+  void close ();
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
@@ -159,7 +158,7 @@ class Test_ECG
   //   and publications list.
   //
 public:
-  Test_ECG (void);
+  Test_ECG ();
 
   enum {
     MAX_EVENTS = 1024,
@@ -200,7 +199,7 @@ private:
   // Helper routine to obtain an EC given its name.
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
   void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
@@ -213,20 +212,20 @@ private:
   // Publications list.
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
-  int shutdown (void);
+  int shutdown ();
   // Called when the main thread (i.e. not the scavenger thread) is
   // shutting down.
 
   int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line args
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results to the standard output.
 
-  void wait_until_ready (void);
+  void wait_until_ready ();
   // Block event delivery until all the consumers are ready.
 
   struct Stats;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index b81e9af1c92..afefd875ca2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -71,7 +71,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
 }
 
 void
-Test_Consumer::disconnect (void)
+Test_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -165,6 +165,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Test_Consumer::disconnect_push_consumer (void)
+Test_Consumer::disconnect_push_consumer ()
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 61afa504683..96d859e2945 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -49,7 +49,7 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
   void dump_results (const ACE_TCHAR* name,
@@ -60,7 +60,7 @@ public:
   // Add our throughput and latency statistics to <stats>
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index e63814343d8..a10cc5b53ad 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-ECT_Consumer_Driver::ECT_Consumer_Driver (void)
+ECT_Consumer_Driver::ECT_Consumer_Driver ()
   : n_consumers_ (1),
     n_suppliers_ (1),
     type_start_ (ACE_ES_EVENT_UNDEFINED),
@@ -35,7 +35,7 @@ ECT_Consumer_Driver::ECT_Consumer_Driver (void)
 {
 }
 
-ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
+ECT_Consumer_Driver::~ECT_Consumer_Driver ()
 {
 }
 
@@ -79,7 +79,7 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[])
                       this->type_start_,
                       this->type_count_,
 
-                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
         }
 
       if (this->pid_file_name_ != 0)
@@ -234,7 +234,7 @@ ECT_Consumer_Driver::connect_consumers
 }
 
 void
-ECT_Consumer_Driver::dump_results (void)
+ECT_Consumer_Driver::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
@@ -252,7 +252,7 @@ ECT_Consumer_Driver::dump_results (void)
 }
 
 void
-ECT_Consumer_Driver::disconnect_consumers (void)
+ECT_Consumer_Driver::disconnect_consumers ()
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 9732e3d4558..32b92e1cc6d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -32,8 +32,8 @@ class ECT_Consumer_Driver : public ECT_Driver
   // = DESCRIPTION
   //
 public:
-  ECT_Consumer_Driver (void);
-  virtual ~ECT_Consumer_Driver (void);
+  ECT_Consumer_Driver ();
+  virtual ~ECT_Consumer_Driver ();
 
   enum {
     MAX_CONSUMERS = 16
@@ -54,10 +54,10 @@ private:
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
-  void dump_results (void);
+  void dump_results ();
   // Print out the results
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 20d679e4bd2..f04b2a66959 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -2,7 +2,6 @@
 #include "ace/High_Res_Timer.h"
 
 
-
-ECT_Driver::~ECT_Driver (void)
+ECT_Driver::~ECT_Driver ()
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 1d8a800c539..be17fda434b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -31,7 +31,7 @@ class ECT_Driver
   // = DESCRIPTION
   //
 public:
-  virtual ~ECT_Driver (void);
+  virtual ~ECT_Driver ();
 
   virtual void shutdown_consumer (void* consumer_cookie) = 0;
   // Callback method for consumers, each consumer will call this
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 60cfca06515..869c4277d90 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -95,7 +95,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
 }
 
 void
-Test_Supplier::disconnect (void)
+Test_Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -216,7 +216,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (void)
+Test_Supplier::disconnect_push_supplier ()
 {
 }
 
@@ -226,7 +226,7 @@ int Test_Supplier::supplier_id () const
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-Test_Supplier::consumer_proxy (void)
+Test_Supplier::consumer_proxy ()
 {
   return this->consumer_proxy_.in ();
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 2a2a442a65a..90d9b416f69 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -33,7 +33,7 @@ class Test_Supplier : public ACE_Task<ACE_SYNCH>
 public:
   Test_Supplier (ECT_Driver *driver);
 
-  int svc (void);
+  int svc ();
   // Run the test, just forwards to the driver
 
   void connect (RtecScheduler::Scheduler_ptr scheduler,
@@ -47,16 +47,16 @@ public:
                 RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void disconnect (void);
+  void disconnect ();
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id () const;
   // The supplier ID.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void);
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy ();
   // We talk to the EC (as a supplier) using this proxy, no duplicates
   // are done here...
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 8f64e4f77f4..4168b9c133c 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-ECT_Supplier_Driver::ECT_Supplier_Driver (void)
+ECT_Supplier_Driver::ECT_Supplier_Driver ()
   : n_suppliers_ (1),
     burst_count_ (10),
     burst_size_ (100),
@@ -35,7 +35,7 @@ ECT_Supplier_Driver::ECT_Supplier_Driver (void)
 {
 }
 
-ECT_Supplier_Driver::~ECT_Supplier_Driver (void)
+ECT_Supplier_Driver::~ECT_Supplier_Driver ()
 {
 }
 
@@ -90,7 +90,7 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[])
                       this->type_start_,
                       this->type_count_,
 
-                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")) );
+                      this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
         }
 
       if (this->pid_file_name_ != 0)
@@ -231,7 +231,7 @@ ECT_Supplier_Driver::connect_suppliers
 }
 
 void
-ECT_Supplier_Driver::activate_suppliers (void)
+ECT_Supplier_Driver::activate_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -240,7 +240,7 @@ ECT_Supplier_Driver::activate_suppliers (void)
 }
 
 void
-ECT_Supplier_Driver::disconnect_suppliers (void)
+ECT_Supplier_Driver::disconnect_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -252,7 +252,7 @@ ECT_Supplier_Driver::disconnect_suppliers (void)
 }
 
 void
-ECT_Supplier_Driver::dump_results (void)
+ECT_Supplier_Driver::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index 960a697e712..7eb995f7b1f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -30,8 +30,8 @@ class ECT_Supplier_Driver : public ECT_Driver
   // = DESCRIPTION
   //
 public:
-  ECT_Supplier_Driver (void);
-  virtual ~ECT_Supplier_Driver (void);
+  ECT_Supplier_Driver ();
+  virtual ~ECT_Supplier_Driver ();
 
   virtual void shutdown_consumer (void* consumer_cookie);
   // Not used....
@@ -50,13 +50,13 @@ private:
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
-  void activate_suppliers (void);
+  void activate_suppliers ();
   // Activate the suppliers, i.e. they start generating events.
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results for each supplier.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 12f9bffe059..d2eaa541490 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -31,7 +31,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-ECT_Throughput::ECT_Throughput (void)
+ECT_Throughput::ECT_Throughput ()
   : n_consumers_ (1),
     n_suppliers_ (1),
     burst_count_ (10),
@@ -51,7 +51,7 @@ ECT_Throughput::ECT_Throughput (void)
 {
 }
 
-ECT_Throughput::~ECT_Throughput (void)
+ECT_Throughput::~ECT_Throughput ()
 {
 }
 
@@ -119,8 +119,7 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[])
                       this->supplier_type_shift_,
 
                       this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil"),
-                      this->ec_concurrency_hwm_
-                      ) );
+                      this->ec_concurrency_hwm_));
         }
 
       if (this->pid_file_name_ != 0)
@@ -364,7 +363,7 @@ ECT_Throughput::connect_suppliers
 }
 
 void
-ECT_Throughput::activate_suppliers (void)
+ECT_Throughput::activate_suppliers ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -383,7 +382,7 @@ ECT_Throughput::activate_suppliers (void)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (void)
+ECT_Throughput::disconnect_suppliers ()
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -392,7 +391,7 @@ ECT_Throughput::disconnect_suppliers (void)
 }
 
 void
-ECT_Throughput::disconnect_consumers (void)
+ECT_Throughput::disconnect_consumers ()
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -401,7 +400,7 @@ ECT_Throughput::disconnect_consumers (void)
 }
 
 void
-ECT_Throughput::dump_results (void)
+ECT_Throughput::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 9d2a48261b1..5849a90d5b9 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -23,9 +23,9 @@
 class ECT_Throughput : public ECT_Driver
 {
 public:
-  ECT_Throughput (void);
+  ECT_Throughput ();
 
-  virtual ~ECT_Throughput (void);
+  virtual ~ECT_Throughput ();
 
   enum {
     MAX_CONSUMERS = 16,
@@ -48,18 +48,18 @@ private:
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_consumers (void);
+  void disconnect_consumers ();
   // Connect and disconnect the consumers.
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec);
-  void disconnect_suppliers (void);
+  void disconnect_suppliers ();
   // Connect the suppliers.
 
-  void activate_suppliers (void);
+  void activate_suppliers ();
   // Activate the suppliers, i.e. they start generating events.
 
-  void dump_results (void);
+  void dump_results ();
   // Dump the results for each supplier.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 095c7869dae..79461b2ec01 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_BCast::EC_BCast (void)
+EC_BCast::EC_BCast ()
   : bcast_address_ (ACE_TEXT("255.255.255.255")),
     bcast_port_ (12345)
 {
@@ -58,7 +58,7 @@ EC_BCast::print_args () const
 }
 
 void
-EC_BCast::print_usage (void)
+EC_BCast::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
@@ -69,7 +69,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_BCast::execute_test (void)
+EC_BCast::execute_test ()
 {
   // Subscription determining which EC events will get sent out on the
   // UDP socket.
@@ -123,7 +123,7 @@ EC_BCast::execute_test (void)
 }
 
 void
-EC_BCast::dump_results (void)
+EC_BCast::dump_results ()
 {
   this->EC_Driver::dump_results ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 60953f5bc95..a1fcc91f865 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -26,22 +26,22 @@ class EC_BCast : public EC_Driver
 {
 public:
   /// Constructor
-  EC_BCast (void);
+  EC_BCast ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable bcastions
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// set the bcastion flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
 private:
   /// The IP address used to broadcast
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..e6a4e04c443 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)
     {
@@ -116,7 +115,7 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (void)
+Task::run_iteration ()
 {
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index f1047ca6ceb..53ba9a2af11 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -26,10 +26,10 @@ public:
         int use_callbacks);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
   /// Run a single iteration of the test
-  void run_iteration (void);
+  void run_iteration ();
 
 private:
   /// The event channel used on the test
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index f39d36996f4..c04a9ec350d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -16,14 +16,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Master::EC_Master (void)
+EC_Master::EC_Master ()
   :  seed_ (0),
      n_channels_ (4),
      channels_ (0)
 {
 }
 
-EC_Master::~EC_Master (void)
+EC_Master::~EC_Master ()
 {
   if (this->channels_ != 0)
     {
@@ -220,7 +220,7 @@ EC_Observer::EC_Observer (EC_Master *master,
   this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
 }
 
-EC_Observer::~EC_Observer (void)
+EC_Observer::~EC_Observer ()
 {
   if (this->gwys_ != 0)
     delete[] this->gwys_;
@@ -244,13 +244,13 @@ EC_Observer::print_args () const
 }
 
 void
-EC_Observer::print_usage (void)
+EC_Observer::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
 
 void
-EC_Observer::execute_test (void)
+EC_Observer::execute_test ()
 {
   int peer_count = this->master_->channel_count ();
   ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
@@ -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)
@@ -287,7 +286,7 @@ EC_Observer::execute_test (void)
 }
 
 void
-EC_Observer::run_cleanup (void)
+EC_Observer::run_cleanup ()
 {
   for (int j = 0; j != this->master_->channel_count (); ++j)
     {
@@ -303,7 +302,7 @@ EC_Observer::run_cleanup (void)
 }
 
 void
-EC_Observer::dump_results (void)
+EC_Observer::dump_results ()
 {
   ACE_DEBUG ((LM_DEBUG, "===== Results for %d =====\n", this->id_));
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index 5dc1f40ce7e..5240135ff47 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -31,9 +31,9 @@ class EC_Observer;
 class EC_Master
 {
 public:
-  EC_Master (void);
+  EC_Master ();
 
-  virtual ~EC_Master (void);
+  virtual ~EC_Master ();
 
   /// Execute the test.
   virtual int run (int argc, ACE_TCHAR* argv[]);
@@ -79,20 +79,20 @@ public:
                int id);
 
   /// Destructor
-  ~EC_Observer (void);
+  ~EC_Observer ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable observerions
   virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]);
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// Run the suppliers, using the <thread_manager> parameter
-  void execute_test (void);
-  void run_cleanup (void);
+  void execute_test ();
+  void run_cleanup ();
 
-  void dump_results (void);
+  void dump_results ();
   void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 724d404cdb9..d3c94ac4582 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -29,7 +29,7 @@ deactivate_servant (PortableServer::Servant servant)
 }
 
 
-RND_Driver::RND_Driver (void)
+RND_Driver::RND_Driver ()
   :  timer_ (this),
      supplier_ (0),
      nsuppliers_ (4),
@@ -386,7 +386,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
 }
 
 void
-RND_Consumer::disconnect (void)
+RND_Consumer::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -404,7 +404,7 @@ RND_Consumer::push (const RtecEventComm::EventSet &event)
 }
 
 void
-RND_Consumer::disconnect_push_consumer (void)
+RND_Consumer::disconnect_push_consumer ()
 {
 }
 
@@ -433,7 +433,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
 }
 
 void
-RND_Supplier::disconnect (void)
+RND_Supplier::disconnect ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -445,7 +445,7 @@ RND_Supplier::disconnect (void)
 }
 
 void
-RND_Supplier::push_new_event (void)
+RND_Supplier::push_new_event ()
 {
   RtecEventComm::EventSet event (1);
   event.length (1);
@@ -473,12 +473,12 @@ RND_Supplier::push (RtecEventComm::EventSet &event)
 }
 
 void
-RND_Supplier::disconnect_push_supplier (void)
+RND_Supplier::disconnect_push_supplier ()
 {
 }
 
 int
-RND_Supplier::svc (void)
+RND_Supplier::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "Thread %t started\n"));
   int percent = 10;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 2db23e8c8a3..82de8a0d9ac 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -32,11 +32,11 @@ public:
   RND_Consumer (RND_Driver *driver);
 
   void push (const RtecEventComm::EventSet &event);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  void disconnect (void);
+  void disconnect ();
 
 protected:
   /// The driver
@@ -86,13 +86,13 @@ public:
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
                 const RtecEventChannelAdmin::SupplierQOS &qos);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event...
-  void push_new_event (void);
+  void push_new_event ();
   void push (RtecEventComm::EventSet &event);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Active method
   virtual int svc ();
@@ -119,7 +119,7 @@ RND_Supplier::RND_Supplier (int verbose)
 class RND_Driver
 {
 public:
-  RND_Driver (void);
+  RND_Driver ();
 
   /// Run the test
   int run (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index cf10b808d83..8816d9d8190 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Reconnect::EC_Reconnect (void)
+EC_Reconnect::EC_Reconnect ()
   : allow_consumer_reconnect_ (0),
     allow_supplier_reconnect_ (0),
     disconnections_ (1000)
@@ -69,7 +69,7 @@ EC_Reconnect::print_args () const
 }
 
 void
-EC_Reconnect::print_usage (void)
+EC_Reconnect::print_usage ()
 {
   this->EC_Driver::print_usage ();
 
@@ -84,7 +84,7 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Reconnect::execute_test (void)
+EC_Reconnect::execute_test ()
 {
   this->execute_consumer_test ();
   this->execute_supplier_test ();
@@ -98,12 +98,12 @@ EC_Reconnect::execute_test (void)
 }
 
 void
-EC_Reconnect::dump_results (void)
+EC_Reconnect::dump_results ()
 {
 }
 
 void
-EC_Reconnect::execute_consumer_test (void)
+EC_Reconnect::execute_consumer_test ()
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
@@ -159,7 +159,7 @@ EC_Reconnect::execute_consumer_test (void)
 }
 
 void
-EC_Reconnect::execute_supplier_test (void)
+EC_Reconnect::execute_supplier_test ()
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index 77b9275e1f5..b541edd8dde 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -37,26 +37,26 @@ class EC_Reconnect : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Reconnect (void);
+  EC_Reconnect ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable reconnections
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// set the reconnection flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
   /// Separate the suppliers and consumers.
-  void execute_consumer_test (void);
-  void execute_supplier_test (void);
+  void execute_consumer_test ();
+  void execute_supplier_test ();
 
 private:
   /// What aspect of reconnection are we going to test?
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index b7662e40b11..4af4b4d0092 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -10,7 +10,6 @@
 #include "ace/Sched_Params.h"
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -20,7 +19,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Schedule::EC_Schedule (void)
+EC_Schedule::EC_Schedule ()
   :  scheduler_impl_ (0)
 {
 }
@@ -41,13 +40,13 @@ EC_Schedule::print_args () const
 }
 
 void
-EC_Schedule::print_usage (void)
+EC_Schedule::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
 
 void
-EC_Schedule::initialize_ec_impl (void)
+EC_Schedule::initialize_ec_impl ()
 {
   this->scheduler_impl_ = new ACE_Config_Scheduler;
   this->scheduler_ = this->scheduler_impl_->_this ();
@@ -62,14 +61,14 @@ EC_Schedule::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Schedule::cleanup_ec (void)
+EC_Schedule::cleanup_ec ()
 {
   this->EC_Driver::cleanup_ec ();
   delete this->scheduler_impl_;
 }
 
 void
-EC_Schedule::execute_test (void)
+EC_Schedule::execute_test ()
 {
   CORBA::Long min_priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -103,7 +102,6 @@ EC_Schedule::execute_test (void)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG,
                 "EC_Schedule (%P|%t) schedule dumped\n"));
-
 }
 
 void
@@ -197,6 +195,6 @@ EC_Schedule::build_supplier_qos (
 }
 
 void
-EC_Schedule::dump_results (void)
+EC_Schedule::dump_results ()
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index f4f4827af2f..601a797316d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -40,25 +40,25 @@ class EC_Schedule : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Schedule (void);
+  EC_Schedule ();
 
   // = The EC_Driver methods
   /// add some command line args to change the scheduling service to
   /// use.
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// Set the scheduling service attribute
-  void initialize_ec_impl (void);
-  void cleanup_ec (void);
+  void initialize_ec_impl ();
+  void cleanup_ec ();
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just compute the schedule.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
   /// This time really connect to the scheduler
   virtual void build_consumer_qos (
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index 960ee33ee13..c329a989165 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -3,7 +3,6 @@
 #include "Supplier.h"
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -13,14 +12,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Shutdown::EC_Shutdown (void)
+EC_Shutdown::EC_Shutdown ()
   :  consumer_disconnects_ (0),
      supplier_disconnects_ (0)
 {
 }
 
 void
-EC_Shutdown::execute_test (void)
+EC_Shutdown::execute_test ()
 {
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
@@ -50,7 +49,7 @@ EC_Shutdown::execute_test (void)
 }
 
 void
-EC_Shutdown::dump_results (void)
+EC_Shutdown::dump_results ()
 {
   if (this->consumer_disconnects_ != this->n_consumers_)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index 0f796f87b5b..c1b4d2edd3c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -30,14 +30,14 @@ class EC_Shutdown : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Shutdown (void);
+  EC_Shutdown ();
 
   // = The EC_Driver methods
   /// Don't run the suppliers just create the EC and then destroy it.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
   /// One of the consumers in the test has been disconnected from the EC
   virtual void consumer_disconnect (void* consumer_cookie);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index a741f4f6c52..e52e0ae8490 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -4,7 +4,6 @@
 #include "ace/OS_NS_strings.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://as.ior");
 
 int
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index a46f3074570..2ada2260e4a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -70,7 +70,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_ERROR ((LM_ERROR,
                   "Caught CORBA::Exception\n%C (%C)\n",
                   exc._name (),
-                  exc._rep_id ()) );
+                  exc._rep_id ()));
     }
 #else
   ACE_UNUSED_ARG (argc);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index acfd331e622..91465be463b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -2,14 +2,14 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include <memory>
 
-EC_Wrapper::EC_Wrapper (void)
+EC_Wrapper::EC_Wrapper ()
   : ec_impl_ (0),
     orb_ ()
 {
 }
 
 PortableServer::Servant_var<EC_Wrapper>
-EC_Wrapper::create (void)
+EC_Wrapper::create ()
 {
   PortableServer::Servant_var<EC_Wrapper> w;
   ACE_NEW_RETURN (w,
@@ -18,7 +18,7 @@ EC_Wrapper::create (void)
   return w;
 }
 
-EC_Wrapper::~EC_Wrapper (void)
+EC_Wrapper::~EC_Wrapper ()
 {
   try
     {
@@ -71,7 +71,7 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-EC_Wrapper::for_consumers (void)
+EC_Wrapper::for_consumers ()
 {
   if (this->ec_impl_)
     return this->ec_impl_->for_consumers ();
@@ -80,7 +80,7 @@ EC_Wrapper::for_consumers (void)
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-EC_Wrapper::for_suppliers (void)
+EC_Wrapper::for_suppliers ()
 {
   if (this->ec_impl_)
     return this->ec_impl_->for_suppliers ();
@@ -89,7 +89,7 @@ EC_Wrapper::for_suppliers (void)
 }
 
 void
-EC_Wrapper::destroy_ec (void)
+EC_Wrapper::destroy_ec ()
 {
   std::unique_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_);
   this->ec_impl_ = 0;
@@ -101,7 +101,7 @@ EC_Wrapper::destroy_ec (void)
 }
 
 void
-EC_Wrapper::destroy (void)
+EC_Wrapper::destroy ()
 {
   // Deregister from POA.
   this->deactivator_.deactivate ();
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index cf73b4bca21..c089c8f6ff5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -29,10 +29,10 @@ public:
   /// Create a new EC_Wrapper object.
   /// (Constructor access is restricted to insure that all
   /// EC_Wrapper objects are heap-allocated.)
-  static PortableServer::Servant_var<EC_Wrapper> create (void);
+  static PortableServer::Servant_var<EC_Wrapper> create ();
 
   /// Destructor.  Destroys the Event Channel implementation.
-  virtual ~EC_Wrapper (void);
+  virtual ~EC_Wrapper ();
 
   /// Create and initialize underlying EC servant.
   int init (CORBA::ORB_ptr orb,
@@ -41,13 +41,13 @@ public:
   /// RtecEventChannelAdmin::Event_Channel methods.
   //@{
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (void);
+    for_consumers ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (void);
+    for_suppliers ();
 
   /// Destroy the Event Channel, deactivate from POA, and shut down
   /// the ORB.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer);
@@ -57,12 +57,12 @@ public:
 protected:
   /// Constructor (protected).  Clients can create new
   /// EC_Wrapper objects using the static create() method.
-  EC_Wrapper (void);
+  EC_Wrapper ();
 
 private:
   /// Helper - destroys Event Channel and deactivate from POA, if
   /// necessary.
-  void destroy_ec (void);
+  void destroy_ec ();
 
   /// Event Channel implementation.
   /*
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 1163e50c20a..e81c7e39244 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -6,7 +6,7 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_stdio.h"
 
-Gateway_EC::Gateway_EC (void)
+Gateway_EC::Gateway_EC ()
   : ec_ior_file_ (ACE_TEXT("gateway-ec.ior"))
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
index 455a9149cc9..86756de78f2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
@@ -21,7 +21,7 @@ class ECMcastTests_Export Gateway_EC
 {
 public:
   /// Constructor.
-  Gateway_EC (void);
+  Gateway_EC ();
 
   /// Run the server.
   /// Valid arguments: [-i ior_filename].
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/README b/TAO/orbsvcs/tests/Event/Mcast/Complex/README
index 54848f4c07d..854669c83ae 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/README
@@ -1,5 +1,3 @@
-
-
 Goals:
 ------
 This is a step up from the Simple mcast test.  There are still two
@@ -49,7 +47,3 @@ $gateway-ec -ORBsvcconf consumer-ec.conf -i consumer-ec.ior
 $consumer -ORBInitRef Event_Service=file://consumer-ec.ior
 $gateway-ec -ORBsvcconf supplier-ec.conf -i supplier-ec.ior
 $supplier -ORBInitRef Event_Service=file://supplier-ec.ior
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 73657253981..71df48f6d3c 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -8,7 +8,6 @@ class EC_Consumer:
   public POA_RtecEventComm::PushConsumer
 {
 public:
-
   /// Constructor.
   EC_Consumer (CORBA::ORB_var orb,
                RtecEventChannelAdmin::EventChannel_var ec);
@@ -20,13 +19,12 @@ public:
   virtual void push (const RtecEventComm::EventSet &events);
 
   /// No-op.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
-
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (void);
+  void disconnect ();
 
   /// Number of events of different types pushed to us by EC.
   //@{
@@ -84,12 +82,12 @@ EC_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-EC_Consumer::disconnect_push_consumer (void)
+EC_Consumer::disconnect_push_consumer ()
 {
 }
 
 void
-EC_Consumer::disconnect (void)
+EC_Consumer::disconnect ()
 {
   if (this->a_events_ == 100
       && this->b_events_ == 100
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/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 397f37adb0e..4ae2f574a8e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -13,7 +13,6 @@ EchoEventConsumer_i::EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit)
   : orb_(CORBA::ORB::_duplicate(orb))
   , event_limit_(event_limit)
 {
-  // Nothing to do.
 }
 
 // Implement the push() operation.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
index 0417aa89000..0dfdd9ed605 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -8,18 +8,18 @@
 
 class EchoEventConsumer_i : public virtual POA_RtecEventComm::PushConsumer
 {
-  public:
-    // Constructor
-    EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit);
+public:
+  // Constructor
+  EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit);
 
-    // Override operations from PushConsumer interface.
-    virtual void push(const RtecEventComm::EventSet& events);
+  // Override operations from PushConsumer interface.
+  virtual void push(const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer();
+  virtual void disconnect_push_consumer();
 
-  private:
-    CORBA::ORB_var orb_;
-    int event_limit_;
+private:
+  CORBA::ORB_var orb_;
+  int event_limit_;
 };
 
 #endif // _EchoEventConsumer_i_h_
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 99e1f474cce..e467d335503 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -20,7 +20,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_strings.h"
 
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include <fstream>
 
 const RtecEventComm::EventSourceID MY_SOURCE_ID  = ACE_ES_EVENT_SOURCE_ANY + 1;
@@ -193,22 +193,20 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     receiver->connect (pub);
 
     // Create the appropriate event handler and register it with the reactor
-    auto_ptr<ACE_Event_Handler> eh;
+    std::unique_ptr<ACE_Event_Handler> eh;
     if (mcast) {
-      auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
+      std::unique_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
       mcast_eh->reactor (orb->orb_core ()->reactor ());
       mcast_eh->open (ec.in());
-      ACE_auto_ptr_reset(eh,mcast_eh.release());
-      //eh.reset(mcast_eh.release());
+      eh.reset (mcast_eh.release());
     } else {
-      auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
+      std::unique_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
       udp_eh->reactor (orb->orb_core ()->reactor ());
       ACE_INET_Addr local_addr (listenport);
       if (udp_eh->open (local_addr) == -1)
         ACE_ERROR ((LM_ERROR,"Cannot open EH\n"));
 
-      ACE_auto_ptr_reset(eh,udp_eh.release());
-      //eh.reset(udp_eh.release());
+      eh.reset(udp_eh.release());
     }
 
     // Create an event (just a string in this case).
@@ -239,8 +237,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #endif  /* !TAO_LACKS_EVENT_CHANNEL_ANY */
 
     if (iorfile != 0) {
-      CORBA::String_var str = orb->object_to_string( ec.in() );
-      std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(iorfile) );
+      CORBA::String_var str = orb->object_to_string( ec.in());
+      std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(iorfile));
       iorFile << str.in() << std::endl;
       iorFile.close();
     }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index af651e069a4..59540133373 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -8,7 +8,6 @@
 EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
-  // Nothing to do.
 }
 
 // Override the disconnect_push_Supplier() operation.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
index 3cba086c295..7634682f6ab 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -8,14 +8,14 @@
 
 class EchoEventSupplier_i : public virtual POA_RtecEventComm::PushSupplier
 {
-  public:
-    // Constructor
-    EchoEventSupplier_i(CORBA::ORB_ptr orb);
+public:
+  // Constructor
+  EchoEventSupplier_i(CORBA::ORB_ptr orb);
 
-    virtual void disconnect_push_supplier();
+  virtual void disconnect_push_supplier();
 
-  private:
-    CORBA::ORB_var orb_;
+private:
+  CORBA::ORB_var orb_;
 };
 
 #endif // _EchoEventSupplier_i_h_
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
index 2fc738378e9..0fbc9d929e5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
@@ -1,11 +1,5 @@
-
-
 Real-Time Event Service
 
-
-File: TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
-
-
 This directory contains an example that shows how to create and
 federate real-time event channels using the classes in EC_Gateway_UDP.h.
 Depending on the options, it will use either UDP or multicast to link
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/README b/TAO/orbsvcs/tests/Event/Mcast/Simple/README
index ba52b7dc019..86cbcb1b82e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/README
@@ -1,5 +1,3 @@
-
-
 Goals:
 ------
 This is the most basic test for federating Event Channels via
@@ -57,6 +55,3 @@ $gateway-ec -ORBsvcconf udp-consumer-ec.conf -i consumer-ec.ior
 $consumer -ORBInitRef Event_Service=file://consumer-ec.ior
 $gateway-ec -ORBsvcconf udp-supplier-ec.conf -i supplier-ec.ior
 $supplier -ORBInitRef Event_Service=file://supplier-ec.ior
-
-
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index aecce1812e7..8586ae2efc4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -8,7 +8,6 @@ class EC_Consumer:
   public POA_RtecEventComm::PushConsumer
 {
 public:
-
   /// Constructor.
   EC_Consumer (CORBA::ORB_var orb,
                RtecEventChannelAdmin::EventChannel_var ec);
@@ -18,14 +17,13 @@ public:
   /// Logs each event.  Initiates shutdown after receiving 100 events.
   virtual void push (const RtecEventComm::EventSet &events);
   /// No-op.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   //@}
 
 private:
-
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (void);
+  void disconnect ();
 
   /// Number of events pushed to us by EC.
   size_t n_events_;
@@ -57,12 +55,12 @@ EC_Consumer::push (const RtecEventComm::EventSet &events)
 }
 
 void
-EC_Consumer::disconnect_push_consumer (void)
+EC_Consumer::disconnect_push_consumer ()
 {
 }
 
 void
-EC_Consumer::disconnect (void)
+EC_Consumer::disconnect ()
 {
   if (this->n_events_ == 100)
     {
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README
index c98720e3dc8..1766c36e8db 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README
@@ -1,5 +1,3 @@
-
-
 Goals:
 ------
 The goal of this test is to verify that federation of Event Channels
@@ -50,8 +48,3 @@ Manually:
 As many times as desired (using a different ior file name each time) do
 $gateway-ec -ORBsvcconf gateway.conf -i ec.ior
 $application -ORBInitRef Event_Service=file://ec.ior -d
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index 68b0f6af7f7..a756d6575f9 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -39,12 +39,11 @@ class Heartbeat_Application :
   public TAO_EC_Deactivated_Object
 {
 public:
-
   /// Constructor.
-  Heartbeat_Application (void);
+  Heartbeat_Application ();
 
   /// Destructor.
-  ~Heartbeat_Application (void);
+  ~Heartbeat_Application ();
 
   // Initializes the object: connects with EC as a supplier and a
   // consumer and registers with reactor for timeouts.  If init ()
@@ -60,7 +59,7 @@ public:
   // No-op if the object hasn't been fully initialized.  Otherwise,
   // deregister from reactor and poa, destroy ec or just disconnect from it
   // (based on <destroy_ec> flag), and shut down the orb.
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   /// Send another heartbeat or, if we already sent/attempted the required
@@ -74,11 +73,10 @@ public:
   virtual void push (const RtecEventComm::EventSet &events);
 
   /// Initiate shutdown().
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   //@}
 
 private:
-
   /**
    * @class Timeout_Handler
    *
@@ -103,16 +101,16 @@ private:
   int check_args (CORBA::ORB_var orb,
                   RtecEventChannelAdmin::EventChannel_var ec);
   /// Connects to EC as a supplier.
-  void connect_as_supplier (void);
+  void connect_as_supplier ();
   /// Connects to EC as a consumer.  Activate with default POA.
-  void connect_as_consumer (void);
+  void connect_as_consumer ();
   /// Call destroy() on the EC.  Does not propagate exceptions.
-  void destroy_ec (void);
+  void destroy_ec ();
   /// Registers with orb's reactor for timeouts ocurring every 0.5
   /// seconds. Returns 0 on success, -1 on error.
-  int register_for_timeouts (void);
+  int register_for_timeouts ();
   /// Deregister from reactor.
-  void stop_timeouts (void);
+  void stop_timeouts ();
   //@}
 
   /// Flag indicating whether this object has been fully initialized.
@@ -173,7 +171,7 @@ handle_timeout (const ACE_Time_Value& tv,
 
 // **************************************************************************
 
-Heartbeat_Application::Heartbeat_Application (void)
+Heartbeat_Application::Heartbeat_Application ()
   : initialized_ (0)
   , timeout_handler_ (this)
   , n_timeouts_ (0)
@@ -185,7 +183,7 @@ Heartbeat_Application::Heartbeat_Application (void)
 {
 }
 
-Heartbeat_Application::~Heartbeat_Application (void)
+Heartbeat_Application::~Heartbeat_Application ()
 {
 }
 
@@ -268,7 +266,7 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
 }
 
 int
-Heartbeat_Application::register_for_timeouts (void)
+Heartbeat_Application::register_for_timeouts ()
 {
   // Schedule timeout every 0.5 seconds, for sending heartbeat events.
   ACE_Time_Value timeout_interval (0, 500000);
@@ -288,7 +286,7 @@ Heartbeat_Application::register_for_timeouts (void)
 }
 
 void
-Heartbeat_Application::stop_timeouts (void)
+Heartbeat_Application::stop_timeouts ()
 {
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
   if (!reactor
@@ -301,7 +299,7 @@ Heartbeat_Application::stop_timeouts (void)
 }
 
 void
-Heartbeat_Application::connect_as_supplier (void)
+Heartbeat_Application::connect_as_supplier ()
 {
   // Obtain reference to SupplierAdmin.
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -324,7 +322,7 @@ Heartbeat_Application::connect_as_supplier (void)
 }
 
 void
-Heartbeat_Application::connect_as_consumer (void)
+Heartbeat_Application::connect_as_consumer ()
 {
   // Activate with poa.
   RtecEventComm::PushConsumer_var consumer_ref;
@@ -443,13 +441,13 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events)
 }
 
 void
-Heartbeat_Application::disconnect_push_consumer (void)
+Heartbeat_Application::disconnect_push_consumer ()
 {
   this->shutdown ();
 }
 
 void
-Heartbeat_Application::destroy_ec (void)
+Heartbeat_Application::destroy_ec ()
 {
   if (!CORBA::is_nil (this->ec_.in ()))
     {
@@ -467,7 +465,7 @@ Heartbeat_Application::destroy_ec (void)
     }
 }
 void
-Heartbeat_Application::shutdown (void)
+Heartbeat_Application::shutdown ()
 {
   if (!this->initialized_)
     return;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index f810a281bc7..4bf80a412d2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -15,13 +15,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Connect::EC_Connect (void)
+EC_Connect::EC_Connect ()
   : order_ (0)
 {
 }
 
 void
-EC_Connect::execute_test (void)
+EC_Connect::execute_test ()
 {
   // this->EC_Driver::execute_test ();
 }
@@ -70,7 +70,7 @@ EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[])
 }
 
 void
-EC_Connect::print_usage (void)
+EC_Connect::print_usage ()
 {
   this->EC_Driver::print_usage ();
 
@@ -92,7 +92,7 @@ EC_Connect::print_args () const
 }
 
 void
-EC_Connect::dump_results (void)
+EC_Connect::dump_results ()
 {
   ACE_High_Res_Timer::global_scale_factor_type gsf =
     ACE_High_Res_Timer::global_scale_factor ();
@@ -142,7 +142,7 @@ EC_Connect::allocate_supplier (int i)
 }
 
 void
-EC_Connect::connect_clients (void)
+EC_Connect::connect_clients ()
 {
   this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
@@ -187,7 +187,7 @@ EC_Connect::connect_clients (void)
 }
 
 void
-EC_Connect::disconnect_clients (void)
+EC_Connect::disconnect_clients ()
 {
   switch (this->order_)
     {
@@ -247,7 +247,7 @@ EC_Connect::disconnect_clients (void)
 }
 
 void
-EC_Connect::disconnect_consumers (void)
+EC_Connect::disconnect_consumers ()
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
@@ -269,7 +269,7 @@ EC_Connect::disconnect_consumers (void)
 }
 
 void
-EC_Connect::disconnect_suppliers (void)
+EC_Connect::disconnect_suppliers ()
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 22623793bea..418cd5353f3 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -38,17 +38,17 @@ class EC_Connect : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Connect (void);
+  EC_Connect ();
 
   // = The EC_Driver methods
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
-  virtual void print_usage (void);
+  virtual void print_usage ();
   virtual void print_args () const;
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
-  virtual void dump_results (void);
+  virtual void dump_results ();
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
@@ -56,14 +56,14 @@ public:
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     int i);
-  virtual void disconnect_consumers (void);
-  virtual void disconnect_suppliers (void);
+  virtual void disconnect_consumers ();
+  virtual void disconnect_suppliers ();
 
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
-  virtual void connect_clients (void);
-  virtual void disconnect_clients (void);
+  virtual void connect_clients ();
+  virtual void disconnect_clients ();
 
 private:
   ACE_hrtime_t start_time_;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 8c949bfcd1e..b6e082e55be 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Inversion::EC_Inversion (void)
+EC_Inversion::EC_Inversion ()
   :  same_events_ (0)
 {
 }
@@ -50,7 +50,7 @@ EC_Inversion::parse_args (int &argc, ACE_TCHAR *argv [])
 }
 
 void
-EC_Inversion::connect_consumers (void)
+EC_Inversion::connect_consumers ()
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers ();
@@ -84,7 +84,7 @@ EC_Inversion::connect_consumers (void)
 }
 
 void
-EC_Inversion::connect_suppliers (void)
+EC_Inversion::connect_suppliers ()
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     this->event_channel_->for_suppliers ();
@@ -117,7 +117,7 @@ EC_Inversion::connect_suppliers (void)
 }
 
 void
-EC_Inversion::activate_tasks (void)
+EC_Inversion::activate_tasks ()
 {
   int priority;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index 03c07d71439..e9e101f1c3e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -26,7 +26,7 @@ class EC_Inversion : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Inversion (void);
+  EC_Inversion ();
 
   // = The EC_Driver methods
   /**
@@ -42,11 +42,11 @@ public:
    * other consumer receives events from a set of low priority
    * suppliers.
    */
-  virtual void connect_consumers (void);
-  virtual void connect_suppliers (void);
+  virtual void connect_consumers ();
+  virtual void connect_suppliers ();
 
   /// Activate the suppliers at different priorities
-  virtual void activate_tasks (void);
+  virtual void activate_tasks ();
 
 private:
   /// If set then both low priority and high priority suppliers
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index d44f1be20cd..f3644488f24 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -12,7 +12,6 @@
 #include "ace/OS_NS_errno.h"
 
 
-
 int iterations = 1000;
 int do_dump_history = 0;
 const ACE_TCHAR *ec_ior = ACE_TEXT("file://ec.ior");
@@ -281,7 +280,7 @@ EC_Latency_Consumer::EC_Latency_Consumer (ACE_Sample_History *history,
 }
 
 int
-EC_Latency_Consumer::done (void)
+EC_Latency_Consumer::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_, -1);
   return this->remaining_messages_ <= 0;
@@ -307,18 +306,18 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-EC_Latency_Consumer::disconnect_push_consumer (void)
+EC_Latency_Consumer::disconnect_push_consumer ()
 {
 }
 
 // ****************************************************************
 
-EC_Latency_Supplier::EC_Latency_Supplier (void)
+EC_Latency_Supplier::EC_Latency_Supplier ()
 {
 }
 
 void
-EC_Latency_Supplier::disconnect_push_supplier (void)
+EC_Latency_Supplier::disconnect_push_supplier ()
 {
 }
 
@@ -332,14 +331,14 @@ Task::Task (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
 }
 
 int
-Task::done (void)
+Task::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1);
   return this->remaining_messages_ == 0;
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 47f32d3a180..dd5cdb86b0a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -33,10 +33,10 @@ public:
                        int message_count);
 
   /// Return 1 when all the messages have been received
-  int done (void);
+  int done ();
 
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// Roundtrip delays are recorded here
@@ -55,9 +55,9 @@ class EC_Latency_Supplier : public POA_RtecEventComm::PushSupplier
 {
 public:
   /// Constructor
-  EC_Latency_Supplier (void);
+  EC_Latency_Supplier ();
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 };
 
 // ****************************************************************
@@ -71,10 +71,10 @@ public:
         int iterations);
 
   /// Return 1 when all the messages have been sent
-  int done (void);
+  int done ();
 
   /// Run the experiment
-  int svc (void);
+  int svc ();
 
 private:
   /// The consumer
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 156656a53a9..91415ec499c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -11,7 +11,6 @@
 #include "ace/OS_NS_errno.h"
 
 
-
 const ACE_TCHAR *ior_file_name = ACE_TEXT("ec.ior");
 
 /// Parse the arguments.
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 780e75ac9f1..dc5377b5c6a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -13,7 +13,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-EC_Throughput::EC_Throughput (void)
+EC_Throughput::EC_Throughput ()
 {
 }
 
@@ -32,7 +32,7 @@ EC_Throughput::print_args () const
 }
 
 void
-EC_Throughput::print_usage (void)
+EC_Throughput::print_usage ()
 {
   this->EC_Driver::print_usage ();
 }
@@ -43,13 +43,13 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_Throughput::execute_test (void)
+EC_Throughput::execute_test ()
 {
   this->EC_Driver::execute_test ();
 }
 
 void
-EC_Throughput::dump_results (void)
+EC_Throughput::dump_results ()
 {
   this->EC_Driver::dump_results ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index 1b414749d8b..72d06bc50ca 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -26,22 +26,22 @@ class EC_Throughput : public EC_Driver
 {
 public:
   /// Constructor
-  EC_Throughput (void);
+  EC_Throughput ();
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable throughputions
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args () const;
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// set the throughpution flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (void);
+  void execute_test ();
 
   /// Don't dump the EC_Driver results, they are meaningless.
-  void dump_results (void);
+  void dump_results ();
 
 private:
 };
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
index 8c904867a3a..13319a2d586 100644
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
@@ -8,7 +8,6 @@
 #include "ace/OS_NS_strings.h"
 
 
-
 /*
   Here are the scenarios we need to test:
 
@@ -55,7 +54,6 @@ struct ThreadFlagsTest
   How assign_;
   ExpectedValues expected_values_;
   ExpectedValues which_results_to_check_;
-
 };
 
 ThreadFlagsTest::ThreadFlagsTest (const char* sym,
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index e6dc0eababf..389dcea940a 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -2,7 +2,6 @@
 #include "tao/SystemException.h"
 
 
-
 AddrServer::AddrServer (const ACE_INET_Addr& addr)
 {
   this->addr_ = addr;
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index b6b70325e93..550942be7a5 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -45,7 +45,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-Consumer::disconnect (void)
+Consumer::disconnect ()
 {
   try
     {
@@ -124,7 +124,7 @@ Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-Consumer::disconnect_push_consumer (void)
+Consumer::disconnect_push_consumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
index c5cca80be8c..5c0dfe9f43c 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
@@ -36,13 +36,13 @@ public:
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   CORBA::ULong event_count () const;
 private:
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 2180da5fc08..845db3d1e08 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -30,7 +30,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 }
 
 void
-Supplier::disconnect (void)
+Supplier::disconnect ()
 {
   // Disconnect from the EC
   try
@@ -55,7 +55,7 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb)
 }
 
 void
-Supplier::perform_push (void)
+Supplier::perform_push ()
 {
   try
     {
@@ -89,7 +89,7 @@ Supplier::perform_push (void)
 }
 
 void
-Supplier::disconnect_push_supplier (void)
+Supplier::disconnect_push_supplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index ff0ce11b4c0..8142f79ce21 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -37,15 +37,15 @@ public:
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the event channel
-  void disconnect (void);
+  void disconnect ();
 
   /// Push a single event
-  void perform_push (void);
+  void perform_push ();
 
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   void insert_into_any (CORBA::Any& any, Components::EventBase* vb);
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 4872289a5a3..56df011d037 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -53,7 +53,7 @@ EC_Consumer::connected () const
 }
 
 void
-EC_Consumer::disconnect (void)
+EC_Consumer::disconnect ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -65,7 +65,7 @@ EC_Consumer::disconnect (void)
 }
 
 void
-EC_Consumer::shutdown (void)
+EC_Consumer::shutdown ()
 {
   if (!this->is_active_)
     return;
@@ -137,7 +137,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-EC_Consumer::disconnect_push_consumer (void)
+EC_Consumer::disconnect_push_consumer ()
 {
   this->driver_->consumer_disconnect (this->cookie_);
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index d8dd29aba14..7a6beedcf3b 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -61,10 +61,10 @@ public:
 
   /// The application can invoke this method to disconnect from the EC
   /// and deactivate this class.
-  void disconnect (void);
+  void disconnect ();
 
   /// The application is shutting down, deactivate the consumer.
-  void shutdown (void);
+  void shutdown ();
 
   /// Accumulate our statistics to the totals.
   void accumulate (ACE_Throughput_Stats& throughput) const;
@@ -78,7 +78,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   /// The main driver for the test.
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index 2c28ecdda5e..e68c91f2a2a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -1,7 +1,6 @@
 #include "Counting_Consumer.h"
 
 
-
 EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
   : event_count (0),
     disconnect_count (0),
@@ -29,7 +28,7 @@ EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-EC_Counting_Consumer::disconnect (void)
+EC_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -41,14 +40,13 @@ EC_Counting_Consumer::disconnect (void)
 }
 
 void
-EC_Counting_Consumer::deactivate (void)
+EC_Counting_Consumer::deactivate ()
 {
   PortableServer::POA_var consumer_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
     consumer_poa->servant_to_id (this);
   consumer_poa->deactivate_object (consumer_id.in ());
-
 }
 
 void
@@ -96,7 +94,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-EC_Counting_Consumer::disconnect_push_consumer (void)
+EC_Counting_Consumer::disconnect_push_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 91cbe460445..afbe9007f13 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -36,8 +36,8 @@ public:
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  void disconnect (void);
-  void deactivate (void);
+  void disconnect ();
+  void deactivate ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
@@ -47,7 +47,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 52ea5d4d378..05f6d5d4556 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -2,7 +2,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "ace/OS_NS_unistd.h"
 
-EC_Counting_Supplier::EC_Counting_Supplier (void)
+EC_Counting_Supplier::EC_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0),
      consumer_adapter_ (this),
@@ -38,7 +38,7 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
 }
 
 void
-EC_Counting_Supplier::deactivate (void)
+EC_Counting_Supplier::deactivate ()
 {
   this->supplier_proxy_->disconnect_push_supplier ();
 
@@ -87,7 +87,7 @@ EC_Counting_Supplier::connect (
 }
 
 void
-EC_Counting_Supplier::disconnect (void)
+EC_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -121,12 +121,12 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&)
 }
 
 void
-EC_Counting_Supplier::disconnect_push_consumer (void)
+EC_Counting_Supplier::disconnect_push_consumer ()
 {
 }
 
 void
-EC_Counting_Supplier::disconnect_push_supplier (void)
+EC_Counting_Supplier::disconnect_push_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
@@ -158,20 +158,20 @@ EC_Counting_Supplier_Task::svc ()
 }
 
 void
-EC_Counting_Supplier_Task::stop (void)
+EC_Counting_Supplier_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-EC_Counting_Supplier_Task::push_count (void)
+EC_Counting_Supplier_Task::push_count ()
 {
   return this->push_count_;
 }
 
 void
-EC_Counting_Supplier_Task::run (void)
+EC_Counting_Supplier_Task::run ()
 {
   this->event_.length (1);
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 8104a801765..28c733a1173 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -32,7 +32,7 @@ class EC_Test_Export EC_Counting_Supplier : public POA_RtecEventComm::PushSuppli
 {
 public:
   /// Constructor
-  EC_Counting_Supplier (void);
+  EC_Counting_Supplier ();
 
   // = The RtecEventComm::PushSupplier methods
 
@@ -44,7 +44,7 @@ public:
    */
   void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                  int period);
-  void deactivate (void);
+  void deactivate ();
 
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
@@ -54,14 +54,14 @@ public:
                 int event_type);
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 const RtecEventChannelAdmin::SupplierQOS &qos);
-  void disconnect (void);
+  void disconnect ();
 
   /// The Consumer side methods.
   void push (const RtecEventComm::EventSet& events);
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
@@ -93,13 +93,13 @@ public:
   EC_Counting_Supplier_Task (EC_Counting_Supplier *supplier);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong push_count (void);
+  void stop ();
+  CORBA::ULong push_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The supplier we are turning into an active object
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index ea034f0539b..c297a9147e3 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -25,8 +25,7 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-EC_Driver::EC_Driver (void)
+EC_Driver::EC_Driver ()
   :  n_consumers_ (1),
      consumers_ (0),
      n_suppliers_ (1),
@@ -52,7 +51,7 @@ EC_Driver::EC_Driver (void)
   TAO_EC_Default_Factory::init_svcs ();
 }
 
-EC_Driver::~EC_Driver (void)
+EC_Driver::~EC_Driver ()
 {
 }
 
@@ -124,7 +123,7 @@ EC_Driver::run_init (int &argc, ACE_TCHAR* argv[])
 }
 
 void
-EC_Driver::run_cleanup (void)
+EC_Driver::run_cleanup ()
 {
   this->disconnect_clients ();
 
@@ -210,12 +209,11 @@ EC_Driver::print_args () const
               this->supplier_type_count_,
               this->supplier_type_shift_,
 
-              this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")
-              ) );
+              this->pid_file_name_?this->pid_file_name_:ACE_TEXT("nil")));
 }
 
 int
-EC_Driver::move_to_rt_class (void)
+EC_Driver::move_to_rt_class ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -249,7 +247,7 @@ EC_Driver::move_to_rt_class (void)
 }
 
 void
-EC_Driver::initialize_ec_impl (void)
+EC_Driver::initialize_ec_impl ()
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -264,7 +262,7 @@ EC_Driver::initialize_ec_impl (void)
 
 #if !defined(EC_DISABLE_REMOTE_EC)
 void
-EC_Driver::obtain_remote_ec (void)
+EC_Driver::obtain_remote_ec ()
 {
   CosNaming::NamingContext_var naming_context =
     this->get_naming_context ();
@@ -281,7 +279,7 @@ EC_Driver::obtain_remote_ec (void)
 }
 
 CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (void)
+EC_Driver::get_naming_context ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -296,7 +294,7 @@ EC_Driver::get_naming_context (void)
 #endif
 
 void
-EC_Driver::initialize_new_ec (void)
+EC_Driver::initialize_new_ec ()
 {
   TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
                                         this->root_poa_.in ());
@@ -314,7 +312,7 @@ EC_Driver::initialize_new_ec (void)
 }
 
 void
-EC_Driver::deactivate_ec (void)
+EC_Driver::deactivate_ec ()
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -332,17 +330,16 @@ EC_Driver::deactivate_ec (void)
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n"));
-
 }
 
 void
-EC_Driver::destroy_ec (void)
+EC_Driver::destroy_ec ()
 {
   this->event_channel_->destroy ();
 }
 
 int
-EC_Driver::allocate_consumers (void)
+EC_Driver::allocate_consumers ()
 {
   ACE_NEW_RETURN (this->consumers_,
                   EC_Consumer*[this->n_consumers_],
@@ -354,7 +351,7 @@ EC_Driver::allocate_consumers (void)
 }
 
 int
-EC_Driver::allocate_suppliers (void)
+EC_Driver::allocate_suppliers ()
 {
   ACE_NEW_RETURN (this->suppliers_,
                   EC_Supplier*[this->n_suppliers_],
@@ -380,7 +377,7 @@ EC_Driver::allocate_supplier (int i)
 }
 
 void
-EC_Driver::connect_clients (void)
+EC_Driver::connect_clients ()
 {
   this->connect_consumers ();
 
@@ -388,7 +385,7 @@ EC_Driver::connect_clients (void)
 }
 
 void
-EC_Driver::disconnect_clients (void)
+EC_Driver::disconnect_clients ()
 {
   this->disconnect_suppliers ();
 
@@ -396,7 +393,7 @@ EC_Driver::disconnect_clients (void)
 }
 
 void
-EC_Driver::shutdown_clients (void)
+EC_Driver::shutdown_clients ()
 {
   this->shutdown_suppliers ();
 
@@ -404,7 +401,7 @@ EC_Driver::shutdown_clients (void)
 }
 
 void
-EC_Driver::connect_consumers (void)
+EC_Driver::connect_consumers ()
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers ();
@@ -456,7 +453,7 @@ EC_Driver::build_consumer_qos (
 }
 
 void
-EC_Driver::connect_suppliers (void)
+EC_Driver::connect_suppliers ()
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     this->event_channel_->for_suppliers ();
@@ -510,7 +507,7 @@ EC_Driver::build_supplier_qos (
 }
 
 void
-EC_Driver::execute_test (void)
+EC_Driver::execute_test ()
 {
   if (this->allocate_tasks () == -1)
     return;
@@ -531,7 +528,7 @@ EC_Driver::execute_test (void)
 }
 
 int
-EC_Driver::allocate_tasks (void)
+EC_Driver::allocate_tasks ()
 {
   if (this->tasks_ != 0)
     return 0;
@@ -561,7 +558,7 @@ EC_Driver::allocate_task (int i)
 }
 
 void
-EC_Driver::activate_tasks (void)
+EC_Driver::activate_tasks ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -587,7 +584,7 @@ EC_Driver::activate_tasks (void)
 }
 
 void
-EC_Driver::disconnect_suppliers (void)
+EC_Driver::disconnect_suppliers ()
 {
   if (this->suppliers_ == 0)
     return;
@@ -600,7 +597,7 @@ EC_Driver::disconnect_suppliers (void)
 }
 
 void
-EC_Driver::disconnect_consumers (void)
+EC_Driver::disconnect_consumers ()
 {
   if (this->consumers_ == 0)
     return;
@@ -613,7 +610,7 @@ EC_Driver::disconnect_consumers (void)
 }
 
 void
-EC_Driver::shutdown_suppliers (void)
+EC_Driver::shutdown_suppliers ()
 {
   if (this->suppliers_ == 0)
     return;
@@ -626,7 +623,7 @@ EC_Driver::shutdown_suppliers (void)
 }
 
 void
-EC_Driver::shutdown_consumers (void)
+EC_Driver::shutdown_consumers ()
 {
   if (this->consumers_ == 0)
     return;
@@ -639,7 +636,7 @@ EC_Driver::shutdown_consumers (void)
 }
 
 void
-EC_Driver::dump_results (void)
+EC_Driver::dump_results ()
 {
   ACE_Throughput_Stats throughput;
   ACE_High_Res_Timer::global_scale_factor_type gsf =
@@ -847,7 +844,7 @@ EC_Driver::parse_args (int &argc, ACE_TCHAR *argv [])
 }
 
 void
-EC_Driver::print_usage (void)
+EC_Driver::print_usage ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "EC_Driver Usage:\n"
@@ -880,7 +877,7 @@ EC_Driver::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Driver::cleanup_tasks (void)
+EC_Driver::cleanup_tasks ()
 {
   if (this->tasks_ != 0)
     {
@@ -895,7 +892,7 @@ EC_Driver::cleanup_tasks (void)
 }
 
 void
-EC_Driver::cleanup_suppliers (void)
+EC_Driver::cleanup_suppliers ()
 {
   if (this->suppliers_ != 0)
     {
@@ -910,7 +907,7 @@ EC_Driver::cleanup_suppliers (void)
 }
 
 void
-EC_Driver::cleanup_consumers (void)
+EC_Driver::cleanup_consumers ()
 {
   if (this->consumers_ != 0)
     {
@@ -925,7 +922,7 @@ EC_Driver::cleanup_consumers (void)
 }
 
 void
-EC_Driver::cleanup_ec (void)
+EC_Driver::cleanup_ec ()
 {
   delete this->ec_impl_;
 #if !defined(EC_DISABLE_OLD_EC)
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 833a401925b..f577bce079f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -51,10 +51,10 @@ class EC_Test_Export EC_Driver
 {
 public:
   /// Constructor
-  EC_Driver (void);
+  EC_Driver ();
 
   /// Destructor
-  virtual ~EC_Driver (void);
+  virtual ~EC_Driver ();
 
   /// Flag to indicate in the test should be verbose.
   int verbose () const;
@@ -66,7 +66,7 @@ public:
   virtual void run_init (int& argc, ACE_TCHAR* argv[]);
 
   /// The cleanup section
-  virtual void run_cleanup (void);
+  virtual void run_cleanup ();
 
   /// Initialize the ORB and obtain the RootPOA object
   virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]);
@@ -75,33 +75,33 @@ public:
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
 
   /// Print the usage method
-  virtual void print_usage (void);
+  virtual void print_usage ();
 
   /// Print out the arguments
   virtual void print_args () const;
 
   /// Run the test in the real-time class, return -1 on error.
-  virtual int move_to_rt_class (void);
+  virtual int move_to_rt_class ();
 
   /// Construct the EC and its helper objects, also activates the EC in
   /// the RootPOA.
-  virtual void initialize_ec_impl (void);
+  virtual void initialize_ec_impl ();
 
   /// By default connect the consumers and then the suppliers, other
   /// orders should work too.
-  virtual void connect_clients (void);
+  virtual void connect_clients ();
 
   /// By default disconnect the suppliers and then the consumers, other
   /// orders should work too.
-  virtual void disconnect_clients (void);
+  virtual void disconnect_clients ();
 
   /// By default deactivate the suppliers and then the consumers, other
   /// orders should work too.
-  virtual void shutdown_clients (void);
+  virtual void shutdown_clients ();
 
   /// Connect all the consumers, by default it lets each consumer
   /// connect itself.
-  virtual void connect_consumers (void);
+  virtual void connect_consumers ();
 
   /// Connect consumer number <i> using the consumer_admin provided.
   virtual void connect_consumer (
@@ -116,7 +116,7 @@ public:
 
   /// Connect all the suppliers, by default it lets each supplier
   /// connect itself.
-  virtual void connect_suppliers (void);
+  virtual void connect_suppliers ();
 
   /// Connect supplier number <i> using the supplier_admin provided.
   virtual void connect_supplier (
@@ -130,38 +130,38 @@ public:
       int& shutdown_event_type);
 
   /// Execute the test, by default simply call activate_suppliers()
-  virtual void execute_test (void);
+  virtual void execute_test ();
 
   /**
    * Dump the results, i.e. invoke dump_results on all the suppliers
    * and consumers, collect the latency and throughput results for
    * each and print the totals too.
    */
-  virtual void dump_results (void);
+  virtual void dump_results ();
 
   /// Disconnect all the consumers.
-  virtual void disconnect_consumers (void);
+  virtual void disconnect_consumers ();
 
   /// Disconnect all the suppliers.
-  virtual void disconnect_suppliers (void);
+  virtual void disconnect_suppliers ();
 
   /// Deactivate all the consumers.
-  virtual void shutdown_consumers (void);
+  virtual void shutdown_consumers ();
 
   /// Deactivate all the suppliers.
-  virtual void shutdown_suppliers (void);
+  virtual void shutdown_suppliers ();
 
   /// Call EC->destroy
-  virtual void destroy_ec (void);
+  virtual void destroy_ec ();
 
   /// De-activate the EC (and its helper classes).
-  virtual void deactivate_ec (void);
+  virtual void deactivate_ec ();
 
   /// Cleanup the resources
-  virtual void cleanup_ec (void);
-  virtual void cleanup_tasks (void);
-  virtual void cleanup_consumers (void);
-  virtual void cleanup_suppliers (void);
+  virtual void cleanup_ec ();
+  virtual void cleanup_tasks ();
+  virtual void cleanup_consumers ();
+  virtual void cleanup_suppliers ();
 
   /// Allow modifications of the default EC attributes
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
@@ -187,30 +187,30 @@ public:
 
 #if !defined(EC_DISABLE_REMOTE_EC)
   /// Obtain the EC from the Naming service
-  virtual void obtain_remote_ec (void);
+  virtual void obtain_remote_ec ();
 
   virtual CosNaming::NamingContext_ptr
-       get_naming_context (void);
+       get_naming_context ();
 #endif
 
   /// Initialize the EC using the new implementation
-  virtual void initialize_new_ec (void);
+  virtual void initialize_new_ec ();
 
   /// Allocate the suppliers and the consumers
-  virtual int allocate_consumers (void);
-  virtual int allocate_suppliers (void);
+  virtual int allocate_consumers ();
+  virtual int allocate_suppliers ();
 
   /// Allocate one consumer or supplier
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
   /// Allocate one task for supplier number <i>
-  virtual int allocate_tasks (void);
+  virtual int allocate_tasks ();
   virtual ACE_Task_Base* allocate_task (int i);
 
   /// Activate all the tasks, by default runs each supplier on its
   /// own thread.
-  virtual void activate_tasks (void);
+  virtual void activate_tasks ();
 
 protected:
   /// The ORB
@@ -308,7 +308,6 @@ protected:
 
   /// The event channel object reference
   RtecEventChannelAdmin::EventChannel_var event_channel_;
-
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index a1877edb197..ffce96cff06 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -129,7 +129,7 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
 }
 
 void
-EC_Supplier::disconnect (void)
+EC_Supplier::disconnect ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -141,7 +141,7 @@ EC_Supplier::disconnect (void)
 }
 
 void
-EC_Supplier::shutdown (void)
+EC_Supplier::shutdown ()
 {
   if (!this->is_active_)
     return;
@@ -157,7 +157,7 @@ EC_Supplier::shutdown (void)
 }
 
 void
-EC_Supplier::disconnect_push_supplier (void)
+EC_Supplier::disconnect_push_supplier ()
 {
   this->driver_->supplier_disconnect (this->cookie_);
   this->consumer_proxy_ =
@@ -202,9 +202,8 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 }
 
 int
-EC_Supplier_Task::svc (void)
+EC_Supplier_Task::svc ()
 {
-
   // Initialize a time value to pace the test
   ACE_Time_Value tv (0, this->burst_pause_);
 
@@ -234,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/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 9db3874b338..c7fbce015ee 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -61,7 +61,7 @@ public:
                    const RtecEventComm::Event& event);
 
   /// Send a shutdown event.
-  void send_shutdown (void);
+  void send_shutdown ();
 
   /// Connect using a <supplier_admin> and publications (<qos>)
   /// computed by the user
@@ -76,10 +76,10 @@ public:
         int shutdown_event_type);
 
   /// Disconnect from the EC, also deactivates the object
-  void disconnect (void);
+  void disconnect ();
 
   /// Disconnect from the EC, also deactivates the object
-  void shutdown (void);
+  void shutdown ();
 
   /// Dump the results...
   virtual void dump_results (
@@ -94,7 +94,7 @@ public:
                    RtecEventComm::Event& event);
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   /// Class we forward to.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 9572565a286..dff92a13582 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -23,7 +23,7 @@ public:
 
   ////////////
   // execution
-  int run (void);
+  int run ();
 
   /////////////////
   // implementation
@@ -34,11 +34,9 @@ private:
     long & counter,         // inout
     int & more,             // out
     ACE_CString & command,  // inout
-    int retry               // in
-    );
+    int retry);             // in
 
-
-  int next_replica (void);
+  int next_replica ();
 
   ////////////////////
   // forbidden methods
@@ -49,7 +47,6 @@ private:
   ////////////////
   // Data members
  private:
-
   CORBA::ORB_var orb_;
 
   int argc_;
@@ -296,7 +293,6 @@ int FTClientMain::pass (
           }
           echo = 0;
           break;
-
         }
         case '>':
         {
@@ -490,7 +486,7 @@ int FTClientMain::pass (
   return result;
 }
 
-int FTClientMain::next_replica (void)
+int FTClientMain::next_replica ()
 {
   int result = 0;
   if (this->replica_pos_ < this->replica_iors_.size())
@@ -520,7 +516,7 @@ int FTClientMain::next_replica (void)
 }
 
 
-int FTClientMain::run (void)
+int FTClientMain::run ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 6251fb5b9f8..f20db9c3880 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -129,7 +129,6 @@ void FTAPP::FT_Creator::usage(FILE* out)const
 }
 
 
-
 int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
@@ -172,7 +171,7 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb)
   return result;
 }
 
-int FTAPP::FT_Creator::run (void)
+int FTAPP::FT_Creator::run ()
 {
   int result = 0;
   size_t typeCount = this->create_roles_.size();
@@ -226,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 45bb89e0370..4e0c729ca97 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -44,7 +44,7 @@ namespace FTAPP
 
     ////////////
     // execution
-    int run (void);
+    int run ();
 
     ////////////
     // shut down
@@ -64,7 +64,6 @@ namespace FTAPP
     ////////////////
     // Data members
    private:
-
     TAO::Object_Group_Creator creator_;
     CORBA::ORB_var orb_;
     const ACE_TCHAR * registry_ior_;
@@ -104,10 +103,7 @@ namespace FTAPP
      * prefix for names
      */
     ACE_CString prefix_;
-
-
   };
-
 } // namespace TAO
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 798c79a9e82..72a0a959298 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -287,7 +287,6 @@ int FT_ReplicaFactory_i::idle (int & result)
 }
 
 
-
 int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
@@ -498,7 +497,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
   return result;
 }
 
-int FT_ReplicaFactory_i::fini (void)
+int FT_ReplicaFactory_i::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -703,13 +702,13 @@ void FT_ReplicaFactory_i::delete_object (
   METHOD_RETURN(FT_ReplicaFactory_i::delete_object);
 }
 
-CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
+CORBA::Boolean FT_ReplicaFactory_i::is_alive ()
 {
   METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
     true;
 }
 
-void FT_ReplicaFactory_i::shutdown (void)
+void FT_ReplicaFactory_i::shutdown ()
 {
   METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown);
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index c050b32ea8c..c584181925a 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -78,7 +78,7 @@ public:
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (void);
+  int fini ();
 
   int idle(int & result);
 
@@ -103,24 +103,22 @@ public:
   // CORBA interface
   // See IDL for documentation
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /////////////////////////////////////////
   // CORBA interface GenericFactory methods
   virtual CORBA::Object_ptr create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  );
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id);
 
   virtual void delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  );
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id);
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
   /////////////////////////
   // Implementation methods
@@ -149,7 +147,6 @@ private:
   ///////////////
   // Data Members
 private:
-
   /**
    * Protect internal state.
    * Mutex should be locked by corba methods, or by
@@ -272,7 +269,6 @@ private:
   * A file that use by FT_TestReplica_i object
   */
   const ACE_TCHAR* name_persistent_file_;
-
 };
 
 #endif /* FT_REPLICAFACTORY_H_  */
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index cb90f1cdc6e..987f3814c90 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -39,7 +39,6 @@ private:
   FT::ReplicationManager_var replication_manager_;
   const ACE_TCHAR *rm_ior_;
   int shutdown_;
-
 };
 
 TAO_FT_ReplicationManagerController::TAO_FT_ReplicationManagerController ()
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 1fcbb23dda1..7634a395f13 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -146,11 +146,9 @@ void FT_TestReplica_i::suicide(const char * note)
 // class FT_TestReplica_i public, non-CORBA interface
 
 
-
 //static
 const char * FT_TestReplica_i::repository_id()
 {
-
   const char * id =
     FT_TEST::_tc_TestReplica->id();
 
@@ -177,7 +175,7 @@ unsigned long FT_TestReplica_i::factory_id()const
   return this->factory_id_;
 }
 
-::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (void)
+::PortableServer::POA_ptr FT_TestReplica_i::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -233,23 +231,22 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb, const ACE_TCHAR* file_persiste
   return 0;
 }
 
-void FT_TestReplica_i::_remove_ref (void)
+void FT_TestReplica_i::_remove_ref ()
 {
   //////////////////////////////////////////////////
   // WARNING: The following call invokes fini then deletes this object
   this->factory_->remove_replica(this->factory_id_, this);
 }
 
-int FT_TestReplica_i::fini (void)
+int FT_TestReplica_i::fini ()
 {
   return 0;
 }
 
 
-
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  PullMonitorable interface
-CORBA::Boolean FT_TestReplica_i::is_alive (void)
+CORBA::Boolean FT_TestReplica_i::is_alive ()
 {
   KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0)
   ACE_ERROR ((LM_ERROR,
@@ -265,7 +262,7 @@ CORBA::Boolean FT_TestReplica_i::is_alive (void)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Updateable interface
-FT::State * FT_TestReplica_i::get_update (void)
+FT::State * FT_TestReplica_i::get_update ()
 {
   KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0)
   long counter = load();
@@ -289,7 +286,7 @@ void FT_TestReplica_i::set_update (const FT::State & s)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Checkpointable interface
-::FT::State * FT_TestReplica_i::get_state (void)
+::FT::State * FT_TestReplica_i::get_state ()
 {
 #if defined(FT_TEST_LACKS_STATE)
   throw FT::NoStateAvailable ();
@@ -349,14 +346,14 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta)
   return counter;
 }
 
-CORBA::Long FT_TestReplica_i::get (void)
+CORBA::Long FT_TestReplica_i::get ()
 {
   KEVORKIAN_DURING_RETURN(get, 0)
   long counter = load ();
   return counter;
 }
 
-CORBA::Long FT_TestReplica_i::counter (void)
+CORBA::Long FT_TestReplica_i::counter ()
 {
   KEVORKIAN_DURING_RETURN([get]counter, 0)
   long counter = load ();
@@ -379,7 +376,7 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when)
   KEVORKIAN(RIGHT_NOW, die)
 }
 
-void FT_TestReplica_i::shutdown (void)
+void FT_TestReplica_i::shutdown ()
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
                    name_.c_str(), this->factory_->location(), this->factory_id_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 65030cbdecb..ef6bfbb12f6 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -66,7 +66,7 @@ public:
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (void);
+  int fini ();
 
   /**
    * idle time activity.
@@ -87,9 +87,9 @@ public:
 
   //////////////////////////////////////////
   // Override CORBA servant virtual methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
-  virtual void _remove_ref (void);
+  virtual void _remove_ref ();
 
 private:
   ///////////////////////////
@@ -98,29 +98,29 @@ private:
 
   virtual CORBA::Long increment (CORBA::Long delta);
 
-  virtual CORBA::Long get (void);
+  virtual CORBA::Long get ();
 
-  virtual CORBA::Long counter (void);
+  virtual CORBA::Long counter ();
 
   virtual void counter (CORBA::Long counter);
 
   virtual void die (FT_TEST::TestReplica::Bane when);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   ///////////////////////////
   // override PullMonitorable
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
   ///////////////////////////
   // override Updatable
 
-  virtual ::FT::State * get_update (void);
+  virtual ::FT::State * get_update ();
 
   virtual void set_update (const FT::State & s);
 
-  virtual ::FT::State * get_state (void);
+  virtual ::FT::State * get_state ();
 
   virtual void set_state (const FT::State & s);
 
@@ -130,8 +130,7 @@ private:
   virtual void tao_update_object_group (
       const char * iogr,
       PortableGroup::ObjectGroupRefVersion version,
-      CORBA::Boolean is_primary
-    );
+      CORBA::Boolean is_primary);
 
   /////////////////
   // implementation
@@ -197,7 +196,6 @@ private:
    */
 
   const ACE_TCHAR* name_persistent_storage;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 546c0361c90..fe314e70a88 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -340,7 +340,7 @@ const char * ReplicationManagerFaultConsumerAdapter::identity () const
 /**
  * Clean house for process shut down.
  */
-int ReplicationManagerFaultConsumerAdapter::fini (void)
+int ReplicationManagerFaultConsumerAdapter::fini ()
 {
   // Delegate to the FT_FaultConsumer.
   return this->p_fault_consumer_->fini ();
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 68a21e1c5ef..5d1aa2aa3ec 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -58,7 +58,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  int fini (void);
+  int fini ();
 
 
   size_t notifications() const;
@@ -66,7 +66,6 @@ public:
   /////////////////
   // Implementation
 private:
-
   ////////////////////
   // Forbidden methods
 private:
@@ -78,7 +77,6 @@ private:
   /////////////////////////
   // Implementation methods
 private:
-
   ///////////////
   // Data Members
 private:
@@ -142,7 +140,6 @@ private:
    */
   TAO::FT_FaultConsumer* p_fault_consumer_;
   PortableServer::ServantBase_var consumer_servant_;
-
 };
 #include /**/ <ace/post.h>
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 249072b8085..066d40b3fa3 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -24,7 +24,7 @@ int StubBatchConsumer::parse_args (int argc, ACE_TCHAR * argv[])
 }
 
 
-::PortableServer::POA_ptr StubBatchConsumer::_default_POA (void)
+::PortableServer::POA_ptr StubBatchConsumer::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -100,7 +100,7 @@ const char * StubBatchConsumer::identity () const
 /**
  * Clean house for process shut down.
  */
-void StubBatchConsumer::fini (void)
+void StubBatchConsumer::fini ()
 {
   this->notifier_->disconnect_consumer(this->consumer_id_);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index aedc1a399cb..7af8b3bacd9 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -36,7 +36,7 @@ public:
    */
   virtual ~StubBatchConsumer ();
 
-  ::PortableServer::POA_ptr _default_POA (void);
+  ::PortableServer::POA_ptr _default_POA ();
   ::PortableServer::ObjectId objectId()const;
 
   /**
@@ -64,25 +64,21 @@ public:
   /**
    * Clean house for process shut down.
    */
-  void fini (void);
+  void fini ();
 
 
 public:
-
     ////////////////
     // CORBA methods
 
     virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
-    virtual void disconnect_sequence_push_consumer (
-      );
+    virtual void disconnect_sequence_push_consumer ();
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
   ////////////////////
   // Forbidden methods
@@ -93,7 +89,6 @@ private:
   /////////////////////////
   // Implementation methods
 private:
-
   ///////////////
   // Data Members
 private:
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 5541c294eaa..63dee650a97 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -244,7 +244,7 @@ const char * StubFaultAnalyzer::identity () const
 /**
  * Clean house for process shut down.
  */
-int StubFaultAnalyzer::fini (void)
+int StubFaultAnalyzer::fini ()
 {
   this->faultConsumer_.fini();
   this->batchConsumer_.fini();
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 424ca9315b1..3a923c5698e 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -64,7 +64,7 @@ public:
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (void);
+  int fini ();
 
   /////////////////
   // Implementation
@@ -123,7 +123,6 @@ private:
 
   StubFaultConsumer faultConsumer_;
   StubBatchConsumer batchConsumer_;
-
 };
 
 #include /**/ <ace/post.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 079559f73ee..6410929038d 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -14,7 +14,7 @@ StubFaultConsumer::~StubFaultConsumer ()
 {
 }
 
-::PortableServer::POA_ptr StubFaultConsumer::_default_POA (void)
+::PortableServer::POA_ptr StubFaultConsumer::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -215,7 +215,7 @@ const char * StubFaultConsumer::identity () const
 /**
  * Clean house for process shut down.
  */
-int StubFaultConsumer::fini (void)
+int StubFaultConsumer::fini ()
 {
   this->notifier_->disconnect_consumer(this->consumer_id_);
   return 0;
@@ -284,7 +284,7 @@ void StubFaultConsumer::offer_change (
   ));
 }
 
-void StubFaultConsumer::disconnect_structured_push_consumer(void)
+void StubFaultConsumer::disconnect_structured_push_consumer()
 {
   ACE_ERROR ((LM_ERROR,
     "StubFaultConsumer:disconnect_structured_push_consumer interpreted as quit request.\n"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 9845df441d0..89500455fd8 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -38,7 +38,7 @@ public:
   virtual ~StubFaultConsumer ();
 
 
-  ::PortableServer::POA_ptr _default_POA (void);
+  ::PortableServer::POA_ptr _default_POA ();
   ::PortableServer::ObjectId objectId()const;
 
   /**
@@ -66,25 +66,22 @@ public:
   /**
    * Clean house for process shut down.
    */
-  int fini (void);
+  int fini ();
 
 
   size_t notifications() const;
 
 public:
-
     ////////////////
     // CORBA methods
     virtual void push_structured_event(
-      const CosNotification::StructuredEvent &notification
-      );
+      const CosNotification::StructuredEvent &notification);
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
-   virtual void disconnect_structured_push_consumer(void);
+   virtual void disconnect_structured_push_consumer();
 
   ////////////////////
   // Forbidden methods
@@ -95,7 +92,6 @@ private:
   /////////////////////////
   // Implementation methods
 private:
-
   ///////////////
   // Data Members
 private:
@@ -136,7 +132,6 @@ private:
   ::FT::FaultNotifier::ConsumerId consumer_id_;
 
   size_t notifications_;
-
 };
 
 #include /**/ <ace/post.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index ef170af39cf..f7eb7b0c131 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -19,7 +19,7 @@ StubFaultNotifier::~StubFaultNotifier ()
 }
 
 
-::PortableServer::POA_ptr StubFaultNotifier::_default_POA (void)
+::PortableServer::POA_ptr StubFaultNotifier::_default_POA ()
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -104,7 +104,7 @@ int StubFaultNotifier::parse_args (int argc, ACE_TCHAR * argv[])
 /**
  * Prepare to exit.
  */
-int StubFaultNotifier::fini (void)
+int StubFaultNotifier::fini ()
 {
   if(this->ns_name_.length () != 0)
   {
@@ -324,7 +324,7 @@ const ACE_TCHAR * StubFaultNotifier::identity () const
 /**
  * Clean house for process shut down.
  */
-void StubFaultNotifier::shutdown_i (void)
+void StubFaultNotifier::shutdown_i ()
 {
   this->orb_->shutdown (false);
 }
@@ -409,7 +409,7 @@ void StubFaultNotifier::disconnect_consumer (
   throw CORBA::NO_IMPLEMENT();
 }
 
-CORBA::Boolean StubFaultNotifier::is_alive (void)
+CORBA::Boolean StubFaultNotifier::is_alive ()
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index c1ded566c7f..20ee652624c 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -51,7 +51,7 @@ public:
   /**
    * Prepare to exit.
    */
-  int fini (void);
+  int fini ();
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -66,7 +66,7 @@ public:
   int idle(int &result);
 
   // override virtuals
-::PortableServer::POA_ptr _default_POA (void);
+::PortableServer::POA_ptr _default_POA ();
 
   PortableServer::ObjectId objectId()const;
 
@@ -74,41 +74,35 @@ public:
   /**
    * Clean house for process shut down.
    */
-  void shutdown_i (void);
+  void shutdown_i ();
 
   ////////////////////////////////
   // CORBA interface FaultNotifier
 
 
   virtual void push_structured_fault (
-      const CosNotification::StructuredEvent & event
-    );
+      const CosNotification::StructuredEvent & event);
 
   virtual void push_sequence_fault (
-    const CosNotification::EventBatch & events
-  );
+    const CosNotification::EventBatch & events);
 
   virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
-    const char * constraint_grammar
-  );
+    const char * constraint_grammar);
 
   virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
-    CosNotifyFilter::Filter_ptr filter
-  );
+    CosNotifyFilter::Filter_ptr filter);
 
   virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
-    CosNotifyFilter::Filter_ptr filter
-  );
+    CosNotifyFilter::Filter_ptr filter);
 
   virtual void disconnect_consumer (
-    FT::FaultNotifier::ConsumerId connection
-  );
+    FT::FaultNotifier::ConsumerId connection);
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
   /////////////////
   // Implementation
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 129f92fe1ca..0579e777364 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -116,7 +116,6 @@ int TAO::Object_Group_Creator::unregister_role (const char * role)
 }
 
 
-
 int TAO::Object_Group_Creator::create_detector_for_replica (
   CORBA::Object_ptr replica,
   const char * role,
@@ -226,8 +225,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
     group = this->replication_manager_->create_object (
       type_id,
       criteria,
-      creation_id
-      );
+      creation_id);
   }
   else
   {
@@ -263,7 +261,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
     ::PortableGroup::GenericFactory::FactoryCreationId_var creation_id;
     if (this->have_replication_manager_)
     {
-
       //////////////////////////////////////////////////////
       // note infrastructure controlled because we want the
       // ReplicationManager to manage the object after it's created.
@@ -293,12 +290,10 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
       group = this->replication_manager_->create_object (
         type_id.in (),
         criteria,
-        creation_id
-        );
+        creation_id);
 
       //@@ this is a bit of a hack
       creation_id >>= group_id;
-
     }
 
     const PortableGroup::Location * first_location = 0;
@@ -334,8 +329,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           group_id,
           info.the_location);
 
-        const char * replica_ior = orb_->object_to_string (created_obj.in () );
-
+        const char * replica_ior = orb_->object_to_string (created_obj.in ());
 
         if (write_iors)
         {
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 4a2acdef8fc..3c5a3bab53d 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -96,7 +96,6 @@ namespace TAO
      */
     int have_replication_manager_;
   };
-
 } // namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_demo.pl b/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
index 553f9aa40b7..21edfe1e87d 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
@@ -87,7 +87,7 @@ use PerlACE::TestTarget;
 
 my($status) = 0;
 my($verbose) = 0;         # 1: report perl actions before executing them
-my($debug_builds) = ($^O eq 'MSWin32' ? 0 : 1);;    # 0: use exes from Release directories
+my($debug_builds) = ($^O eq 'MSWin32' ? 0 : 1);    # 0: use exes from Release directories
 my($simulated) = 1;       # 1: use "client simulated" fault tolerance
 
 # List of the proccess which must be killed before exit with error
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
index 50ae2d24637..70f4f233719 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
@@ -13,13 +13,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -57,7 +56,7 @@ Basic::remove_member (void)
 
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
index bbb473fe9c7..2513de6544c 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
@@ -24,14 +24,13 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
-
   const char* object_group_name_;
 
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index b2a7b5e77dd..cc9e81f2434 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -29,23 +29,22 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 FT_Naming::NamingManager_ptr
-LB_server::naming_manager (void)
+LB_server::naming_manager ()
 {
   return this->naming_manager_.in ();
 }
@@ -95,7 +94,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -136,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)
     {
@@ -146,7 +144,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -200,7 +197,6 @@ LB_server::create_object_group (const char *group_name)
     }
 
   return 0;
-
 }
 
 int
@@ -265,7 +261,6 @@ LB_server::remove_servant (const char *loc)
     }
 
   return 0;
-
 }
 
 TAO_Naming_Client&
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
index a86e95279db..5b5ac84259c 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
@@ -35,15 +35,14 @@ class Basic;
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys NamingManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the NamingManager Interface.
   int init (int argc, ACE_TCHAR **argv);
@@ -64,20 +63,18 @@ public:
   TAO_Naming_Client& name_svc ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  FT_Naming::NamingManager_ptr naming_manager (void);
+  FT_Naming::NamingManager_ptr naming_manager ();
 
 private:
-
     int parse_args (int, ACE_TCHAR **);
 
 private:
-
   /// Load Manager
   FT_Naming::NamingManager_var naming_manager_;
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 25323e14cad..9fd2d637036 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -37,7 +37,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
   // Constructor.
 
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
   // Destructor.
 
   // = Interface implementation accessor methods.
@@ -45,7 +45,7 @@ public:
   void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void);
+  CORBA::Short id ();
   // Gets id.
 
 private:
@@ -57,12 +57,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
@@ -83,7 +83,7 @@ do_failover_name_test (
   ACE_TCHAR *ns1ref,
   int c_breadth,
   int c_depth,
-  int o_breadth );
+  int o_breadth);
 
 /// Failover ObjectGroup Test
 int
@@ -92,7 +92,7 @@ do_failover_objectgroup_test (
   ACE_TCHAR *nm1ref,
   int c_breadth,
   int c_depth,
-  int o_breadth );
+  int o_breadth);
 
 //==============================================================================
 //
@@ -303,7 +303,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
     switch(test_type) {
-
       case TT_FAILOVER:
 
         if( RC_SUCCESS != do_failover_name_test (
@@ -342,7 +341,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       case TT_PERSISTENCE:
 
         switch(test_phase){
-
           case TT_CREATE:
             if (RC_SUCCESS != do_persistence_name_test (
                 orb.in (),
@@ -473,7 +471,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   return rc;
-
 }
 
 //==============================================================================
@@ -494,7 +491,6 @@ do_failover_name_test (
   int i;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb);
 
     if (CORBA::is_nil (orb.in ()))
@@ -582,7 +578,6 @@ do_failover_name_test (
 
           // Try again...
           try {
-
             CORBA::Object_var obj1_on_replica =
               root_context_1->resolve (level1);
 
@@ -1019,7 +1014,6 @@ do_failover_objectgroup_test (
   FT_Naming::NamingManager_var naming_manager_1;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb);
     if (CORBA::is_nil (orb.in ()))
     {
@@ -1124,7 +1118,6 @@ do_persistence_name_test (
   int i;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb);
 
     if (CORBA::is_nil (orb.in () ))
@@ -1281,7 +1274,6 @@ do_persistence_name_test (
       }
 
       try {
-
         // Check if the new context is available in the repository
         CORBA::Object_var obj1_on_replica =
           root_context_1->resolve (wide);
@@ -1324,7 +1316,6 @@ do_persistence_name_test (
   }
 
   return RC_SUCCESS;
-
 }
 
 
@@ -1348,7 +1339,6 @@ do_persistence_objectgroup_test (
   FT_Naming::NamingManager_var naming_manager_1;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb);
 
     if (CORBA::is_nil (orb.in ()))
@@ -1429,14 +1419,12 @@ do_persistence_objectgroup_test (
       {
         const PortableGroup::Location & loc = locations[i];
         if (loc.length() > 0) {
-
           ACE_DEBUG (( LM_DEBUG,
                        ACE_TEXT ("INFO: validating group member %C\n"),
                        loc[0].id.in()));
 
           try
           {
-
             PortableGroup::Location location_name (1);
             location_name.length (1);
             location_name[0].id = CORBA::string_dup(loc[0].id.in());
@@ -1465,7 +1453,6 @@ do_persistence_objectgroup_test (
                            the_string.in ()));
 
               if ( ACE_OS::strcmp (the_string.in (), loc[0].id.in()) != 0 ) {
-
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    ACE_TEXT ("ERROR: object group member at %C reports %C\n\n"),
                                    loc[0].id.in(),
@@ -1535,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&)
             {
@@ -1667,7 +1653,6 @@ do_equivalence_name_test (
   int i;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb);
 
     if (CORBA::is_nil (orb.in ()))
@@ -1754,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)
   {
@@ -1885,7 +1869,6 @@ do_equivalence_name_test (
 
           // Try again to see if it just was a race condition
           try {
-
             CORBA::Object_var obj1_on_replica =
               root_context_2->resolve (wide);
 
@@ -2247,7 +2230,6 @@ do_equivalence_objectgroup_test (
   FT_Naming::NamingManager_var naming_manager_2;
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb);
     if (CORBA::is_nil (orb.in ()))
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
index 2fc343e1dd9..5cdc55e33a6 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
@@ -289,8 +289,8 @@ sub backup_restart_test()
     my $client_stderr_file     = $client->LocalFile ($stderr_file);
 
     print_msg("Backup Restart Test");
-    init_naming_context_directory ($server, $name_dir );
-    init_naming_context_directory ($server, $group_dir );
+    init_naming_context_directory ($server, $name_dir);
+    init_naming_context_directory ($server, $group_dir);
 
     # Run two Naming Servers
     my $ns1_args = "--primary ".
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
index 8ae1cd596a1..4b62db16f68 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
@@ -292,8 +292,8 @@ sub failover_test()
     my $client_stderr_file     = $client->LocalFile ($stderr_file);
 
     print_msg("Failover Test");
-    init_naming_context_directory ($server, $name_dir );
-    init_naming_context_directory ($server, $group_dir );
+    init_naming_context_directory ($server, $name_dir);
+    init_naming_context_directory ($server, $group_dir);
 
     # Run two Naming Servers
     my $ns1_args = "--primary ".
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
index 134f9d7b8d9..94a44d04d43 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
@@ -305,8 +305,8 @@ sub persistence_test ()
     my $client_nm_iorfile = $client->LocalFile ($nm_iorfile);
 
     print_msg("Persistence Test");
-    init_persistence_dir ($server, $name_dir );
-    init_persistence_dir ($server, $group_dir );
+    init_persistence_dir ($server, $name_dir);
+    init_persistence_dir ($server, $group_dir);
 
     my $ns_args       = "-ORBListenEndPoints $ns_endpoint1 ".
                         "-ORBDebugLevel $debug_level " .
@@ -447,8 +447,8 @@ sub backup_restore_test ()
     my $client_nm_iorfile = $client->LocalFile ($nm_iorfile);
 
     print_msg("Backup/Restore Test");
-    init_persistence_dir ($server, $name_dir );
-    init_persistence_dir ($server, $group_dir );
+    init_persistence_dir ($server, $name_dir);
+    init_persistence_dir ($server, $group_dir);
 
     my $ns_args       = "-ORBListenEndPoints $ns_endpoint1 ".
                         "-ORBDebugLevel $debug_level " .
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/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
index 5b23d33f306..0ce11d8abb5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
@@ -1,20 +1,19 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
index 622752897bd..4a31ff70524 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
@@ -113,11 +113,11 @@ my $ns2_backup_args = "--backup -ORBListenEndPoints $ns_backup_endpoint2 ".
                       "-c $ns2_iorfile -g $nm2_iorfile ".
                       "-r $name_dir2";
 
-$NS1_PRIMARY = $ns1->CreateProcess($tao_ft_naming, $ns1_primary_args );
-$NS1_BACKUP  = $ns1->CreateProcess($tao_ft_naming, $ns1_backup_args );
+$NS1_PRIMARY = $ns1->CreateProcess($tao_ft_naming, $ns1_primary_args);
+$NS1_BACKUP  = $ns1->CreateProcess($tao_ft_naming, $ns1_backup_args);
 
-$NS2_PRIMARY = $ns2->CreateProcess($tao_ft_naming, $ns2_primary_args );
-$NS2_BACKUP  = $ns2->CreateProcess($tao_ft_naming, $ns2_backup_args );
+$NS2_PRIMARY = $ns2->CreateProcess($tao_ft_naming, $ns2_primary_args);
+$NS2_BACKUP  = $ns2->CreateProcess($tao_ft_naming, $ns2_backup_args);
 
 my $replica_primary_ior     = "ns_replica_primary.ior";
 my $ns1_replica_primary_ior = "$name_dir1/$replica_primary_ior";
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
index eb1707d6755..145b8648b46 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
@@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
 
 int TestTask::svc()
 {
-
   try {
     // Get reference to Root POA
     CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
index 4fad32a961d..d96026330f0 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
@@ -14,13 +14,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -54,7 +53,7 @@ Basic::remove_member (void)
 
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
index 81884559d55..4ee1db473a8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
@@ -24,14 +24,13 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
-
   const char* object_group_name_;
 
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index 603eb0086e8..ed8a69d0724 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -29,23 +29,22 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 FT_Naming::NamingManager_ptr
-LB_server::naming_manager (void)
+LB_server::naming_manager ()
 {
   return this->naming_manager_.in ();
 }
@@ -94,7 +93,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -134,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)
     {
@@ -144,11 +142,10 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
@@ -186,7 +183,6 @@ LB_server::create_object_group (void)
     }
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h
index 6dea520507e..046cf5c9d8d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h
@@ -35,21 +35,20 @@ class Basic;
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys NamingManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the NamingManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
+  int create_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
@@ -58,20 +57,18 @@ public:
   TAO_Naming_Client& name_svc ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  FT_Naming::NamingManager_ptr naming_manager (void);
+  FT_Naming::NamingManager_ptr naming_manager ();
 
 private:
-
     int parse_args (int, ACE_TCHAR **);
 
 private:
-
   /// Load Manager
   FT_Naming::NamingManager_var naming_manager_;
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index 370be8a05a1..42bb126e69d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -47,7 +47,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       TAO_Naming_Client name_svc;
       try {
-
         ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
         if (name_svc.init (orb.in (), &timeout) != 0)
           ACE_ERROR_RETURN ((LM_DEBUG,
@@ -74,7 +73,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       for (int i = 0; i < 15; i++)
       {
         try {
-
           // Each time we invoke resolve, we get a different member
           tmp =
             name_svc->resolve (name);
@@ -82,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)
           {
@@ -106,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)
           {
@@ -133,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       }
 
       try {
-
         basic->shutdown ();
 
         ACE_DEBUG ((LM_DEBUG,
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 88418d36e0c..0807eb0c6c5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -27,7 +27,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
   // Constructor.
 
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
   // Destructor.
 
   // = Interface implementation accessor methods.
@@ -35,7 +35,7 @@ public:
   void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void);
+  CORBA::Short id ();
   // Gets id.
 
 private:
@@ -47,12 +47,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
@@ -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)
   {
@@ -676,5 +673,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
index 4fad32a961d..d96026330f0 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
@@ -14,13 +14,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -54,7 +53,7 @@ Basic::remove_member (void)
 
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h
index d052bf92c73..85c41d3a84f 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h
@@ -26,14 +26,13 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
-
   const char* object_group_name_;
 
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
index 2e9fb65c602..cb19e6133e2 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -27,23 +27,22 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 FT_Naming::NamingManager_ptr
-LB_server::naming_manager (void)
+LB_server::naming_manager ()
 {
   return this->naming_manager_.in ();
 }
@@ -92,7 +91,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -132,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)
     {
@@ -142,11 +140,10 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
@@ -217,7 +214,6 @@ LB_server::create_object_group (void)
     }
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h
index 6dea520507e..046cf5c9d8d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h
@@ -35,21 +35,20 @@ class Basic;
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys NamingManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the NamingManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
+  int create_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
@@ -58,20 +57,18 @@ public:
   TAO_Naming_Client& name_svc ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  FT_Naming::NamingManager_ptr naming_manager (void);
+  FT_Naming::NamingManager_ptr naming_manager ();
 
 private:
-
     int parse_args (int, ACE_TCHAR **);
 
 private:
-
   /// Load Manager
   FT_Naming::NamingManager_var naming_manager_;
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
index d0732208090..f6090ac3d13 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
@@ -31,7 +31,7 @@ public:
     return 0;
   }
 
-  int svc (void)
+  int svc ()
   {
     for (int g = 0, i = 0; i < 100; i++)
       {
@@ -51,7 +51,6 @@ public:
 
     return 0;
   }
-
 };
 
 const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior");
@@ -106,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       TAO_Naming_Client name_svc;
       try {
-
         ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
         if (name_svc.init (orb.in (), &timeout) != 0)
           ACE_ERROR_RETURN ((LM_DEBUG,
@@ -145,7 +143,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
         try {
-
           // Each time we invoke resolve, we get a different member
           tmp =
             name_svc->resolve (name);
@@ -153,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)
           {
@@ -177,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)
           {
@@ -206,7 +201,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       hammer.wait ();
 
       try {
-
         basic->shutdown ();
 
         ACE_DEBUG ((LM_DEBUG,
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/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index ab461eda26e..4472202635c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 
 #include "Server_Request_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
   : server_interceptor_ ()
 {
 }
@@ -37,7 +37,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
index 10532f09969..6bec1a8ad31 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
@@ -42,9 +42,8 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -52,10 +51,9 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
-
   /// Pointer to the server request interceptor.  ORB is responsible
   /// for storage.
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor_;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 2ad6b91f3b9..a63a673ef35 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -8,7 +8,7 @@
 
 static const CORBA::ULong expected_version = 5;
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
   , forward_request_thrown_ (false)
 {
@@ -16,7 +16,7 @@ Server_Request_Interceptor::Server_Request_Interceptor (void)
   this->obj_[1] = CORBA::Object::_nil ();
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
@@ -55,13 +55,13 @@ Server_Request_Interceptor::forward_references (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   CORBA::release (this->obj_[0]);
   CORBA::release (this->obj_[1]);
@@ -169,7 +169,6 @@ Server_Request_Interceptor::receive_request (
         }
 
     }
-  return;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index 8fcedfd7426..050308b2b5b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -38,12 +38,11 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
@@ -63,9 +62,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -84,7 +83,6 @@ public:
   //@}
 
 private:
-
   /// The number of requests intercepted by this interceptor.
   CORBA::ULong request_count_;
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index ada224e6656..b57c464b174 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -81,9 +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/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 2b04f3871d1..8e21a491314 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -99,8 +99,6 @@ add_ft_prop (CORBA::ORB_ptr o,
                                   obj2,
                                   obj2);
     }
-
-  return;
 }
 
 void test_colocal (ForwardRequestTest::test_ptr server)
@@ -186,7 +184,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                               policies);
 
 
-
       PortableServer::ObjectId_var oid1 =
         first_poa->activate_object (&servant1);
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
index e85e9f5706b..d4e4dd92a2c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
@@ -22,28 +22,25 @@
 class test_i : public virtual POA_ForwardRequestTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index a699a349ac6..1507c02fe2a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -28,11 +28,10 @@ public:
   Client_i (CORBA::ORB_ptr orb);
 
   /// Initialize the ORB etc.
-  void init (void);
+  void init ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 90958d5b065..edf57e5b4f4 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -57,7 +57,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   Manager manager;
 
   try
@@ -114,7 +113,7 @@ Manager::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Manager::make_merged_iors (void)
+Manager::make_merged_iors ()
 {
   // First  server
   this->object_primary_ =
@@ -147,7 +146,7 @@ Manager::make_merged_iors (void)
 }
 
 int
-Manager::set_properties (void)
+Manager::set_properties ()
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -189,7 +188,7 @@ Manager::set_properties (void)
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   try
     {
@@ -206,7 +205,7 @@ Manager::run (void)
 }
 
 int
-Manager::write_to_file (void)
+Manager::write_to_file ()
 {
   //
   CORBA::String_var iorref =
@@ -228,7 +227,7 @@ Manager::write_to_file (void)
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return this->orb_.in ();
 }
@@ -242,7 +241,7 @@ void
 run_test (Simple_Server_ptr server);
 
 void
-Client_i::init (void)
+Client_i::init ()
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index 3b63ccdb070..23097145d5f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -30,19 +30,19 @@ public:
   // Initialize the ORB, POA etc.
 
   /// Merges the different IORS
-  int make_merged_iors (void);
+  int make_merged_iors ();
 
   /// Sets the properties for the profiles
-  int set_properties (void);
+  int set_properties ();
 
   /// Run the  ORB event loop..
-  int run (void);
+  int run ();
 
   /// Write the merged IOR to a file
-  int write_to_file (void);
+  int write_to_file ();
 
   /// Return the pointer to the copy of our ORB
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 private:
   CORBA::Object_var object_primary_;
   CORBA::Object_var object_secondary_;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index ca44b8bc7eb..80d77f6fbed 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -32,8 +32,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
-
   try
     {
       CORBA::ORB_var orb =
@@ -83,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/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index d401dee65a5..1f7ce7f23af 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -9,23 +9,21 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 void
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Print out from process id (%P) hosting the servant\n")));
-
-  return;
 }
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index c916e886919..56901f7b06d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -27,12 +27,12 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  void remote_call (void);
+  void remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 643b5112299..8803f71bfa9 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -17,7 +17,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n"));
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index ae7c9760e53..341da48a700 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -25,7 +25,7 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event)
 
 
 void
-PushConsumer_impl::disconnect_push_consumer (void)
+PushConsumer_impl::disconnect_push_consumer ()
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index 239abafce89..278bcd1dd84 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -19,11 +19,9 @@ public:
   PushConsumer_impl(CORBA::ORB_ptr orb);
 
     virtual void push (
-        const RtecEventComm::EventSet & data
-      );
+        const RtecEventComm::EventSet & data);
 
-    virtual void disconnect_push_consumer (
-      );
+    virtual void disconnect_push_consumer ();
 private:
   CORBA::ORB_var orb_;
   PushConsumer_impl(const PushConsumer_impl&);
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 802d415e6b4..62cb9c47e68 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -8,7 +8,7 @@
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 
 int
-PushSupplier_impl::ReactorTask::svc (void)
+PushSupplier_impl::ReactorTask::svc ()
 {
   ACE_DEBUG((LM_DEBUG, "Reactor Thread started\n"));
   ACE_Reactor reactor (new ACE_Select_Reactor) ;
@@ -26,7 +26,6 @@ PushSupplier_impl::ReactorTask::svc (void)
 }
 
 
-
 PushSupplier_impl::PushSupplier_impl(CORBA::ORB_ptr orb)
 : orb_(orb), seq_no_(0), reactor_task_(this)
 {
@@ -39,7 +38,6 @@ PushSupplier_impl::~PushSupplier_impl()
 
 int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
 {
-
   ACE_DEBUG((LM_DEBUG, "for_suppliers\n"));
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     channel->for_suppliers();
@@ -49,7 +47,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
     supplier_admin->obtain_push_consumer();
 
 
-
   ACE_DEBUG((LM_DEBUG, "got push_consumer with %d profiles\n",
                         consumer_->_stubobj ()->base_profiles ().profile_count ()));
 
@@ -76,15 +73,12 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
     -1);
 
   return 0;
-
 }
 
 
-
 void  PushSupplier_impl::disconnect_push_supplier (
       )
 {
-
   reactor_task_.reactor_->end_reactor_event_loop();
 
   PortableServer::Current_var current =
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index f6a3779ea06..c87fe55be0a 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -27,10 +27,8 @@ public:
 
   int init(RtecEventChannelAdmin::EventChannel_ptr);
 
-    virtual void  disconnect_push_supplier (
-      );
+    virtual void  disconnect_push_supplier ();
 private:
-
   class ReactorTask : public ACE_Task_Base
   {
   public:
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/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 14ec5f69e5d..15ac48ac812 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -35,7 +35,7 @@
 
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -147,14 +147,14 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   ACE_LOG_MSG->msg_ostream (this->output_file ());
 #endif /* ACE_HAS_PHARLAP */
 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
@@ -186,19 +186,19 @@ ACE_Test_Output::instance ()
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::dll_name (void)
+ACE_Test_Output::dll_name ()
 {
   return ACE_TEXT ("Test_Output");
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::name (void)
+ACE_Test_Output::name ()
 {
   return ACE_TEXT ("ACE_Test_Output");
 }
 
 void
-ACE_Test_Output::close_singleton (void)
+ACE_Test_Output::close_singleton ()
 {
   delete ACE_Test_Output::instance_;
   ACE_Test_Output::instance_ = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index 7e306372e07..408b93022a5 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -15,7 +15,6 @@
 #include "tao/debug.h"
 
 
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      number_ ((CORBA::Long) 931232),
@@ -47,16 +46,15 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 
-
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index 68eca82c1d7..4e4947176dc 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -31,9 +31,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index 8e9f9941fa2..022fdae0c7d 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -18,7 +18,6 @@
 #include "ami_testS.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
@@ -92,7 +91,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void) {};
+  Handler () {};
 
   void foo (CORBA::Long result,
             CORBA::Long out_l)
@@ -110,7 +109,6 @@ public:
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"));
       try
@@ -136,7 +134,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -147,7 +145,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     };
-  ~Handler (void) {};
+  ~Handler () {};
 };
 
 // ReplyHandler.
@@ -270,7 +268,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index 8a9784588c9..94a895e8151 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -18,7 +18,6 @@
 #include "ace/OS_NS_sys_socket.h"
 
 
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 1c7a118a818..68204a73c16 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -21,7 +21,6 @@
 #include "ami_testS.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int shutdown_flag = 0;
@@ -67,10 +66,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler (void) {};
+  Handler () {};
 
   /// Destructor.
-    ~Handler (void) {};
+    ~Handler () {};
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
@@ -86,7 +85,6 @@ public:
 
   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"
                                   "Testing proper exception handling ...\n"));
@@ -120,7 +118,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -131,7 +129,6 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     };
-
 };
 
 int
@@ -255,8 +252,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                        );
+                        0);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 14ec5f69e5d..15ac48ac812 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -35,7 +35,7 @@
 
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -147,14 +147,14 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   ACE_LOG_MSG->msg_ostream (this->output_file ());
 #endif /* ACE_HAS_PHARLAP */
 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
@@ -186,19 +186,19 @@ ACE_Test_Output::instance ()
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::dll_name (void)
+ACE_Test_Output::dll_name ()
 {
   return ACE_TEXT ("Test_Output");
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::name (void)
+ACE_Test_Output::name ()
 {
   return ACE_TEXT ("ACE_Test_Output");
 }
 
 void
-ACE_Test_Output::close_singleton (void)
+ACE_Test_Output::close_singleton ()
 {
   delete ACE_Test_Output::instance_;
   ACE_Test_Output::instance_ = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index d763b3045f3..4d25836c6c1 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -4,10 +4,9 @@
 #include "tao/AnyTypeCode/Any.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
@@ -130,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/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index f9e6a88977e..890e6c4631a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -5,7 +5,6 @@
 #include "tao/AnyTypeCode/Any.h"
 
 
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 32b64d17de5..3bf577a904a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -10,16 +10,15 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
 }
 
 void
-Callback_i::callback_method (void)
+Callback_i::callback_method ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
@@ -49,7 +48,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (void)
+Simple_Server_i::call_client ()
 {
   if (this->flag_)
     {
@@ -79,7 +78,7 @@ Simple_Server_i::call_client (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index 7536e63f0d6..8444d669abe 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -28,15 +28,14 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
   CORBA::ORB_var orb_;
-
 };
 
 /**
@@ -57,9 +56,9 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
-  int call_client (void);
+  int call_client ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index 060bd693cc1..0583dea775e 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -1,21 +1,20 @@
 #include "Hello.h"
 
 
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG, "in get_string\n"));
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
   ACE_DEBUG ((LM_DEBUG,"in shutdown\n"));
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index 2d7cfb2e5e0..09da0fd735c 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -19,9 +19,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 14ec5f69e5d..15ac48ac812 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -35,7 +35,7 @@
 
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
-ACE_Test_Output::ACE_Test_Output (void)
+ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-ACE_Test_Output::~ACE_Test_Output (void)
+ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -147,14 +147,14 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   ACE_LOG_MSG->msg_ostream (this->output_file ());
 #endif /* ACE_HAS_PHARLAP */
 
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();
@@ -186,19 +186,19 @@ ACE_Test_Output::instance ()
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::dll_name (void)
+ACE_Test_Output::dll_name ()
 {
   return ACE_TEXT ("Test_Output");
 }
 
 const ACE_TCHAR *
-ACE_Test_Output::name (void)
+ACE_Test_Output::name ()
 {
   return ACE_TEXT ("ACE_Test_Output");
 }
 
 void
-ACE_Test_Output::close_singleton (void)
+ACE_Test_Output::close_singleton ()
 {
   delete ACE_Test_Output::instance_;
   ACE_Test_Output::instance_ = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index 8b1b5de842f..420120eb148 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -3,7 +3,6 @@
 
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -37,7 +36,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index d44559b8963..6a0904281cf 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -126,14 +126,12 @@ size_t const ACE_MAX_THREADS = 4;
     }
 
 #else /* ! VXWORKS */
-#  if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%ls%ls%ls")
-#  else
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%s%s%s")
-#  endif /* !ACE_WIN32 && ACE_USES_WCHAR */
 #define ACE_INIT_LOG(NAME) \
   ACE_TCHAR temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, ACE_INIT_LOG_FMT, \
+  ACE_OS::sprintf (temp, \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs, \
                    ACE_LOG_DIRECTORY, \
                    ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
                    ACE_LOG_FILE_EXT_NAME); \
@@ -150,15 +148,15 @@ size_t const ACE_MAX_THREADS = 4;
 class ACE_Test_Output
 {
 public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
-  static ACE_Test_Output *instance (void);
+  ACE_Test_Output ();
+  ~ACE_Test_Output ();
+  static ACE_Test_Output *instance ();
   int set_output (const ACE_TCHAR *filename, int append = 0);
-  OFSTREAM *output_file (void);
-  void close (void);
-  const ACE_TCHAR *dll_name (void);
-  const ACE_TCHAR *name (void);
-  static void close_singleton (void);
+  OFSTREAM *output_file ();
+  void close ();
+  const ACE_TCHAR *dll_name ();
+  const ACE_TCHAR *name ();
+  static void close_singleton ();
 
 private:
   static ACE_Test_Output *instance_;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 364b5a4c409..c0b21e9e150 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -1,12 +1,12 @@
 #include "MCast_Server_i.h"
 
-MCast_Server_i::MCast_Server_i (void)
+MCast_Server_i::MCast_Server_i ()
 {
   //Constructor.
 }
 
 CORBA::Boolean
-MCast_Server_i::connect_server (void)
+MCast_Server_i::connect_server ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index 231b7154fee..a0f009f4ea3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -9,7 +9,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (void);
+  CORBA::Boolean connect_server ();
 };
 
 #endif /* MCAST_SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index c8a5cdb19f3..61976741c9a 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -2,12 +2,12 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-ior_mcast_Client_i::ior_mcast_Client_i (void)
+ior_mcast_Client_i::ior_mcast_Client_i ()
 {
   // Constructor
 }
 
-ior_mcast_Client_i::~ior_mcast_Client_i (void)
+ior_mcast_Client_i::~ior_mcast_Client_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 67829f3be31..53eb659812e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -16,10 +16,10 @@ class ior_mcast_Client_i
 
  public:
   // = COnstructor and destructor.
-  ior_mcast_Client_i (void);
-  ~ior_mcast_Client_i (void);
+  ior_mcast_Client_i ();
+  ~ior_mcast_Client_i ();
 
-  int run (void);
+  int run ();
   // Execute the client example code.
 
   int init (int& argc, ACE_TCHAR *argv[]);
@@ -28,7 +28,6 @@ class ior_mcast_Client_i
  private:
   // mcast_ior
   ACE_CString mcast_url_;
-
 };
 
 #endif /* IOR_MCAST_CLIENT_I_H */
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/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index fe851c004e9..96e0f2cda8a 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -10,7 +10,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -20,7 +20,7 @@ Server_i::Server_i (void)
 {
 }
 
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
   delete this->ior_multicast_;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 278511cb33f..09f58c7b721 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -14,14 +14,13 @@ class Server_i
 
 public:
   // = Constructor and destructor.
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int &argc, ACE_TCHAR **argv);
   // Initialize the server multicast.
 
 private:
-
   /// Sets the IOR_Multicast class to listen for multicast requests
   // for this server.
   int enable_multicast (const char *ior);
@@ -30,7 +29,6 @@ private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
-
   int argc_;
   // # of arguments on the command line.
 
@@ -50,7 +48,6 @@ private:
   // Address of the multicast address where to listen for requests for */
   // the server. */
 
-
 };
 
 #endif /* SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
index 6ef8f1f9542..d6c91c8e1a2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
@@ -9,20 +9,20 @@ Test_i::Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate(orb))
 }
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return 1;
 }
 
 void
-Test_i::terminate (void)
+Test_i::terminate ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received terminate and going to exit\n"));
   exit (0);
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown and going to exit\n"));
   orb_->shutdown ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
index 65826facc02..558200f8429 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
@@ -13,11 +13,11 @@ class  Test_i : public virtual POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb);
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
-  virtual void terminate (void);
+  virtual void terminate ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
index 2eba63f0baf..80e2edc83c4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -50,7 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try
       {
-        test = Test::_narrow( obj.in() );
+        test = Test::_narrow( obj.in());
         if (killit)
           {
             test->terminate ();
@@ -80,7 +80,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           {
             if (CORBA::is_nil (test.in()))
               {
-                test = Test::_narrow( obj.in() );
+                test = Test::_narrow( obj.in());
               }
             if (killit)
               {
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
index ec46d5d9079..9d1d8cf1ba9 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
@@ -220,7 +220,7 @@ sub shutdown_server
     }
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ($ti_cmd_base .
-                    "shutdown TestObject_a" );
+                    "shutdown TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0  && $TI_status != 5) {
         print STDERR "ERROR: tao_imr shutdown returned $TI_status\n";
@@ -237,7 +237,7 @@ sub manual_start_server
     }
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ($ti_cmd_base .
-                    "start TestObject_a" );
+                    "start TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr start returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
index 45a56ca1902..d07865512f6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
@@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base
 {
 public:
   explicit ORB_Runner (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) {}
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
@@ -49,7 +49,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs (void)
+activatePOAs ()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 7ac20a171bc..126f3aa8207 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -5,16 +5,16 @@ bug_689_regression_i::bug_689_regression_i (CORBA::ORB_ptr orb)
 {
 }
 
-bug_689_regression_i::~bug_689_regression_i (void)
+bug_689_regression_i::~bug_689_regression_i ()
 {
 }
 
 void
-bug_689_regression_i::shutdown (void)
+bug_689_regression_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
-void bug_689_regression_i::noop (void)
+void bug_689_regression_i::noop ()
 {
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index 700e4bac6d3..a03bbf4ae0c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -7,11 +7,11 @@ class bug_689_regression_i: public POA_bug_689_regression
 {
 public:
   bug_689_regression_i (CORBA::ORB_ptr orb);
-  ~bug_689_regression_i (void);
+  ~bug_689_regression_i ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void noop (void);
+  virtual void noop ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl b/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl
index 7852d4129d1..2e82d4c0b9b 100755
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/run_test_ft.pl
@@ -477,7 +477,7 @@ sub scale_test
     }
 
     print "Stopping servers\n";
-    do_ti_command (0, $srv_count, 1, "shutdown", "-q" );
+    do_ti_command (0, $srv_count, 1, "shutdown", "-q");
     wait_for_servers ();
 
     my $test_time = time() - $start_time;
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
index 197bb9e42d3..01466a89e1a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
@@ -21,14 +21,14 @@ public:
   {
   }
 
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ++n_;
     return n_;
   }
 };
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : server_name_()
   , second_name_()
 {
@@ -36,7 +36,6 @@ Server_i::Server_i (void)
 
 Server_i::~Server_i()
 {
-
   this->root_poa_->destroy(1, 1);
   this->orb_->destroy();
 }
@@ -158,7 +157,7 @@ Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
     {
@@ -174,7 +173,6 @@ Server_i::run (void)
       }
 
       this->orb_->run ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
index 8f1b13af35b..52f0b223f14 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
@@ -11,12 +11,12 @@
 class Server_i
 {
 public:
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int argc, ACE_TCHAR **argv);
 
-  int run (void);
+  int run ();
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
index 1c0b135a7e4..36e248801f4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -17,7 +17,7 @@ PortableInterceptor::Current_var pic;
 PortableInterceptor::SlotId slot_id;
 const IOP::ServiceId service_id = 0xdeadbeef;
 
-int get_offset (void)
+int get_offset ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, ofs_lock, 0);
   int r = ofs;
@@ -33,10 +33,10 @@ public:
   Worker (Messenger_ptr m)
     : messenger(Messenger::_duplicate (m)) {}
 
-  int svc (void)
+  int svc ()
   {
     int offset = get_offset ();
-    CORBA::String_var message = CORBA::string_dup( "Hello!" );
+    CORBA::String_var message = CORBA::string_dup( "Hello!");
     char user [100];
     ACE_OS::snprintf(user, 100, "client %d", offset / 100);
     int try_count = 0;
@@ -50,7 +50,7 @@ public:
         pic->set_slot (slot_id, in);
         try
           {
-            messenger->send_message( user, "Test 1", message.inout() );
+            messenger->send_message( user, "Test 1", message.inout());
 
             ACE_DEBUG ((LM_INFO,
                         ACE_TEXT("(%P|%t) received response for ")
@@ -66,7 +66,6 @@ public:
       }
     return 0;
   }
-
 };
 
 
@@ -75,12 +74,12 @@ class Client_Req_Int
     public virtual ::CORBA::LocalObject
 {
 public:
-  virtual char * name (void)
+  virtual char * name ()
   {
     return CORBA::string_dup ("Client_Req_Int");
   }
 
-  virtual void destroy (void)
+  virtual void destroy ()
   {
   }
 
@@ -102,7 +101,6 @@ public:
 
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   {
-
     if (CORBA::is_nil (this->pic_.in()))
       {
         ACE_GUARD (TAO_SYNCH_MUTEX, g, this->lock_);
@@ -141,7 +139,6 @@ public:
 private:
   TAO_SYNCH_MUTEX lock_;
   PortableInterceptor::Current_var pic_;
-
 };
 
 class ORB_Initializer : public virtual PortableInterceptor::ORBInitializer,
@@ -170,7 +167,6 @@ public:
       client_interceptor = interceptor;
 
     info->add_client_request_interceptor (client_interceptor.in ());
-
   }
 };
 
@@ -209,13 +205,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         new ORB_Initializer ();
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      CORBA::Object_var obj = orb->string_to_object( ior );
-      Messenger_var messenger = Messenger::_narrow( obj.in() );
+      CORBA::Object_var obj = orb->string_to_object(ior);
+      Messenger_var messenger = Messenger::_narrow(obj.in());
 
       obj = orb->resolve_initial_references ("PICurrent");
       pic = PortableInterceptor::Current::_narrow (obj.in ());
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h
index 9bbc2dee9c0..e29f2e4a6c3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h
@@ -5,7 +5,6 @@
 class Terminator : public ACE_Task<ACE_MT_SYNCH>
 {
  public:
-
   virtual int open(void*);
 
   virtual int svc();
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl
index 1d72c177827..10f295ec2ab 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test.idl
@@ -2,6 +2,5 @@ interface Messenger
 {
   boolean send_message ( in    string user_name,
                          in    string subject,
-                         inout string message );
-
+                         inout string message);
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
index c1a7320f7d7..016356a7212 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
@@ -18,7 +18,7 @@ Test_i::Test_i (Terminator &terminator)
 }
 
 // Implementation skeleton destructor
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
index c84ce4087c6..95366a3b870 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
@@ -19,7 +19,7 @@ public:
   Test_i (Terminator &terminator);
 
   //Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
index d8074e356af..0f72129c222 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
@@ -12,7 +12,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 147819b1617..60d7cf51eb5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -18,7 +18,7 @@ class Client_Task : public ACE_Task_Base
       caught_object_not_exist_ (false)
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       ACE_Time_Value elapsed;
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java
index bdf5bccb05c..cb8b212a926 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/java/taoimrtest/reconnectServer/Client.java
@@ -65,7 +65,7 @@ class Client
         props.setProperty ("jacorb.log.default.verbosity","3");
         try
         {
-            org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, props );
+            org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, props);
             client.timeObj = TimeSrvHelper.narrow (orb.string_to_object ("file://A.ior"));
             client.runTest ();
             if (!client.testPassed ())
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index 14661239937..c5c6d684768 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -58,15 +58,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
-      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY );
+      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
     // Threading policy
     policies[4] =
@@ -74,12 +74,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     PortableServer::POA_var poa_a = rootPOA->create_POA ("poaA",
         poa_manager.in (),
-        policies
-        );
+        policies);
     PortableServer::POA_var poa_c = rootPOA->create_POA ("poaC",
         poa_manager.in (),
-        policies
-        );
+        policies);
 
     for (CORBA::ULong i = 0;
       i < policies.length ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 9f338efb08c..9d9afb07ecd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -71,15 +71,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
-      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY );
+      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
     // Threading policy
     policies[4] =
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
index 6a76a9bc053..90f4fe3953e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
@@ -2,37 +2,37 @@
 #include "ace/OS_NS_time.h"
 
 // Implementation skeleton constructor
-Test_Dummy_i::Test_Dummy_i (void)
+Test_Dummy_i::Test_Dummy_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Dummy_i::~Test_Dummy_i (void)
+Test_Dummy_i::~Test_Dummy_i ()
 {
 }
 
-char * Test_Dummy_i::getMessage (void)
+char * Test_Dummy_i::getMessage ()
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
 }
 
-Test_Time_i::Test_Time_i (void)
+Test_Time_i::Test_Time_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Time_i::~Test_Time_i (void)
+Test_Time_i::~Test_Time_i ()
 {
 }
 
-::CORBA::Long Test_Time_i::current_time (void)
+::CORBA::Long Test_Time_i::current_time ()
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
 }
 
-void Test_Time_i::shutdown (void)
+void Test_Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index 536c7fe81a8..96ac6c0c134 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -12,12 +12,12 @@ class  Test_Dummy_i
 {
 public:
   // Constructor
-  Test_Dummy_i (void);
+  Test_Dummy_i ();
 
   // Destructor
-  virtual ~Test_Dummy_i (void);
+  virtual ~Test_Dummy_i ();
 
-  virtual  char * getMessage (void);
+  virtual  char * getMessage ();
 };
 
 class  Test_Time_i
@@ -25,14 +25,14 @@ class  Test_Time_i
 {
 public:
   // Constructor
-  Test_Time_i (void);
+  Test_Time_i ();
 
   // Destructor
-  virtual ~Test_Time_i (void);
+  virtual ~Test_Time_i ();
 
-  virtual ::CORBA::Long current_time (void);
+  virtual ::CORBA::Long current_time ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 #endif /* IMR_RECONNECTSERVER_H  */
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
index 0c7648f65e9..3d9167045c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
@@ -60,15 +60,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
-      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY );
+      rootPOA->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
     // Threading policy
     policies[4] =
@@ -76,12 +76,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     PortableServer::POA_var poa_a = rootPOA->create_POA ("poaA",
         poa_manager.in (),
-        policies
-        );
+        policies);
     PortableServer::POA_var poa_c = rootPOA->create_POA ("poaC",
         poa_manager.in (),
-        policies
-        );
+        policies);
 
     for (CORBA::ULong i = 0;
       i < policies.length ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
index adc92c4336a..e07dd513d64 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
@@ -2,37 +2,37 @@
 #include "ace/OS_NS_time.h"
 
 // Implementation skeleton constructor
-Test_Dummy_i::Test_Dummy_i (void)
+Test_Dummy_i::Test_Dummy_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Dummy_i::~Test_Dummy_i (void)
+Test_Dummy_i::~Test_Dummy_i ()
 {
 }
 
-char * Test_Dummy_i::getMessage (void)
+char * Test_Dummy_i::getMessage ()
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
 }
 
-Test_Time_i::Test_Time_i (void)
+Test_Time_i::Test_Time_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Time_i::~Test_Time_i (void)
+Test_Time_i::~Test_Time_i ()
 {
 }
 
-::CORBA::Long Test_Time_i::current_time (void)
+::CORBA::Long Test_Time_i::current_time ()
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
 }
 
-void Test_Time_i::shutdown (void)
+void Test_Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
index 53cef409396..30f78bed6e1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
@@ -13,12 +13,12 @@ class  Test_Dummy_i
 {
 public:
   // Constructor
-  Test_Dummy_i (void);
+  Test_Dummy_i ();
 
   // Destructor
-  virtual ~Test_Dummy_i (void);
+  virtual ~Test_Dummy_i ();
 
-  virtual  char * getMessage (void);
+  virtual  char * getMessage ();
 };
 
 class  Test_Time_i
@@ -26,14 +26,14 @@ class  Test_Time_i
 {
 public:
   // Constructor
-  Test_Time_i (void);
+  Test_Time_i ();
 
   // Destructor
-  virtual ~Test_Time_i (void);
+  virtual ~Test_Time_i ();
 
-  virtual ::CORBA::Long current_time (void);
+  virtual ::CORBA::Long current_time ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
index 2b765fc66e3..27a7cc1090c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
@@ -61,26 +61,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ior );
+    CORBA::Object_var obj = orb->string_to_object(ior);
     if (CORBA::is_nil(obj.in())) {
       std::cerr << "Nil Messenger reference" << std::endl;
       return 1;
     }
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
+    Messenger_var messenger = Messenger::_narrow( obj.in());
     if (CORBA::is_nil(messenger.in())) {
       std::cerr << "Argument is not a Messenger reference" << std::endl;
       return 1;
     }
 
-    CORBA::String_var message = CORBA::string_dup( "Hello!" );
+    CORBA::String_var message = CORBA::string_dup( "Hello!");
 
     int try_count = 0;
     int succeeded = 0;
@@ -90,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   "(%P|%t) - Sending message <%d> to server\n", try_count));
 
       try {
-        messenger->send_message( "TAO User", "Test 1", message.inout() );
+        messenger->send_message( "TAO User", "Test 1", message.inout());
 
         ACE_DEBUG ((LM_INFO,
             "(%P|%t) - Successfully received response for message <%d> to server\n", try_count));
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
index cbbdf490f3e..0dd19725ef2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
@@ -21,7 +21,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -47,7 +47,7 @@ Messenger_i::abort (CORBA::Short delay_secs)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
index b9735f7c344..a27199fc3a3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
@@ -19,7 +19,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
@@ -28,7 +28,7 @@ public:
 
   virtual void abort (CORBA::Short delay_secs);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index a3292254a97..e9af2b8fcab 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -5,9 +5,8 @@
 #include "ace/ACE.h"
 
 
-
 // Constructor.
-Airplane_Client_i::Airplane_Client_i (void)
+Airplane_Client_i::Airplane_Client_i ()
   : argc_ (0),
     argv_ (0),
     server_key_ (ACE::strnew (ACE_TEXT("key0"))),
@@ -20,7 +19,7 @@ Airplane_Client_i::Airplane_Client_i (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Airplane_Client_i::parse_args (void)
+Airplane_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:k:"));
   int c;
@@ -88,7 +87,7 @@ Airplane_Client_i::run ()
   return this->get_planes (this->loop_count_);
 }
 
-Airplane_Client_i::~Airplane_Client_i (void)
+Airplane_Client_i::~Airplane_Client_i ()
 {
   // Free resources
   CORBA::release (this->server_);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
index 38262d362fd..7978e2c9329 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
@@ -29,8 +29,8 @@ class Airplane_Client_i
 {
 public:
   // = Constructor and destructor.
-  Airplane_Client_i (void);
-  ~Airplane_Client_i (void);
+  Airplane_Client_i ();
+  ~Airplane_Client_i ();
 
   /// Execute client example code.
   int run ();
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Ask the Paper Airplane Server for <count> planes.
   int get_planes (size_t count);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 5a258383764..a624bc710de 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -13,7 +13,7 @@ Airplane_i::Airplane_i ()
 
 // Destructor
 
-Airplane_i::~Airplane_i (void)
+Airplane_i::~Airplane_i ()
 {
   // Nothing
 }
@@ -22,7 +22,7 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (void)
+Airplane_i::get_plane ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 7856da64539..aaa7b985bda 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -42,10 +42,10 @@ public:
   Airplane_i ();
 
   /// Destructor
-  ~Airplane_i (void);
+  ~Airplane_i ();
 
   /// Returns a random plane.
-  virtual char *get_plane (void);
+  virtual char *get_plane ();
 };
 
 #endif /* AIRPLANE_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 30041bb9188..7b76fea438c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -14,7 +14,7 @@
 // The server name of the Aiprlane Server
 const char SERVER_NAME[] = "airplane_server";
 
-Airplane_Server_i::Airplane_Server_i (void)
+Airplane_Server_i::Airplane_Server_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -30,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void)
 }
 
 int
-Airplane_Server_i::parse_args (void)
+Airplane_Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:s:p:"));
   int c;
@@ -186,7 +186,7 @@ Airplane_Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Airplane_Server_i::run (void)
+Airplane_Server_i::run ()
 {
   try
     {
@@ -213,7 +213,7 @@ Airplane_Server_i::run (void)
   return 0;
 }
 
-Airplane_Server_i::~Airplane_Server_i (void)
+Airplane_Server_i::~Airplane_Server_i ()
 {
   delete this->server_impl_;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index d3c15ad3e94..d0bca514509 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -28,20 +28,20 @@ class Airplane_Server_i
 {
 public:
   /// Default constructor
-  Airplane_Server_i (void);
+  Airplane_Server_i ();
 
   /// Destructor
-  ~Airplane_Server_i (void);
+  ~Airplane_Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Number of command line arguments.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
index dd57ca7633d..d2b1849e3ac 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
@@ -15,13 +15,13 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::arm (void)
+Test_i::arm ()
 {
   this->armed_ = true;
 }
 
 void
-Test_i::trigger (void)
+Test_i::trigger ()
 {
   if (this->armed_)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
index 4012e77da02..bc8e00c029a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
@@ -18,9 +18,9 @@ public:
   //Destructor
   virtual ~Test_i ();
 
-  virtual void arm (void);
+  virtual void arm ();
 
-  virtual void trigger (void);
+  virtual void trigger ();
 
   int exit_code () const;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index 9112930c37a..001226a837a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -78,12 +78,12 @@ set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& to)
 }
 
 void
-do_restart_test (void)
+do_restart_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
   ACE_ASSERT (!CORBA::is_nil(obj.in ()));
   obj = set_timeout_policy (obj.in (), ACE_Time_Value (5,0));
-  Test_var test = Test::_narrow( obj.in () );
+  Test_var test = Test::_narrow( obj.in ());
   ACE_ASSERT (!CORBA::is_nil(test.in ()));
   int attempt = 2;
   while (attempt > 0)
@@ -128,7 +128,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-    orb = CORBA::ORB_init( argc, argv );
+    orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
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/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h
index 41134bedca9..ac6dc51db01 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h
@@ -5,7 +5,6 @@
 class Terminator : public ACE_Task<ACE_MT_SYNCH>
 {
  public:
-
   virtual int open(void*);
 
   virtual int svc();
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
index 29c74f751b2..b8b27e8c9a6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
@@ -26,10 +26,9 @@ Test_i::~Test_i ()
 }
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return this->server_num_;
 }
 
 
-
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
index c5ba93916d3..c106fa0e3e0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
@@ -23,7 +23,7 @@ public:
   //Destructor
   virtual ~Test_i ();
 
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
 private:
   void reset (PortableServer::POAManager_var &mgr, bool pause);
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
index 65910197c25..42d2f93c381 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
@@ -36,14 +36,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     CORBA::Object_var obj = orb->resolve_initial_references("Test");
     ACE_ASSERT (!CORBA::is_nil(obj.in()));
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     CORBA::Short n = test->get_server_num ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
index c5b8c84b3dc..f3c8678ab97 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
@@ -323,7 +323,7 @@ sub make_server_requests()
 
     ##### Run client against servers to active them #####
     for(my $i = 0; $i < $servers_count; $i++ ) {
-	$CLI->Arguments ("-ORBInitRef Test=corbaloc::localhost:$port/$objprefix" . '_' . $i . "_a" . $debug );
+	$CLI->Arguments ("-ORBInitRef Test=corbaloc::localhost:$port/$objprefix" . '_' . $i . "_a" . $debug);
 	$CLI_status = $CLI->SpawnWaitKill ($cli->ProcessStartWaitInterval());
 	if ($CLI_status != 0) {
 	    print STDERR "ERROR: client returned $CLI_status\n";
@@ -368,7 +368,7 @@ sub shutdown_servers(@)
 	my $status_file_name = $objprefix . "_$i.status";
         # Shutting down any server object within the server will shutdown the whole server
         $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                        "kill $objprefix" . '_' . $i . "_a -s $signum" );
+                        "kill $objprefix" . '_' . $i . "_a -s $signum");
         $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
         if ($TI_status != 0 && $TI_status != 5) {
             print STDERR "ERROR: tao_imr kill returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index 415978bcc12..e58eb515e65 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -47,7 +47,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
@@ -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/kill_slow_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
index a8f4c8691e3..f80fc476126 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
@@ -3,13 +3,13 @@
 #include "Test_i.h"
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return 1;
 }
 
 void
-Test_i::terminate (void)
+Test_i::terminate ()
 {
   exit (0);
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
index 984bc38669f..b5ae6dc04cf 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
@@ -12,9 +12,9 @@
 class  Test_i : public virtual POA_Test
 {
 public:
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
-  virtual void terminate (void);
+  virtual void terminate ();
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
index 7feb962aa13..6067c46338b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
@@ -34,7 +34,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try
       {
-        test = Test::_narrow( obj.in() );
+        test = Test::_narrow( obj.in());
         if (killit)
           {
             test->terminate ();
@@ -65,7 +65,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           {
             if (CORBA::is_nil (test.in()))
               {
-                test = Test::_narrow( obj.in() );
+                test = Test::_narrow( obj.in());
               }
             CORBA::Short n = test->get_server_num ();
             ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
index ede38443f69..1fc599fafd4 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
@@ -190,7 +190,7 @@ sub shutdown_server
     my $expected = shift;
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "shutdown TestObject_a" );
+                    "shutdown TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != $expected) {
         print STDERR "ERROR: tao_imr shutdown returned $TI_status expected $expected\n";
@@ -202,7 +202,7 @@ sub kill_server
 {
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "kill TestObject_a -s 9" );
+                    "kill TestObject_a -s 9");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr kill returned $TI_status\n";
@@ -214,7 +214,7 @@ sub start_server_no_wait
 {
     # Shutting down any server object within the server will shutdown the whole server
     $TINW->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                      "start TestObject_a" );
+                      "start TestObject_a");
     $TI_status = $TINW->Spawn ($tinw->ProcessStartWaitInterval());
 
     if ($TI_status != 0) {
@@ -238,7 +238,7 @@ sub manual_start_server
 {
     # Shutting down any server object within the server will shutdown the whole server
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "start TestObject_a" );
+                    "start TestObject_a");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr start returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
index 293ae2579d8..9c2027df62c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
@@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base
 {
 public:
   ORB_Runner (CORBA::ORB_var orb) : orb_(orb) {}
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
@@ -51,7 +51,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs (void)
+activatePOAs ()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
index db7abc4244c..4a44f3048b1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
@@ -4,11 +4,10 @@
 #include "Test_i.h"
 
 CORBA::Long
-Test_i::server_pid (void)
+Test_i::server_pid ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P) server pid called\n"));
   return ACE_OS::getpid ();
 }
 
 
-
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
index 1bbfb1e7c7b..58cc9f0a2ec 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
@@ -12,8 +12,7 @@
 class  Test_i : public virtual POA_Test
 {
 public:
-  virtual CORBA::Long server_pid (void);
-
+  virtual CORBA::Long server_pid ();
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
index ae911872025..6e9548a8777 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ior += ".ior";
     ACE_DEBUG ((LM_DEBUG, "using target = %c, iorstr %s\n", target, ior.c_str()));
     CORBA::Object_var obj = orb->string_to_object (ior.c_str());
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     CORBA::Long spid = test->server_pid ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 0f1ea1a0118..dc946f2142c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -40,7 +40,7 @@ createPOAs (ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
@@ -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/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 8b49865299c..0a8da2b599e 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -91,7 +91,7 @@ if ($TI_status != 0) {
 print "===== Updating a server\n";
 
 $TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile"
-                    . " update Foo -w foodir" );
+                    . " update Foo -w foodir");
 
 $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
 if ($TI_status != 0) {
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
index 4b9fb0827fd..aa6888fef99 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
@@ -33,10 +33,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-do_test (void)
+do_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
-  Test_var test = Test::_narrow( obj.in () );
+  Test_var test = Test::_narrow( obj.in ());
   ACE_ASSERT (!CORBA::is_nil(test.in ()));
 
   try
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
   {
-    orb = CORBA::ORB_init( argc, argv );
+    orb = CORBA::ORB_init(argc, argv);
   }
   catch(const CORBA::Exception& ex)
   {
@@ -70,7 +70,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   }
 
   try {
-
     if (parse_args (argc, argv) != 0)
       return 1;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
index c8bc7e309a6..b6ad50e5207 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
@@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
-      PortableServer::POA_var test_poa = createPOA (root_poa.in(), poa_name );
+      PortableServer::POA_var test_poa = createPOA (root_poa.in(), poa_name);
 
       Test_i *impl = new Test_i ();
       PortableServer::Servant_var<Test_i> test_servant = impl;
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
index 460050bc9ec..ccd4fe70e9b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
@@ -3,7 +3,7 @@
 #include "test_i.h"
 #include "ace/Log_Msg.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
 {
 }
 
@@ -12,7 +12,7 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::contact (void)
+Test_i::contact ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Server contacted\n")));
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
index fdf55c85fd1..725882cf677 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
@@ -13,12 +13,12 @@ class  Test_i : public virtual POA_Test
 {
 public:
   //Constructor
-  Test_i (void);
+  Test_i ();
 
   //Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
-  virtual void contact (void);
+  virtual void contact ();
 
 private:
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 406f52b8c10..600d36516af 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -5,9 +5,8 @@
 #include "ace/ACE.h"
 
 
-
 // Constructor.
-Nestea_Client_i::Nestea_Client_i (void)
+Nestea_Client_i::Nestea_Client_i ()
   : argc_ (0)
   , argv_ (0)
   , server_key_ (ACE::strnew (ACE_TEXT("key0")))
@@ -20,7 +19,7 @@ Nestea_Client_i::Nestea_Client_i (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Nestea_Client_i::parse_args (void)
+Nestea_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dsn:k:"));
   int c;
@@ -84,7 +83,7 @@ Nestea_Client_i::run ()
   return 0;
 }
 
-Nestea_Client_i::~Nestea_Client_i (void)
+Nestea_Client_i::~Nestea_Client_i ()
 {
   // Free resources
   CORBA::release (this->server_);
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
index 31c39f7fa7e..589ce0e3290 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
@@ -29,8 +29,8 @@ class Nestea_Client_i
 {
 public:
   // = Constructor and destructor.
-  Nestea_Client_i (void);
-  ~Nestea_Client_i (void);
+  Nestea_Client_i ();
+  ~Nestea_Client_i ();
 
   /// Execute client example code.
   int run ();
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 4c8b2fde791..f2e7dddaf24 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -10,7 +10,6 @@
 const size_t MAX_UINT32_STR_LEN = 11;  // Largest UINT32 is 8589934591 + NUL is 11 characters
 
 
-
 Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
 : cans_ (0)
 {
@@ -23,7 +22,7 @@ Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
 }
 
 
-Nestea_i::~Nestea_i (void)
+Nestea_i::~Nestea_i ()
 {
   delete [] this->data_filename_;
 }
@@ -63,7 +62,7 @@ Nestea_i::crush (CORBA::Long cans)
 // Returns the number of cans in the bookshelf.
 
 CORBA::Long
-Nestea_i::bookshelf_size (void)
+Nestea_i::bookshelf_size ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
@@ -74,7 +73,7 @@ Nestea_i::bookshelf_size (void)
 // Returns comments about your collection.
 
 char *
-Nestea_i::get_praise (void)
+Nestea_i::get_praise ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
@@ -92,7 +91,7 @@ Nestea_i::get_praise (void)
 }
 
 void
-Nestea_i::shutdown (void)
+Nestea_i::shutdown ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::shutdown\n"));
@@ -103,7 +102,7 @@ Nestea_i::shutdown (void)
 // Saves bookshelf data to a file.
 
 int
-Nestea_i::save_data (void)
+Nestea_i::save_data ()
 {
   ACE_FILE_IO file;
   ACE_FILE_Connector connector;
@@ -129,7 +128,7 @@ Nestea_i::save_data (void)
 // Loads bookshelf data from a file.
 
 int
-Nestea_i::load_data (void)
+Nestea_i::load_data ()
 {
   ACE_FILE_IO file;
   ACE_FILE_Connector connector;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 3d3dcb1cad5..2c713a6e7d3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -39,7 +39,7 @@ public:
   Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename = ACE_TEXT("nestea.dat"));
 
   /// Destructor
-  virtual ~Nestea_i (void);
+  virtual ~Nestea_i ();
 
   /// Add <cans> number of cans to the bookshelf.
   virtual void drink (CORBA::Long cans);
@@ -48,18 +48,18 @@ public:
   virtual void crush (CORBA::Long cans);
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (void);
+  virtual CORBA::Long bookshelf_size ();
 
   /// Returns comments about your collection.
-  virtual char *get_praise (void);
+  virtual char *get_praise ();
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 private:
   /// Saves bookshelf data to a file.
-  int save_data (void);
+  int save_data ();
 
   /// Loads bookshelf data from a file.
-  int load_data (void);
+  int load_data ();
 
   /// The name of the file to store the data in.
   ACE_TCHAR *data_filename_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index f950bfcc84e..82f97385c72 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -1,7 +1,6 @@
 #include "nestea_server_i.h"
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 5e81ec83a88..e53975115f0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -10,7 +10,6 @@
 #include "ace/OS_NS_stdio.h"
 
 
-
 // The file to save the persistent state to.
 const ACE_TCHAR NESTEA_DATA_FILENAME[] = ACE_TEXT("nestea.dat");
 
@@ -32,13 +31,13 @@ Nestea_Server_i::Nestea_Server_i (const char * /*filename*/)
   // Nothing
 }
 
-Nestea_Server_i::~Nestea_Server_i (void)
+Nestea_Server_i::~Nestea_Server_i ()
 {
   delete this->server_impl_;
 }
 
 int
-Nestea_Server_i::parse_args (void)
+Nestea_Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:"));
   int c;
@@ -193,7 +192,7 @@ Nestea_Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Nestea_Server_i::run (void)
+Nestea_Server_i::run ()
 {
   int status = 0;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index 523234cfb51..6101c21333a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -32,17 +32,17 @@ public:
   Nestea_Server_i (const char *filename = "nestea.dat");
 
   /// Destructor
-  ~Nestea_Server_i (void);
+  ~Nestea_Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Number of command line arguments.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
index ad5344fbc6f..ee6d0e6ea32 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
@@ -3,7 +3,7 @@
 #include "Test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
   : count_ (0)
 {
 }
@@ -13,14 +13,14 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::foo (void)
+Test_i::foo ()
 {
   ACE_DEBUG ((LM_DEBUG,"foo called\n"));
   ++this->count_;
 }
 
 CORBA::Short
-Test_i::get_call_count (void)
+Test_i::get_call_count ()
 {
   CORBA::Short r = this->count_;
   this->count_ = 0;
@@ -28,4 +28,3 @@ Test_i::get_call_count (void)
 }
 
 
-
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
index 65889da6a57..bb117cfc247 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
@@ -15,18 +15,17 @@ class  Test_i : public virtual POA_Test
 {
 public:
   //Constructor
-  Test_i (void);
+  Test_i ();
 
   //Destructor
   virtual ~Test_i ();
 
-  virtual void foo (void);
+  virtual void foo ();
 
-  virtual CORBA::Short get_call_count (void);
+  virtual CORBA::Short get_call_count ();
 
 private:
   CORBA::Short count_;
-
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
index d65dd22c22e..e85d56a9b7e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
@@ -34,7 +34,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ACE_DEBUG ((LM_DEBUG, "Client could not RIR Test\n"));
         return 1;
       }
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     if (CORBA::is_nil(test.in()))
       {
         ACE_DEBUG ((LM_DEBUG, "Client could not narrow Test\n"));
@@ -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..d6d0b8054f2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
@@ -33,7 +33,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ACE_DEBUG ((LM_DEBUG, "Client could not RIR Test\n"));
         return 1;
       }
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     if (CORBA::is_nil(test.in()))
       {
         ACE_DEBUG ((LM_DEBUG, "Client could not narrow Test\n"));
@@ -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/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
index 9e1e79e5197..f7c3f4602dd 100755
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
@@ -156,7 +156,7 @@ sub make_server_requests($$)
     my $debug_args = "-ORBDebugLevel $debug_level -ORBLogFile client.log" if ($debug_level > 0);
 
     print "Making requests using $init_ref $svc_conf $debug_args\n";
-    $proc->Arguments ("$init_ref $svc_conf $debug_args" );
+    $proc->Arguments ("$init_ref $svc_conf $debug_args");
 
     $CLI_status = $proc->SpawnWaitKill ($cli->ProcessStartWaitInterval());
     if ($CLI_status != 0) {
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index fea63bc3cae..e62303e7d49 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -37,7 +37,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
@@ -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/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 8c8247294ea..d8031c07815 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -11,7 +11,7 @@ Ping_Death_Request_Interceptor::Ping_Death_Request_Interceptor (int *counter)
 {
 }
 
-Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor (void)
+Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor ()
 {
 }
 
@@ -22,13 +22,13 @@ Ping_Death_Request_Interceptor::set_poa (PortableServer::POA_ptr poa)
 }
 
 char *
-Ping_Death_Request_Interceptor::name (void)
+Ping_Death_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Ping_Death_Request_Interceptor::destroy (void)
+Ping_Death_Request_Interceptor::destroy ()
 {
 }
 
@@ -63,7 +63,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts (
   throw ::CORBA::TRANSIENT
     ( CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1),
       CORBA::COMPLETED_NO);
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
index 913e58f89c1..9b1644338b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
@@ -31,9 +31,9 @@ public:
   void set_poa (PortableServer::POA_ptr poa);
 
   // Canonical name of the interceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index 7f093b9d1ef..66f9c2f6b73 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -9,7 +9,6 @@ using namespace CORBA;
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
   try
   {
-
     ORB_var orb = ORB_init(argc, argv);
 
     Object_var obj = orb->resolve_initial_references("Test");
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index e2b30ccbff4..619b9f46068 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -21,7 +21,7 @@ public:
   }
   virtual ~test_i () {
   }
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ++n_;
     CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
@@ -38,7 +38,7 @@ public:
 // The server name of the Aiprlane Server
 static const char DEFAULT_SERVER_NAME[] = "TestObject";
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
 : server_name_(DEFAULT_SERVER_NAME)
 , count_(1)
 {
@@ -163,7 +163,7 @@ Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 1fbf4d27f2b..e7c6e2f8793 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -10,12 +10,12 @@
 class Server_i
 {
 public:
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int argc, ACE_TCHAR **argv);
 
-  int run (void);
+  int run ();
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
index d94bbe5cf91..d402292899d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -99,7 +99,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ///// Get object reference /////
     obj = orb->resolve_initial_references("Test");
     ACE_ASSERT (!CORBA::is_nil(obj.in()));
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     if (max_tries > 1)
@@ -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..d33667ecc5b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -47,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -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/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
index b07c749f85d..613e48b714d 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
@@ -25,8 +25,8 @@ my $hide_server = 0;
 my $expect_transient = "";
 my $notify_locator = "";
 my $debuglog = "";
-my @srvlogfile = ( "", "", "" );
-my @cltlogfile = ( "", "", "" );
+my @srvlogfile = ( "", "", "");
+my @cltlogfile = ( "", "", "");
 my $actlogfile = "";
 my $loclogfile = "";
 my $back_store_flag = "";
@@ -46,8 +46,8 @@ if ($#ARGV >= 0) {
 	    $debug_level = 10;
 	    $imr_debug_level = 3;
             $debuglog = "-ORBVerboseLogging 1 -ORBLogFile ";
-            @srvlogfile = ( "server1.log", "server2.log", "server3.log" );
-            @cltlogfile = ( "client1.log", "client2.log", "client3.log" );
+            @srvlogfile = ( "server1.log", "server2.log", "server3.log");
+            @cltlogfile = ( "client1.log", "client2.log", "client3.log");
             $actlogfile = "imr_act.log";
             $loclogfile = "imr_loc.log";
 	}
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/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h
index 41134bedca9..ac6dc51db01 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h
@@ -5,7 +5,6 @@
 class Terminator : public ACE_Task<ACE_MT_SYNCH>
 {
  public:
-
   virtual int open(void*);
 
   virtual int svc();
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
index 33bd08b6fa7..f1978c9a4c1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
@@ -1,12 +1,10 @@
 interface Test
 {
-
   // Return the number of the server after a delay
   short get_server_num (in short delay_secs);
 
   // After replying, abort process
   // delay_secs seconds.
-  oneway void abort ( in short delay_secs );
-
+  oneway void abort ( in short delay_secs);
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
index 524455780c1..2d6e14f416a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
@@ -34,5 +34,4 @@ Test_i::abort (CORBA::Short delay_secs)
   ACE_NEW(mb, ACE_Message_Block(2));
   ACE_OS::sprintf(mb->wr_ptr (), "%d", delay_secs);
   terminator_.putq(mb);
-
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
index 1aca6cf2a07..4804350e1b9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
@@ -42,14 +42,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     CORBA::Object_var obj = orb->resolve_initial_references("Test");
     ACE_ASSERT (!CORBA::is_nil(obj.in()));
-    Test_var test = Test::_narrow( obj.in() );
+    Test_var test = Test::_narrow( obj.in());
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
     if (server_abort)
@@ -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/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
index 8e23518fce3..8bff03fe554 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
@@ -282,7 +282,7 @@ sub shutdown_servers
             last;
         }
         if (! $use_activator) {
-            $SRV_status = $SRV[$i]->WaitKill($srv[$i]->ProcessStopWaitInterval());
+            $SRV_status = $SRV[$i]->WaitKill($srv[$i]->ProcessStopWaitInterval(), {self_crash => 1});
             if ($SRV_status != 0) {
                 print STDERR "ERROR: server not shutdown correctly. It returned $SRV_status\n";
                 $status = 1;
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/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index dfc404651af..c524f06b15c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -2,7 +2,7 @@
 #include "ifr_dii_client.h"
 #include "ace/Get_Opt.h"
 
-IFR_DII_Client::IFR_DII_Client (void)
+IFR_DII_Client::IFR_DII_Client ()
   : namespace_name (CORBA::string_dup ("warehouse")),
     interface_name (CORBA::string_dup ("inventory")),
     op_name (CORBA::string_dup ("getCDinfo")),
@@ -12,7 +12,7 @@ IFR_DII_Client::IFR_DII_Client (void)
 {
 }
 
-IFR_DII_Client::~IFR_DII_Client (void)
+IFR_DII_Client::~IFR_DII_Client ()
 {
 }
 
@@ -45,7 +45,7 @@ IFR_DII_Client::init (int argc,
 }
 
 int
-IFR_DII_Client::run (void)
+IFR_DII_Client::run ()
 {
   int result = 0;
 
@@ -110,7 +110,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-IFR_DII_Client::find_interface_def (void)
+IFR_DII_Client::find_interface_def ()
 {
   this->target_def_ =
     this->target_->_get_interface ();
@@ -126,7 +126,7 @@ IFR_DII_Client::find_interface_def (void)
 }
 
 int
-IFR_DII_Client::lookup_interface_def (void)
+IFR_DII_Client::lookup_interface_def ()
 {
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("InterfaceRepository");
@@ -197,7 +197,7 @@ IFR_DII_Client::lookup_interface_def (void)
 }
 
 void
-IFR_DII_Client::get_operation_def (void)
+IFR_DII_Client::get_operation_def ()
 {
   // What operation(s) does this interface contain?
   CORBA::ContainedSeq_var operations =
@@ -224,7 +224,7 @@ IFR_DII_Client::get_operation_def (void)
 }
 
 void
-IFR_DII_Client::create_dii_request (void)
+IFR_DII_Client::create_dii_request ()
 {
   this->req_ = this->target_->_request (this->op_name.in ());
 
@@ -289,7 +289,7 @@ IFR_DII_Client::create_dii_request (void)
 }
 
 void
-IFR_DII_Client::invoke_and_display (void)
+IFR_DII_Client::invoke_and_display ()
 {
   this->req_->invoke ();
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 1431163ea66..818a82772f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -13,14 +13,14 @@
 class IFR_DII_Client
 {
 public:
-  IFR_DII_Client (void);
-  ~IFR_DII_Client (void);
+  IFR_DII_Client ();
+  ~IFR_DII_Client ();
 
   int init (int argc,
             ACE_TCHAR *argv[]);
   // Initialize the client.
 
-  int run (void);
+  int run ();
   // Run the client.
 
 private:
@@ -28,20 +28,20 @@ private:
                   ACE_TCHAR *argv[]);
   // Process the command line arguments.
 
-  int find_interface_def (void);
+  int find_interface_def ();
   // Query the object reference to get its InterfaceDef in the IFR.
 
-  int lookup_interface_def (void);
+  int lookup_interface_def ();
   // Look up the InterfaceDef by name in the IFR.
 
-  void get_operation_def (void);
+  void get_operation_def ();
   // Find the desired operation in the interface definition.
 
-  void create_dii_request (void);
+  void create_dii_request ();
   // Query the interface definition to get the info needed
   // to construct a CORBA::Request.
 
-  void invoke_and_display (void);
+  void invoke_and_display ();
   // Do the invocation and display the results.
 
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 7c1e0cec61c..dd9704490df 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -5,7 +5,6 @@
 #include "ace/Get_Opt.h"
 
 
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile");
 
 int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
index d32c97df594..88641ac4c85 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
@@ -29,12 +29,12 @@
 
 
 // Implementation skeleton constructor
-Test_interfaceOne_i::Test_interfaceOne_i (void)
+Test_interfaceOne_i::Test_interfaceOne_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_interfaceOne_i::~Test_interfaceOne_i (void)
+Test_interfaceOne_i::~Test_interfaceOne_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index 84cfb593ad6..47e30ff6a5b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -15,10 +15,10 @@ class  Test_interfaceOne_i
 {
 public:
   // Constructor
-  Test_interfaceOne_i (void);
+  Test_interfaceOne_i ();
 
   // Destructor
-  virtual ~Test_interfaceOne_i (void);
+  virtual ~Test_interfaceOne_i ();
 
   virtual void getstruct (::Test::structOne_out tester);
 };
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
index 87e04510f2d..1be39a461dd 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
@@ -6,7 +6,6 @@
 
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -40,7 +39,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 7de7b2026d0..9aa4b4cd794 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -241,12 +241,12 @@ const char *HOME_FINDER_EXCEP_NAMES[][1] =
     {"whups"}
   };
 
-IDL3_Client::IDL3_Client (void)
+IDL3_Client::IDL3_Client ()
   : debug_ (false)
 {
 }
 
-IDL3_Client::~IDL3_Client (void)
+IDL3_Client::~IDL3_Client ()
 {
 }
 
@@ -285,7 +285,7 @@ IDL3_Client::init (int argc,
 }
 
 int
-IDL3_Client::run (void)
+IDL3_Client::run ()
 {
   int status = this->component_test ();
 
@@ -345,7 +345,7 @@ IDL3_Client::parse_args (int argc,
 }
 
 int
-IDL3_Client::component_test (void)
+IDL3_Client::component_test ()
 {
   CORBA::Contained_var result =
     this->repo_->lookup_id (COMPONENT_ID);
@@ -461,7 +461,7 @@ IDL3_Client::component_test (void)
 }
 
 int
-IDL3_Client::home_test (void)
+IDL3_Client::home_test ()
 {
   CORBA::Contained_var result =
     this->repo_->lookup_id (HOME_ID);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 01a16d4b4ac..b4b13498341 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -28,33 +28,32 @@ class IDL3_Client
 {
 public:
   /// Constructor
-  IDL3_Client (void);
+  IDL3_Client ();
 
   /// Destructor
-  ~IDL3_Client (void);
+  ~IDL3_Client ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 
 private:
   /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
-  int component_test (void);
-  int home_test (void);
+  int component_test ();
+  int home_test ();
 
   // Also tests eventtype.
   int valuetype_test (const char *repo_id,
                       const char *prefix);
 
   int component_attribute_test (
-      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
-    );
+      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &);
 
   int component_inheritance_test (CORBA::ComponentIR::ComponentDef_var &);
 
@@ -75,23 +74,19 @@ private:
 
   int valuetype_attribute_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int valuetype_operation_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int valuetype_member_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int valuetype_factory_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
-      const char *prefix
-    );
+      const char *prefix);
 
   int home_inheritance_test (CORBA::ComponentIR::HomeDef_var &);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
index 3a54de29adf..5466d5d9eeb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
@@ -1,5 +1,3 @@
-
-
 This is a simple test showing that Interface inheritance
 is supported by the Interface Repository.
 
@@ -31,8 +29,6 @@ library in TAO/orbsvcs/orbsvcs.
 
 To run this test, either use the Perl script run_test.pl, or
 
-
-
 (Windows)
 start the Interface Repository by typing
 
@@ -72,4 +68,4 @@ and
 
  ./IFR_Inheritance_Test
 
-- Scott Harris <harris_s@ociweb.com>
\ No newline at end of file
+- Scott Harris <harris_s@ociweb.com>
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
index fa074920bd1..11686ef9ded 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
@@ -10,20 +10,20 @@ GoodDay::GoodDay (CORBA::ORB_ptr orb)
 }
 
 char *
-GoodDay::get_string (void)
+GoodDay::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-GoodDay::shutdown (void)
+GoodDay::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 ::Test::GoodDay::RoughWeek *
-GoodDay::this_week (void)
+GoodDay::this_week ()
 {
   // Not actually used.
   return 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
index 0425c501516..35bb1c981f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
@@ -18,11 +18,11 @@ public:
   GoodDay (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual ::Test::GoodDay::RoughWeek * this_week (void);
+  virtual ::Test::GoodDay::RoughWeek * this_week ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
index 169226cdfe2..fb5f5bee9f9 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
@@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       else
       {
-
         CORBA::String_var the_string =
           goodday->get_string ();
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index f518158d272..a74c19130e2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -7,7 +7,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-Admin_Client::Admin_Client (void)
+Admin_Client::Admin_Client ()
   : debug_ (0),
     all_tests_ (1),
     which_test_ (0),
@@ -27,7 +27,7 @@ Admin_Client::Admin_Client (void)
   this->test_array_[10] = &Admin_Client::module_test;
 }
 
-Admin_Client::~Admin_Client (void)
+Admin_Client::~Admin_Client ()
 {
 }
 
@@ -68,9 +68,7 @@ Admin_Client::init (int argc, ACE_TCHAR *argv[])
           ACE_ERROR_RETURN ((
               LM_ERROR,
               "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
+            ), -1);
         }
 
       this->repo_ =
@@ -93,7 +91,7 @@ Admin_Client::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Admin_Client::run (void)
+Admin_Client::run ()
 {
   try
     {
@@ -114,8 +112,7 @@ Admin_Client::run (void)
         {
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
-              (this->*test_array_[this->which_test_])(
-                );
+              (this->*test_array_[this->which_test_])();
             }
         }
     }
@@ -178,7 +175,7 @@ Admin_Client::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Admin_Client::array_test (void)
+Admin_Client::array_test ()
 {
   if (this->debug_)
     {
@@ -310,7 +307,7 @@ Admin_Client::array_test (void)
 }
 
 void
-Admin_Client::enum_test (void)
+Admin_Client::enum_test ()
 {
   if (this->debug_)
     {
@@ -577,7 +574,7 @@ Admin_Client::enum_test (void)
 }
 
 void
-Admin_Client::alias_test (void)
+Admin_Client::alias_test ()
 {
   if (this->debug_)
     {
@@ -819,7 +816,7 @@ Admin_Client::alias_test (void)
 }
 
 void
-Admin_Client::native_test (void)
+Admin_Client::native_test ()
 {
   if (this->debug_)
     {
@@ -894,7 +891,7 @@ Admin_Client::native_test (void)
 }
 
 void
-Admin_Client::struct_test (void)
+Admin_Client::struct_test ()
 {
   if (this->debug_)
     {
@@ -1289,7 +1286,7 @@ Admin_Client::struct_test (void)
 }
 
 void
-Admin_Client::union_test (void)
+Admin_Client::union_test ()
 {
   if (this->debug_)
     {
@@ -1493,7 +1490,7 @@ Admin_Client::union_test (void)
 }
 
 void
-Admin_Client::exception_test (void)
+Admin_Client::exception_test ()
 {
   if (this->debug_)
     {
@@ -1937,7 +1934,7 @@ Admin_Client::exception_test (void)
 }
 
 void
-Admin_Client::constant_test (void)
+Admin_Client::constant_test ()
 {
   if (this->debug_)
     {
@@ -2117,7 +2114,7 @@ Admin_Client::constant_test (void)
 }
 
 void
-Admin_Client::interface_test (void)
+Admin_Client::interface_test ()
 {
   if (this->debug_)
     {
@@ -2535,7 +2532,7 @@ Admin_Client::interface_test (void)
 }
 
 void
-Admin_Client::move_test (void)
+Admin_Client::move_test ()
 {
   if (this->debug_)
     {
@@ -2916,7 +2913,7 @@ Admin_Client::move_test (void)
 }
 
 void
-Admin_Client::module_test (void)
+Admin_Client::module_test ()
 {
   if (this->debug_)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index d482201fe22..0e55e5a76a4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -33,38 +33,38 @@ class Admin_Client
 {
 public:
   /// Constructor
-  Admin_Client (void);
+  Admin_Client ();
 
   /// Destructor
-  ~Admin_Client (void);
+  ~Admin_Client ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 
 private:
   /// The various IFR tests.
-  void array_test (void);
-  void enum_test (void);
-  void alias_test (void);
-  void native_test (void);
-  void struct_test (void);
-  void union_test (void);
-  void exception_test (void);
-  void constant_test (void);
-  void interface_test (void);
-  void move_test (void);
-  void module_test (void);
+  void array_test ();
+  void enum_test ();
+  void alias_test ();
+  void native_test ();
+  void struct_test ();
+  void union_test ();
+  void exception_test ();
+  void constant_test ();
+  void interface_test ();
+  void move_test ();
+  void module_test ();
 
   /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
   /// Array of pointers to the test functions.
-  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void);
+  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])();
 
   /// Array of test names used in selection of one test.
   static const char *test_names_[];
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README
index 4e1e9b570f9..6a2cb175173 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README
@@ -1,5 +1,3 @@
-
-
 Admin_Client is a class containing several functions which test
 the methods in various IFR object classes. Since automatic
 administration of the TAO Interface Repository has not yet been
@@ -28,8 +26,6 @@ library in TAO/orbsvcs/orbsvcs.
 
 To run this test, either use the Perl script run_test.pl, or
 
-
-
 (Windows)
 start the Interface Repository by typing
 
@@ -110,4 +106,4 @@ ensure that future modifications to IFR code don't cause deadlocks.
 More information about the Interface Repository can be found in
 TAO/docs/releasenotes.index.html.
 
--Jeff Parsons <parsons@cs.wustl.edu>
\ No newline at end of file
+-Jeff Parsons <parsons@cs.wustl.edu>
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index b9353a4913c..1535d3bc8e6 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -8,14 +8,14 @@
 
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
 
-Latency_Query_Client::Latency_Query_Client (void)
+Latency_Query_Client::Latency_Query_Client ()
   : debug_ (false),
     do_dump_history_ (0),
     iterations_ (DEFAULT_NUMCALLS)
 {
 }
 
-Latency_Query_Client::~Latency_Query_Client (void)
+Latency_Query_Client::~Latency_Query_Client ()
 {
 }
 
@@ -42,9 +42,7 @@ Latency_Query_Client::init (int argc,
           ACE_ERROR_RETURN ((
               LM_ERROR,
               "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
+            ), -1);
         }
 
       this->repo_ =
@@ -74,7 +72,7 @@ Latency_Query_Client::init (int argc,
 }
 
 int
-Latency_Query_Client::run (void)
+Latency_Query_Client::run ()
 {
 //  CORBA::DefinitionKind dk;
   CORBA::AttributeMode am;
@@ -184,7 +182,7 @@ Latency_Query_Client::parse_args (int argc,
 }
 
 int
-Latency_Query_Client::populate_ifr (void)
+Latency_Query_Client::populate_ifr ()
 {
   CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0");
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index 9debce05530..26eb07c7b76 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -28,24 +28,24 @@ class Latency_Query_Client
 {
 public:
   /// Constructor
-  Latency_Query_Client (void);
+  Latency_Query_Client ();
 
   /// Destructor
-  ~Latency_Query_Client (void);
+  ~Latency_Query_Client ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 private:
   /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
   /// Put in something to query about.
-  int populate_ifr (void);
+  int populate_ifr ();
 
 private:
   /// Toggle debugging output.
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index d954dbd5a98..6cb797b60e0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -3,13 +3,13 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-Ptest::Ptest (void)
+Ptest::Ptest ()
   : debug_ (0),
     query_ (0)
 {
 }
 
-Ptest::~Ptest (void)
+Ptest::~Ptest ()
 {
 }
 
@@ -33,9 +33,7 @@ Ptest::init (int argc, ACE_TCHAR *argv[])
           ACE_ERROR_RETURN ((
               LM_ERROR,
               "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
+            ), -1);
         }
 
       this->repo_ =
@@ -58,7 +56,7 @@ Ptest::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Ptest::shutdown (void)
+Ptest::shutdown ()
 {
   try
     {
@@ -77,7 +75,7 @@ Ptest::shutdown (void)
 }
 
 int
-Ptest::run (void)
+Ptest::run ()
 {
   try
     {
@@ -130,7 +128,7 @@ Ptest::parse_args (int argc,
 }
 
 void
-Ptest::populate (void)
+Ptest::populate ()
 {
   if (this->debug_)
     {
@@ -170,7 +168,7 @@ Ptest::populate (void)
 }
 
 int
-Ptest::query (void)
+Ptest::query ()
 {
   if (this->debug_)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index 5f6c61df0fb..fbc3a0ce3b3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -33,25 +33,25 @@ class Ptest
 {
 public:
   /// Constructor
-  Ptest (void);
+  Ptest ();
 
   /// Destructor
-  ~Ptest (void);
+  ~Ptest ();
 
   /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Execute test code.
-  int run (void);
+  int run ();
 
   /// Cleanup
-  int shutdown (void);
+  int shutdown ();
 
 private:
   /// The two IFR tests.
-  void populate (void);
-  int query (void);
+  void populate ();
+  int query ();
 
   /// Process the command line arguments.
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt
index bcb742f7819..4de56a9ff97 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt
@@ -1,5 +1,3 @@
-
-
 This test illustrates a problem with the IFR service in that it cannot
 properly handle forward declared unions.
 
@@ -37,4 +35,3 @@ Here is a stack trace relative to the IFR service in TAO 1.6.6:
 #10 0x00007f68cc47dc25 in POA_CORBA::AttributeDef::_get_type_skel (
     server_request=@0x7fffd4cdda90, servant_upcall=0x7fffd4cdd3d0,
     servant=0x672150) at IFRService/IFR_BasicS.cpp:14111
-
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index 4cb54504f8b..ccf070a7291 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -19,7 +19,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
     {
-
       NContextExt_Client_i client;
 
       if (client.init (argc, argv) != 0)
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index d2ab16ff3a5..dcbbda028a5 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -22,11 +22,11 @@
 #include "ace/streams.h"
 
 // Constructor
-NContextExt_Client_i::NContextExt_Client_i (void)
+NContextExt_Client_i::NContextExt_Client_i ()
 {
 }
 
-NContextExt_Client_i::~NContextExt_Client_i (void)
+NContextExt_Client_i::~NContextExt_Client_i ()
 {
 }
 
@@ -34,9 +34,8 @@ NContextExt_Client_i::~NContextExt_Client_i (void)
 // Parses the command line arguments and returns an
 // error status
 int
-NContextExt_Client_i::parse_args (void)
+NContextExt_Client_i::parse_args ()
 {
-
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dvs"));
   int c;
 
@@ -71,7 +70,6 @@ NContextExt_Client_i::parse_args (void)
 char *
 NContextExt_Client_i::get_name ()
 {
-
   // USe time (NULL) to produce the seed:
   ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0)));
 
@@ -82,7 +80,6 @@ NContextExt_Client_i::get_name ()
 
   for (int i = 0; i < len; ++i)
     {
-
       int rand_value = ACE_OS::rand () % 10;
 
       switch (rand_value)
@@ -125,7 +122,7 @@ NContextExt_Client_i::get_name ()
         case 7:
         case 8:
         case 9:
-          *name_componentPtr = 'A' + ( ACE_OS::rand () % 26 );
+          *name_componentPtr = 'A' + ( ACE_OS::rand () % 26);
           ++name_componentPtr;
           break;
 
@@ -138,13 +135,11 @@ NContextExt_Client_i::get_name ()
   *name_componentPtr = '\0';
 
   return name_component;
-
 }
 
 int
-NContextExt_Client_i::run (void)
+NContextExt_Client_i::run ()
 {
-
   try
     {
       CosNaming::Name name;
@@ -291,7 +286,6 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
                                     CORBA::String_var obj_name,
                                     CORBA::String_var url_string)
 {
-
   ACE_DEBUG((LM_DEBUG, ACE_TEXT ("The first component id is %C,")
              ACE_TEXT ("The first component kind is %C,")
              ACE_TEXT ("The second component id is %C,")
@@ -321,5 +315,4 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
 
  ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %C\n"),
              url_string.in ()));
-
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index de86e533635..fa55980befd 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -13,7 +13,6 @@
 //=============================================================================
 
 
-
 #if !defined (NCONTEXTEXT_CLIENT_I_H)
 #define NCONTEXTEXT_CLIENT_I_H
 
@@ -27,22 +26,20 @@
  */
 class NContextExt_Client_i
 {
-
  public:
   // = COnstructor and destructor.
-  NContextExt_Client_i (void);
-  ~NContextExt_Client_i (void);
+  NContextExt_Client_i ();
+  ~NContextExt_Client_i ();
 
   /// Execute the client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR *argv[]);
 
  private:
-
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /**
    * Prints the values of the original name, strigified name and
@@ -58,7 +55,7 @@ class NContextExt_Client_i
                      CORBA::String_var url_string);
 
   /// Generates a random name
-  char * get_name (void);
+  char * get_name ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -71,7 +68,6 @@ class NContextExt_Client_i
 
   /// Flag to check if '-v' option is set.
   CORBA::Boolean view_;
-
 };
 
 #endif /* NCONTEXTEXT_CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index ec6d7aa3de6..51994b7550a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -13,13 +13,13 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -51,7 +50,7 @@ Basic::remove_member (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index 105a8bcc551..a374f5f1219 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -24,11 +24,11 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index b269b4cd18a..0c789aa539d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -29,23 +29,22 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 CosLoadBalancing::LoadManager_ptr
-LB_server::load_manager (void)
+LB_server::load_manager ()
 {
   return this->lm_.in ();
 }
@@ -94,7 +93,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -126,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)
     {
@@ -135,11 +133,10 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
@@ -178,7 +175,6 @@ LB_server::create_object_group (void)
     }
 
   return 1;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
index 74d2c03effc..d32275ff80b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
@@ -33,40 +33,37 @@ class Basic;
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the LoadManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
+  int create_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  CosLoadBalancing::LoadManager_ptr load_manager (void);
+  CosLoadBalancing::LoadManager_ptr load_manager ();
 
 private:
-
     int parse_args (int, ACE_TCHAR **);
 
 private:
-
   /// Load Manager
   CosLoadBalancing::LoadManager_var lm_;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
index e67c18073f3..107953609c2 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
@@ -1,5 +1,3 @@
-
-
 This program tests the application controlled membership support
 of the Cygnus load balancer. The aim is to allow the application
 to create the replicas and then forcefully add them as the members
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..51da18217a0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -25,7 +25,7 @@ Basic::Basic (CORBA::Object_ptr object_group,
 
 /// Default _non_existent: always returns false.
 CORBA::Boolean
-Basic::_non_existent (void)
+Basic::_non_existent ()
 {
   if (pong_delay > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T Basic::_non_existent server %d sleep %d seconds ... \n",
@@ -40,13 +40,13 @@ Basic::_non_existent (void)
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_.in ());
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -78,13 +77,13 @@ Basic::remove_member (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 void
-Basic::exit (void)
+Basic::exit ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Basic::exit  server %d exit \n",
                       this->server_id_));
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
index 0d239e82e8f..178eb26eb27 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
@@ -27,15 +27,15 @@ public:
          int server_id);
 
   /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (void);
+  virtual CORBA::Boolean _non_existent ();
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
-  virtual void exit (void);
+  virtual void exit ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index 86eb6d82c58..79c354dcaab 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
@@ -18,7 +18,7 @@ LB_server::LB_server (int& argc, ACE_TCHAR **& argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -36,23 +36,22 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::object_group (void)
+LB_server::object_group ()
 {
   return this->object_group_.in ();
 }
 
 CosLoadBalancing::LoadManager_ptr
-LB_server::load_manager (void)
+LB_server::load_manager ()
 {
   return this->lm_.in ();
 }
@@ -76,7 +75,7 @@ LB_server::write_ior_to_file (const char *ior)
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -108,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)
     {
@@ -117,11 +115,10 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
-LB_server::create_object_group (void)
+LB_server::create_object_group ()
 {
   try
     {
@@ -157,12 +154,11 @@ LB_server::create_object_group (void)
     }
 
   return 1;
-
 }
 
 
 int
-LB_server::get_object_group (void)
+LB_server::get_object_group ()
 {
   try
     {
@@ -176,7 +172,6 @@ LB_server::get_object_group (void)
     }
 
   return 1;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h
index fe62e9245c4..af53a1ad918 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h
@@ -32,37 +32,35 @@ class Basic;
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int& argc, ACE_TCHAR **& argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the LoadManager Interface.
   //int init (int& argc, ACE_TCHAR **& argv);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (void);
-  int get_object_group (void);
+  int create_object_group ();
+  int get_object_group ();
 
   /// register the servants with the object group.
   int register_servant (Basic *servant, const char *loc);
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr object_group (void);
+  CORBA::Object_ptr object_group ();
 
   /// for servants to get the reference for object_group.
-  CosLoadBalancing::LoadManager_ptr load_manager (void);
+  CosLoadBalancing::LoadManager_ptr load_manager ();
 
 private:
-
   /// Load Manager
   CosLoadBalancing::LoadManager_var lm_;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
index de52cba81eb..2da14281231 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
@@ -48,7 +48,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 
-
 int dead_member_rr_test (CORBA::ORB_ptr orb,
                          const ACE_TCHAR *group_ior,
                          Test::Basic_ptr direct_basic)
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/DeadMemberDetection_Inf_Ctrl/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
index d0191e7f336..3b24162f5dd 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
@@ -15,7 +15,6 @@ class Factory
   : public virtual POA_PortableGroup::GenericFactory
 {
 public:
-
   /// Constructor
   Factory (int id);
   /// creates a Test::Simple servant reference.
@@ -41,7 +40,6 @@ public:
   CORBA::Object_ptr get_object () const;
 
 private:
-
   /// The factory creation id.
   CORBA::ULong fcid_;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
index 0835d37f395..382eed19e12 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
@@ -19,10 +19,8 @@
 
 struct Factory_Node
 {
-
   /// FactoryCreationId assigned to the member.
   PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
-
 };
 
 typedef ACE_Array_Base<Factory_Node> Factory_Struct;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index cef4b099a21..97764011a8b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -21,13 +21,13 @@ LB_Factory_Server::LB_Factory_Server (int argc, ACE_TCHAR ** argv)
 }
 
 CORBA::ORB_ptr
-LB_Factory_Server::orb (void)
+LB_Factory_Server::orb ()
 {
   return this->orb_.in ();
 }
 
 int
-LB_Factory_Server::run (void)
+LB_Factory_Server::run ()
 {
   try
     {
@@ -44,12 +44,11 @@ LB_Factory_Server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
 int
-LB_Factory_Server::destroy (void)
+LB_Factory_Server::destroy ()
 {
   try
     {
@@ -66,7 +65,6 @@ LB_Factory_Server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -125,7 +123,7 @@ LB_Factory_Server::parse_args (int& argc, ACE_TCHAR **& argv)
 }
 
 int
-LB_Factory_Server::init (void)
+LB_Factory_Server::init ()
 {
   try
     {
@@ -195,6 +193,5 @@ LB_Factory_Server::init (void)
     }
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h
index 55fecad901d..c7219b39212 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h
@@ -28,33 +28,30 @@
 class LB_Factory_Server
 {
 public:
-
   /// Constructor
   LB_Factory_Server (int argc, ACE_TCHAR ** argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   int parse_args (int& argc, ACE_TCHAR **& argv);
 
   /// start the ORB.
-  int init (void);
+  int init ();
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
-
   /// Create the Object Group using the Load Manager Reference.
   int create_object_group (const char *loc_1, const char *loc_2, const char *loc_3);
 
   int write_ior_to_file (const char * ior, const char * ior_file);
 
 private:
-
   /// Load Manager
   CosLoadBalancing::LoadManager_var lm_;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 6febfc8546c..2f09a265b7d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -22,13 +22,13 @@ LB_server::LB_server (int argc, ACE_TCHAR ** argv)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 int
-LB_server::run (void)
+LB_server::run ()
 {
   try
     {
@@ -45,12 +45,11 @@ LB_server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -67,7 +66,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -125,7 +123,7 @@ LB_server::parse_args (int& argc, ACE_TCHAR **& argv)
 }
 
 int
-LB_server::init (void)
+LB_server::init ()
 {
   try
     {
@@ -169,7 +167,6 @@ LB_server::init (void)
     }
 
   return 1;
-
 }
 
 int
@@ -270,5 +267,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char
     }
 
   return 1;
-
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h
index bc0b5157865..90cf96be1d7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h
@@ -28,33 +28,30 @@
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR ** argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   int parse_args (int& argc, ACE_TCHAR **& argv);
 
   /// start the ORB.
-  int init (void);
+  int init ();
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
-
   /// Create the Object Group using the Load Manager Reference.
   int create_object_group (const char *loc_1, const char *loc_2, const char *loc_3);
 
   int write_ior_to_file (const char * ior, const char * ior_file);
 
 private:
-
   /// Load Manager
   CosLoadBalancing::LoadManager_var lm_;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index b5ce33978ac..b598ec18fe5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -14,7 +14,7 @@ Simple::Simple (int server_id)
 
 /// Default _non_existent: always returns false.
 CORBA::Boolean
-Simple::_non_existent (void)
+Simple::_non_existent ()
 {
   if (pong_delay > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T Simple::_non_existent server %d sleep %d seconds ... \n",
@@ -29,7 +29,7 @@ Simple::_non_existent (void)
 }
 
 char *
-Simple::get_string (void)
+Simple::get_string ()
 {
   switch (this->server_id_)
   {
@@ -49,7 +49,7 @@ Simple::get_string (void)
 }
 
 void
-Simple::exit (void)
+Simple::exit ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Simple::exit  server %d exit \n",
                       this->server_id_));
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
index 0e79be4b7c6..1af11ebbaaf 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
@@ -14,21 +14,18 @@ class Simple
   : public virtual POA_Test::Simple
 {
 public:
-
   Simple (int server_id);
   /// Constructor
 
   /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (void);
+  virtual CORBA::Boolean _non_existent ();
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void exit (void);
+  virtual void exit ();
 
 private:
-
   int server_id_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 8c7b5ca40c2..b7b1dbf445d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -3,7 +3,7 @@
 
 #include "TestC.h"
 
-Factory::Factory (void)
+Factory::Factory ()
 {
    this->fcid_ = 0;
 }
@@ -51,7 +51,6 @@ Factory::create_object (
   this->oid_ = this->poa_->servant_to_id (servant);
 
   return servant->_this ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 075283b4610..f02fb0a9ce8 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -15,9 +15,8 @@ class Factory
   : public virtual POA_PortableGroup::GenericFactory
 {
 public:
-
   /// Constructor
-  Factory (void);
+  Factory ();
   /// creates a Test::Simple servant reference.
   /// This reference is then passed as a FactoryInfos property
   /// when the LoadManager creates the object group.
@@ -52,7 +51,6 @@ private:
 
   /// Lock used to synchronize access to the factory creation id
   TAO_SYNCH_MUTEX lock_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
index 0835d37f395..382eed19e12 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
@@ -19,10 +19,8 @@
 
 struct Factory_Node
 {
-
   /// FactoryCreationId assigned to the member.
   PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
-
 };
 
 typedef ACE_Array_Base<Factory_Node> Factory_Struct;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 6150e701400..da30715eae6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -13,13 +13,13 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 int
-LB_server::run (void)
+LB_server::run ()
 {
   try
     {
@@ -35,12 +35,11 @@ LB_server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -57,7 +56,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -105,7 +103,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
 
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -137,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)
     {
@@ -146,7 +143,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -232,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)
     {
@@ -242,5 +237,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
     }
 
   return 1;
-
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
index 42039b742b7..adc888a32b7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
@@ -30,32 +30,29 @@
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Create the Object Group using the Load Manager Reference.
   int create_object_group (const char *loc_1, const char *loc_2);
 
   /// Run the ORB.
-  int run (void);
+  int run ();
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
 private:
-
   int write_ior_to_file (const char *);
   int parse_args (int, ACE_TCHAR **);
 
 private:
-
   /// Load Manager
   CosLoadBalancing::LoadManager_var lm_;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
index a7bf7d017f6..679b3d67b4b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
@@ -1,5 +1,3 @@
-
-
 This program tests the infrastructure controlled membership support
 of the Cygnus Load Balancer. The aim is to allow Cygnus to set the
 factories needed to create the "replicas", when the object group
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index 50d02c2d857..a6d08240431 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -1,11 +1,11 @@
 #include "Simple.h"
 
-Simple::Simple (void)
+Simple::Simple ()
 {
 }
 
 char *
-Simple::get_string (void)
+Simple::get_string ()
 {
   return CORBA::string_dup ("TAO Load Balancing Works!");
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index 129c11dc3c1..764af2787b1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -13,12 +13,10 @@ class Simple
   : public virtual POA_Test::Simple
 {
 public:
-
-  Simple (void);
+  Simple ();
   /// Constructor
 
-  virtual char * get_string (void);
-
+  virtual char * get_string ();
 };
 
 #if defined(_MSC_VER)
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..b6694a46317 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -15,19 +15,19 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 CORBA::Short
-Basic::number (void)
+Basic::number ()
 {
   return this->number_;
 }
 
 char *
-Basic::get_string (void)
+Basic::get_string ()
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Basic::remove_member (void)
+Basic::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -59,7 +58,7 @@ Basic::remove_member (void)
 }
 
 void
-Basic::shutdown (void)
+Basic::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index 361c5a9e9c3..84035597727 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -23,13 +23,13 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index ea93044934d..3e3ec866d9f 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
@@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv)
 }
 
 int
-LB_server::destroy (void)
+LB_server::destroy ()
 {
   try
     {
@@ -31,35 +31,34 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
-LB_server::orb (void)
+LB_server::orb ()
 {
   return this->orb_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::get_basic_object_group (void)
+LB_server::get_basic_object_group ()
 {
   return this->basic_object_group_.in ();
 }
 
 CORBA::Object_ptr
-LB_server::get_simple_object_group (void)
+LB_server::get_simple_object_group ()
 {
   return this->simple_object_group_.in ();
 }
 
 CosLoadBalancing::LoadManager_ptr
-LB_server::load_manager (void)
+LB_server::load_manager ()
 {
   return this->lm_.in ();
 }
 
 int
-LB_server::start_orb_and_poa (void)
+LB_server::start_orb_and_poa ()
 {
   try
     {
@@ -91,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)
     {
@@ -100,11 +98,10 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
-LB_server::create_basic_object_group (void)
+LB_server::create_basic_object_group ()
 {
   try
     {
@@ -129,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)
     {
@@ -139,11 +135,10 @@ LB_server::create_basic_object_group (void)
     }
 
   return 1;
-
 }
 
 int
-LB_server::create_simple_object_group (void)
+LB_server::create_simple_object_group ()
 {
   try
     {
@@ -168,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)
     {
@@ -178,11 +172,10 @@ LB_server::create_simple_object_group (void)
     }
 
   return 1;
-
 }
 
 int
-LB_server::remove_basic_member (void)
+LB_server::remove_basic_member ()
 {
   try
     {
@@ -208,7 +201,7 @@ LB_server::remove_basic_member (void)
 }
 
 int
-LB_server::remove_simple_member (void)
+LB_server::remove_simple_member ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
index eb3021df306..3d1b6ff8831 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
@@ -33,30 +33,29 @@ class Simple;
 class LB_server
 {
 public:
-
   /// Constructor
   LB_server (int argc, ACE_TCHAR **argv);
 
   /// destroys LoadManager, ORB and POA.
-  int destroy (void);
+  int destroy ();
 
   /// start the ORB.
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// Get the LoadManager Interface.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Create the basic Object Group using the Load Manager Reference.
-  int create_basic_object_group (void);
+  int create_basic_object_group ();
 
   /// Create the simple Object Group using the Load Manager Reference.
-  int create_simple_object_group (void);
+  int create_simple_object_group ();
 
   /// remove the basic member from the object group
-  int remove_basic_member (void);
+  int remove_basic_member ();
 
   /// remove the simple member from the object group
-  int remove_simple_member (void);
+  int remove_simple_member ();
 
   /// register the basic servants with the object group.
   int register_basic_servant (Basic *servant, const char *loc);
@@ -65,19 +64,18 @@ public:
   int register_simple_servant (Simple *servant, const char *loc);
 
   /// for servants to register to the initialised ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr get_basic_object_group (void);
+  CORBA::Object_ptr get_basic_object_group ();
 
   /// for servants to get the reference for object_group.
-  CORBA::Object_ptr get_simple_object_group (void);
+  CORBA::Object_ptr get_simple_object_group ();
 
   /// for servants to get the reference for object_group.
-  CosLoadBalancing::LoadManager_ptr load_manager (void);
+  CosLoadBalancing::LoadManager_ptr load_manager ();
 
 private:
-
   /// Load Manager
   CosLoadBalancing::LoadManager_var lm_;
 
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..5b769625289 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -15,19 +15,19 @@ Simple::Simple (CORBA::Object_ptr object_group,
 }
 
 CORBA::Short
-Simple::number (void)
+Simple::number ()
 {
   return this->number_;
 }
 
 char *
-Simple::get_string (void)
+Simple::get_string ()
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Simple::remove_member (void)
+Simple::remove_member ()
 {
   try
     {
@@ -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)
     {
@@ -59,7 +58,7 @@ Simple::remove_member (void)
 }
 
 void
-Simple::shutdown (void)
+Simple::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index 42a1e609843..e993d5aaf49 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -25,13 +25,13 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void remove_member (void);
+  virtual void remove_member ();
 
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
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 e86fd5b0413..b06fc0584e2 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
@@ -11,12 +11,12 @@
 const char* BasicLog_Test::basic_log_factory_name_= "BasicLogFactory";
 const char* BasicLog_Test::naming_service_name_ = "NameService";
 
-BasicLog_Test::BasicLog_Test(void)
+BasicLog_Test::BasicLog_Test()
   : argc_ (0), argv_(0), logServiceIor_ (0)
 {
 }
 
-BasicLog_Test::~BasicLog_Test (void)
+BasicLog_Test::~BasicLog_Test ()
 {
   this->destroy_log ();
 }
@@ -55,13 +55,11 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[])
     }
 
   ACE_RETURN(0);
-
 }
 
 int
-BasicLog_Test::init_factory (void)
+BasicLog_Test::init_factory ()
 {
-
   // Assumpting INS for finding LogServie
 
   //CORBA::Object_var logging_obj = orb_->resolve_initial_references ("BasicLogFactory",
@@ -114,7 +112,6 @@ BasicLog_Test::init_factory (void)
 int
 BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
 {
-
   try
     {
       DsLogAdmin::LogId id;
@@ -249,7 +246,6 @@ int BasicLog_Test::display_records ()
                rec_list[j].id, rec_list[j].time));
 
   return 0;
-
 }
 */
 int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
@@ -303,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);
-
       }
   }
 
@@ -321,14 +316,12 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
 int
 BasicLog_Test::test_adminState()
 {
-
   basicLog_->set_administrative_state(DsLogAdmin::locked);
   try
     {
       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&)
     {
@@ -347,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&)
     {
@@ -358,9 +350,8 @@ BasicLog_Test::test_adminState()
 
 
 int
-BasicLog_Test::test_logSize (void)
+BasicLog_Test::test_logSize ()
 {
-
   try
     {
       basicLog_->set_max_size (1);
@@ -403,7 +394,6 @@ BasicLog_Test::test_logSize (void)
 int
 BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy)
 {
-
   CORBA::ULongLong old_n_records = basicLog_->get_n_records ();
   if (old_n_records <= 0)
     {
@@ -450,7 +440,7 @@ BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy)
       ACE_ERROR_RETURN((LM_ERROR,
                         "Log compaction failed, because %d records remain.\n",
                         ACE_U64_TO_U32 (new_n_records)),
-                       -1 );
+                       -1);
     }
 
   return 0;
@@ -472,7 +462,6 @@ BasicLog_Test::test_retrieval (CORBA::ULong /* numberOfRecordsToWrite */)
 }
 
 
-
 int
 BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite)
 {
@@ -510,7 +499,7 @@ BasicLog_Test::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-BasicLog_Test::resolve_naming_service (void)
+BasicLog_Test::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (naming_service_name_);
@@ -524,7 +513,7 @@ BasicLog_Test::resolve_naming_service (void)
 }
 
 void
-BasicLog_Test::resolve_basic_factory (void)
+BasicLog_Test::resolve_basic_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -556,9 +545,8 @@ BasicLog_Test::destroy_log()
 }
 
 int
-BasicLog_Test::test_log_destroy (void)
+BasicLog_Test::test_log_destroy ()
 {
-
   ACE_DEBUG ((LM_ERROR, "Testing destroy log\n"));
   this->basicLog_->destroy ();
 
@@ -588,7 +576,7 @@ BasicLog_Test::test_log_destroy (void)
 }
 
 int
-BasicLog_Test::test_week_mask (void)
+BasicLog_Test::test_week_mask ()
 {
   DsLogAdmin::WeekMask masks;
   masks.length (1);
@@ -649,9 +637,8 @@ return 0;
 }
 
 int
-BasicLog_Test::test_capacity_alarm_threshold (void)
+BasicLog_Test::test_capacity_alarm_threshold ()
 {
-
   //basicLog_->set_log_full_action(DsLogAdmin::halt);
 
   DsLogAdmin::CapacityAlarmThresholdList list;
@@ -712,5 +699,4 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
   this->write_records (0);
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index fc2db452560..3a3075b2b7b 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -24,15 +24,13 @@ class BasicLog_Test
    //  This class exercises various methods of the DsLogAdmin::BasicLog
    //  interface.
  public:
-
-
   enum
   { MAX_LOG_SIZE = 8192 };
 
-  BasicLog_Test(void);
+  BasicLog_Test();
   // constructor
 
-  ~BasicLog_Test(void);
+  ~BasicLog_Test();
   // destructor
 
   int init(int argc, ACE_TCHAR *argv[]);
@@ -87,7 +85,7 @@ delete_records (CORBA::ULongLong numberOfRecords);
   // 4. retrieve the records backwards. Compare to records writen.
   // 5. repeat 3 and 4 using iterator.
 
-  int test_query(CORBA::ULong numberOfRecords  = 1000 );
+  int test_query(CORBA::ULong numberOfRecords  = 1000);
   // 1. write the records with NVList.
   // 2. query the records and compare the records
 
@@ -107,7 +105,7 @@ private:
   BasicLog_Test& operator=(const BasicLog_Test&);
 
   int
-    init_factory (void);
+    init_factory ();
 
   int
     parse_args(int argc, ACE_TCHAR *argv[]);
@@ -117,11 +115,11 @@ private:
   // writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite.
 
   void
-    resolve_basic_factory (void);
+    resolve_basic_factory ();
   // resolve log factory
 
   void
-    resolve_naming_service (void);
+    resolve_naming_service ();
   // resolve nameing service
 
   void
@@ -150,7 +148,6 @@ private:
 
   static const char* naming_service_name_;
   // strings for log factory and naming service
-
 };
 
 #endif  /* TAO_BASIC_LOG_TEST_H */
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
index 85d1014ec3e..bdccf156346 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
@@ -12,7 +12,7 @@ UIPMC_Object_Impl::UIPMC_Object_Impl (CORBA::ULong payload,
 {
 }
 
-UIPMC_Object_Impl::~UIPMC_Object_Impl (void)
+UIPMC_Object_Impl::~UIPMC_Object_Impl ()
 {
   if (this->received_.current_size () == 0)
     {
@@ -100,13 +100,13 @@ Hello_Impl::Hello_Impl (CORBA::ORB_ptr orb,
 }
 
 Test::UIPMC_Object_ptr
-Hello_Impl::get_object (void)
+Hello_Impl::get_object ()
 {
   return Test::UIPMC_Object::_duplicate (this->obj_.in ());
 }
 
 void
-Hello_Impl::shutdown (void)
+Hello_Impl::shutdown ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
index 68dc7ab118a..89d2eebfb04 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
@@ -13,7 +13,7 @@ class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object
 public:
   UIPMC_Object_Impl (CORBA::ULong payload, CORBA::ULong clients, CORBA::ULong calls);
 
-  ~UIPMC_Object_Impl (void);
+  ~UIPMC_Object_Impl ();
 
   // The skeleton methods
   virtual void process (Test::Octets const &payload);
@@ -39,9 +39,9 @@ public:
   Hello_Impl (CORBA::ORB_ptr orb, Test::UIPMC_Object_ptr obj);
 
   // The skeleton methods
-  virtual Test::UIPMC_Object_ptr get_object (void);
+  virtual Test::UIPMC_Object_ptr get_object ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
index 4a97333f149..d7f46225d09 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
@@ -94,7 +94,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
index 49cfc29a1ef..513604224ca 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
@@ -71,7 +71,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 8d15f0c9314..4a5f894ec02 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -48,7 +48,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 }
 
 void
-McastHello::shutdown (void)
+McastHello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index 45c93518e93..e16c30e1430 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
index 5c49bf752c7..3d39cb5e541 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
@@ -1,7 +1,6 @@
 #include "McastHello.h"
 
 
-
 McastHello::McastHello (CORBA::ORB_ptr orb,
                         int instance)
   : orb_ (CORBA::ORB::_duplicate (orb)),
@@ -50,7 +49,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 }
 
 void
-McastHello::shutdown (void)
+McastHello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
index 45c93518e93..e16c30e1430 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
index 64678a3a6e4..82ce5ecd2aa 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
@@ -4,7 +4,6 @@
 #include "orbsvcs/PortableGroup/MIOP.h"
 
 
-
 #define MAX_MIOP_OCTET_SEQUENCE  (ACE_MAX_DGRAM_SIZE - 272 /* MIOP_MAX_HEADER_SIZE */)
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
index d1a4c81904f..d59755cc7ce 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
@@ -1,7 +1,6 @@
 #include "Test_impl.h"
 
 
-
 Server_impl::Server_impl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
index 34e9ae8b7a4..ff97ec813f6 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
@@ -3,7 +3,6 @@
 #include "TestC.h"
 
 
-
 const ACE_TCHAR *ior_server = 0;
 
 int
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
index db1b3a6a5ea..4eb878ed19e 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
@@ -4,7 +4,6 @@
 #include "orbsvcs/PortableGroup/GOA.h"
 
 
-
 const ACE_TCHAR *uipmc_url = 0;
 const ACE_TCHAR *ior_output_file = 0;
 
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
index a32eb6127e1..fd6cac0709f 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
@@ -1,7 +1,6 @@
 #include "McastHello.h"
 
 
-
 McastHello::McastHello (CORBA::ORB_ptr orb,
                         int instance)
   : orb_ (CORBA::ORB::_duplicate (orb)),
@@ -50,7 +49,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload)
 }
 
 void
-McastHello::shutdown (void)
+McastHello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
index 45c93518e93..e16c30e1430 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
@@ -17,7 +17,7 @@ public:
   // = The skeleton methods
   virtual void send_forty_two (CORBA::Long forty_two);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index a57ff18c887..e7126e43696 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -6,7 +6,7 @@
 
 /***************************************************************************/
 
-AdminProperties_Task::AdminProperties_Task (void)
+AdminProperties_Task::AdminProperties_Task ()
   : supplier_ (0)
   , client_ (0)
 {
@@ -26,7 +26,7 @@ AdminProperties_Task::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-AdminProperties_Task::svc (void)
+AdminProperties_Task::svc ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -120,7 +120,7 @@ AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotifica
 
 /***************************************************************************/
 
-AdminProperties::AdminProperties (void)
+AdminProperties::AdminProperties ()
   : max_queue_length_ (10),
     max_consumers_ (3),
     max_suppliers_ (3),
@@ -134,7 +134,7 @@ AdminProperties::AdminProperties (void)
 {
 }
 
-AdminProperties::~AdminProperties (void)
+AdminProperties::~AdminProperties ()
 {
 }
 
@@ -255,7 +255,7 @@ AdminProperties::create_channel(bool reject)
 }
 
 void
-AdminProperties::run_test (void)
+AdminProperties::run_test ()
 {
   bool reject = true;
   this->create_channel(reject);
@@ -343,7 +343,7 @@ AdminProperties::test_max_queue_length (bool reject)
 }
 
 void
-AdminProperties::test_max_clients (void)
+AdminProperties::test_max_clients ()
 {
   this->create_suppliers ();
 
@@ -360,7 +360,7 @@ AdminProperties::test_max_clients (void)
 }
 
 void
-AdminProperties::create_suppliers (void)
+AdminProperties::create_suppliers ()
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -396,7 +396,7 @@ AdminProperties::create_suppliers (void)
 }
 
 void
-AdminProperties::create_consumers (void)
+AdminProperties::create_consumers ()
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 3914607b1bf..38901d4fdc1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -28,8 +28,7 @@ public:
   AdminProperties_StructuredPushConsumer (AdminProperties* client);
 
   // = StructuredPushSupplier methods
-  virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      );
+  virtual void push_structured_event (const CosNotification::StructuredEvent & notification);
 
 protected:
   AdminProperties* client_;
@@ -47,10 +46,9 @@ protected:
  */
 class AdminProperties_Task : public ACE_Task_Base
 {
-
 public:
   /// Constructor.
-  AdminProperties_Task (void);
+  AdminProperties_Task ();
 
   /// Init this object.
   void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client);
@@ -83,28 +81,27 @@ private:
  */
 class AdminProperties : public Notify_Test_Client
 {
-
   friend class AdminProperties_StructuredPushConsumer;
   friend class AdminProperties_Task;
 
 public:
-  AdminProperties (void);
-  ~AdminProperties (void);
+  AdminProperties ();
+  ~AdminProperties ();
 
   int parse_args (int argc, ACE_TCHAR *argv[]) ;
 
   // Initialization.
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
 private:
-  void create_suppliers (void);
-  void create_consumers (void);
+  void create_suppliers ();
+  void create_consumers ();
   void create_channel(bool reject);
 
   /// Test MaxSuppliers and MaxConsumers
-  void test_max_clients (void);
+  void test_max_clients ();
 
   /// Test MaxQueueLength properties
   void test_max_queue_length (bool reject);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 56a3172182b..84eb7728060 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -4,7 +4,6 @@
 #include "ConnectDisconnect.h"
 
 
-
 #define CD_IMPLEMENT_ENTITY(X)\
 \
 CD_##X::CD_##X (ConnectDisconnect* cd, int id) \
@@ -38,7 +37,7 @@ CD_IMPLEMENT_ENTITY(SequencePushSupplier)
 
 //*****************************************************************************************************
 
-ConnectDisconnect::ConnectDisconnect (void)
+ConnectDisconnect::ConnectDisconnect ()
   :any_consumer_ (0),
    structured_consumer_ (0),
    sequence_consumer_ (0),
@@ -63,7 +62,7 @@ ConnectDisconnect::~ConnectDisconnect ()
 }
 
 void
-ConnectDisconnect::on_entity_destroyed (void)
+ConnectDisconnect::on_entity_destroyed ()
 {
   this->result_count_++;
 
@@ -125,7 +124,7 @@ ConnectDisconnect::init (int argc,
                   TAO_Notify_Tests_SequencePushSupplier*[this->suppliers_],
                   -1);
 
-  consumer_start( 0 );
+  consumer_start(0);
   return 0;
 }
 
@@ -178,7 +177,7 @@ ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[])
 }
 
 void
-ConnectDisconnect::create_EC (void)
+ConnectDisconnect::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -190,7 +189,7 @@ ConnectDisconnect::create_EC (void)
 }
 
 void
-ConnectDisconnect::run_test (void)
+ConnectDisconnect::run_test ()
 {
   for (int iterations = 0; iterations < count_; ++iterations)
     {
@@ -249,12 +248,10 @@ ConnectDisconnect::run_test (void)
           this->any_consumer_[i]->disconnect ();
 
           // Disconnect Structured Consumers.
-          this->structured_consumer_[i]->disconnect (
-                                           );
+          this->structured_consumer_[i]->disconnect ();
 
           // Disconnect Sequence Consumers.
-          this->sequence_consumer_[i]->disconnect (
-                                     );
+          this->sequence_consumer_[i]->disconnect ();
         }
 
       for (i = 0; i < this->suppliers_; ++i)
@@ -263,24 +260,22 @@ ConnectDisconnect::run_test (void)
           this->any_supplier_[i]->disconnect ();
 
           // Disconnect Structured Suppliers.
-          this->structured_supplier_[i]->disconnect (
-                                           );
+          this->structured_supplier_[i]->disconnect ();
 
           // Disconnect Sequence Suppliers.
-          this->sequence_supplier_[i]->disconnect (
-                                         );
+          this->sequence_supplier_[i]->disconnect ();
         }
     }
 }
 
 void
-ConnectDisconnect::end_test (void)
+ConnectDisconnect::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
-ConnectDisconnect::check_results (void)
+ConnectDisconnect::check_results ()
 {
   ACE_DEBUG ((LM_DEBUG, "result_count_ = %d", this->result_count_.value ()));
   ACE_DEBUG ((LM_DEBUG, " expected_count_ = %d\n", this->expected_count_));
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index e06d200aac4..a681455b6ff 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -63,11 +63,11 @@ class ConnectDisconnect : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  ConnectDisconnect (void);
+  ConnectDisconnect ();
   virtual ~ConnectDisconnect ();
 
   /// Keeps track of how many objects were destroyed.
-  void on_entity_destroyed (void);
+  void on_entity_destroyed ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
@@ -77,17 +77,17 @@ public:
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// Check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 6dfcd5110ac..faffb62ee90 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -4,7 +4,6 @@
 #include "Events.h"
 
 
-
 /***************************************************************************/
 
 Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events *test_client)
@@ -37,17 +36,17 @@ Event_StructuredPushSupplier::Event_StructuredPushSupplier (
 {
 }
 
-Event_StructuredPushSupplier::~Event_StructuredPushSupplier (void)
+Event_StructuredPushSupplier::~Event_StructuredPushSupplier ()
 {
 }
 
 /***************************************************************************/
-Events::Events (void)
+Events::Events ()
   : use_default_admin_ (0), event_count_ (5)
 {
 }
 
-Events::~Events (void)
+Events::~Events ()
 {
 }
 
@@ -112,7 +111,7 @@ Events::init (int argc,
 
   this->supplier_->connect (this->supplier_admin_.in ());
 
-  consumer_start( 0 );
+  consumer_start(0);
 
   return 0;
 }
@@ -131,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"))))
         {
@@ -161,7 +159,7 @@ Events::parse_args (int argc,
 }
 
 void
-Events::create_EC (void)
+Events::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -192,7 +190,7 @@ Events::create_EC (void)
 }
 
 void
-Events::on_event_received (void)
+Events::on_event_received ()
 {
   ++this->result_count_;
 
@@ -208,7 +206,7 @@ Events::on_event_received (void)
 }
 
 void
-Events::run_test (void)
+Events::run_test ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -259,13 +257,13 @@ Events::run_test (void)
 }
 
 void
-Events::end_test (void)
+Events::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
-Events::check_results (void)
+Events::check_results ()
 {
   // Destroy the channel.
   this->ec_->destroy ();
@@ -303,7 +301,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       events.run_test ();
 
-      events.ORB_run( );
+      events.ORB_run();
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index 3710f290e09..49ae0f05c33 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -33,8 +33,7 @@ public:
 
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
-      const CosNotification::StructuredEvent & notification
-    );
+      const CosNotification::StructuredEvent & notification);
 
 protected:
   Events * test_client_;
@@ -49,7 +48,7 @@ public:
   Event_StructuredPushSupplier (Events * test_client);
 
   /// Destructor.
-  virtual ~Event_StructuredPushSupplier (void);
+  virtual ~Event_StructuredPushSupplier ();
 
 protected:
   Events* test_client_;
@@ -61,8 +60,8 @@ class Events : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  Events (void);
-  virtual ~Events (void);
+  Events ();
+  virtual ~Events ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
@@ -72,20 +71,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Called when an event is received.
-  void on_event_received (void);
+  void on_event_received ();
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
index 13953088e6a..172062a51ee 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
@@ -5,13 +5,12 @@
 #include "orbsvcs/CosNotifyFilterExtC.h"
 
 
-
-ExtendedFilter::ExtendedFilter (void)
+ExtendedFilter::ExtendedFilter ()
   : event_count_ (5)
 {
 }
 
-ExtendedFilter::~ExtendedFilter (void)
+ExtendedFilter::~ExtendedFilter ()
 {
 }
 
@@ -46,7 +45,7 @@ ExtendedFilter::init (int argc, ACE_TCHAR* argv [])
 }
 
 void
-ExtendedFilter::run_test (void)
+ExtendedFilter::run_test ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
@@ -105,7 +104,7 @@ ExtendedFilter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
   CosNotifyFilter::FilterID id_dup = extffact->get_filterid (filter.in());
   ACE_ASSERT (id_dup == id_1);
 #if defined (ACE_NDEBUG)
-  ACE_UNUSED_ARG (id_dup );
+  ACE_UNUSED_ARG (id_dup);
 #endif
 
   if (TAO_debug_level)
@@ -114,13 +113,13 @@ ExtendedFilter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
   bool id_lookup_failed = false;
   try {
     CosNotifyFilter::FilterID id_ne = extffact2->get_filterid (filter.in());
-    ACE_UNUSED_ARG (id_ne );
+    ACE_UNUSED_ARG (id_ne);
   } catch (const CORBA::INTERNAL& ) {
     id_lookup_failed = true;
     }
-  ACE_ASSERT (id_lookup_failed );
+  ACE_ASSERT (id_lookup_failed);
 #if defined (ACE_NDEBUG)
-  ACE_UNUSED_ARG (id_lookup_failed );
+  ACE_UNUSED_ARG (id_lookup_failed);
 #endif
 
   if (TAO_debug_level)
@@ -217,7 +216,7 @@ ExtendedFilter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 
 
 void
-ExtendedFilter::create_EC (void)
+ExtendedFilter::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id, id2;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h
index 05339ce6467..52551e9aa90 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h
@@ -27,19 +27,19 @@ class ExtendedFilter : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  ExtendedFilter (void);
-  virtual ~ExtendedFilter (void);
+  ExtendedFilter ();
+  virtual ~ExtendedFilter ();
 
   /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Run some tests to check the filters.
   void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 6014d6c7aaf..4b5bc4bcdb2 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -4,13 +4,12 @@
 #include "Filter.h"
 
 
-
-Filter::Filter (void)
+Filter::Filter ()
   : event_count_ (5)
 {
 }
 
-Filter::~Filter (void)
+Filter::~Filter ()
 {
 }
 
@@ -45,7 +44,7 @@ Filter::init (int argc, ACE_TCHAR* argv [])
 }
 
 void
-Filter::run_test (void)
+Filter::run_test ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
@@ -171,7 +170,7 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 
 
 void
-Filter::create_EC (void)
+Filter::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 2948da0f785..64cf8ba3e83 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -28,19 +28,19 @@ class Filter : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Filter (void);
-  virtual ~Filter (void);
+  Filter ();
+  virtual ~Filter ();
 
   /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Run some tests to check the filters.
   void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 26893522ce8..f4185a34d3a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "IdAssignment.h"
 
-IdAssignment::IdAssignment (void)
+IdAssignment::IdAssignment ()
   : iter_ (3),
     ec_count_ (3),
     consumer_admin_count_ (3),
@@ -13,7 +13,7 @@ IdAssignment::IdAssignment (void)
 {
 }
 
-IdAssignment::~IdAssignment (void)
+IdAssignment::~IdAssignment ()
 {
 }
 
@@ -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 ());
@@ -105,14 +104,11 @@ IdAssignment::init (int argc,
     }
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-        obj.in()
-      );
-
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
 }
 
 CosNotifyChannelAdmin::ChannelID
-IdAssignment::create_ec (void)
+IdAssignment::create_ec ()
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -366,7 +362,7 @@ IdAssignment::destroy_supplier_admin (
 }
 
 void
-IdAssignment::run_test(void)
+IdAssignment::run_test()
 {
   CosNotifyChannelAdmin::ChannelID* ec_id = 0;
   ACE_NEW (ec_id,
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 329d4d2388c..19b8e23ac7a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -18,25 +18,23 @@
 class IdAssignment
 {
 public:
-  IdAssignment (void);
-  ~IdAssignment (void);
+  IdAssignment ();
+  ~IdAssignment ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
   void init (int argc,
              ACE_TCHAR *argv[]);
-  void run_test (void);
+  void run_test ();
 
 private:
-  CosNotifyChannelAdmin::ChannelID create_ec (void);
+  CosNotifyChannelAdmin::ChannelID create_ec ();
   void destroy_ec (CosNotifyChannelAdmin::ChannelID id);
 
   CosNotifyChannelAdmin::AdminID create_supplier_admin (
-      CosNotifyChannelAdmin::ChannelID channel_id
-    );
+      CosNotifyChannelAdmin::ChannelID channel_id);
   CosNotifyChannelAdmin::AdminID create_consumer_admin (
-      CosNotifyChannelAdmin::ChannelID channel_id
-    );
+      CosNotifyChannelAdmin::ChannelID channel_id);
 
   void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
                                CosNotifyChannelAdmin::AdminID admin_id);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 246a7d81f20..fff98c3ee41 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -7,12 +7,12 @@
 
 #include "LifeCycle.h"
 
-LifeCycle::LifeCycle (void)
+LifeCycle::LifeCycle ()
   : count_ (10)
 {
 }
 
-LifeCycle::~LifeCycle (void)
+LifeCycle::~LifeCycle ()
 {
 }
 
@@ -79,9 +79,7 @@ LifeCycle::init (int argc, ACE_TCHAR *argv[])
   CORBA::Object_var obj = rootNC->resolve (name);
 
   notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-        obj.in()
-      );
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
 
   if (CORBA::is_nil (notify_factory_.in ()))
     {
@@ -93,7 +91,7 @@ LifeCycle::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-LifeCycle::run_test(void)
+LifeCycle::run_test()
 {
   for (int i = 0; i < this->count_; ++i)
     {
@@ -112,7 +110,7 @@ LifeCycle::run_test(void)
 }
 
 void
-LifeCycle::create_ec (void)
+LifeCycle::create_ec ()
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -134,7 +132,7 @@ LifeCycle::create_ec (void)
 }
 
 void
-LifeCycle::create_supplier_admin (void)
+LifeCycle::create_supplier_admin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
@@ -156,7 +154,7 @@ LifeCycle::create_supplier_admin (void)
 }
 
 void
-LifeCycle::create_consumer_admin (void)
+LifeCycle::create_consumer_admin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
@@ -177,7 +175,7 @@ LifeCycle::create_consumer_admin (void)
 }
 
 void
-LifeCycle::destroy_supplier_admin (void)
+LifeCycle::destroy_supplier_admin ()
 {
   this->supplier_admin_->destroy ();
 
@@ -187,7 +185,7 @@ LifeCycle::destroy_supplier_admin (void)
 }
 
 void
-LifeCycle::destroy_consumer_admin (void)
+LifeCycle::destroy_consumer_admin ()
 {
   this->consumer_admin_->destroy ();
 
@@ -197,7 +195,7 @@ LifeCycle::destroy_consumer_admin (void)
 }
 
 void
-LifeCycle::destroy_ec (void)
+LifeCycle::destroy_ec ()
 {
   this->ec_->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
index 6f036393c1f..1b3e1272dc4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -16,22 +16,22 @@
 class LifeCycle
 {
 public:
-  LifeCycle (void);
-  ~LifeCycle (void);
+  LifeCycle ();
+  ~LifeCycle ();
 
   void init (int argc,
              ACE_TCHAR *argv[]);
-  void run_test (void);
+  void run_test ();
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
 private:
-   void create_ec (void);
-   void create_supplier_admin (void);
-   void create_consumer_admin (void);
-   void destroy_ec (void);
-   void destroy_supplier_admin (void);
-   void destroy_consumer_admin (void);
+   void create_ec ();
+   void create_supplier_admin ();
+   void create_consumer_admin ();
+   void destroy_ec ();
+   void destroy_supplier_admin ();
+   void destroy_consumer_admin ();
 
    CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
    CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index e65237bdb92..d7973434414 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -4,7 +4,6 @@
 #include "MultiTypes.h"
 
 
-
 //*****************************************************************************************************
 
 MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client)
@@ -51,7 +50,7 @@ MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::
 
 /***************************************************************************/
 
-MultiTypes::MultiTypes (void)
+MultiTypes::MultiTypes ()
   :any_consumer_ (0),
    structured_consumer_ (0),
    sequence_consumer_ (0),
@@ -63,7 +62,6 @@ MultiTypes::MultiTypes (void)
    seq_event_count_ (0),
    disconnect_on_last_event_ (0)
 {
-
 }
 
 MultiTypes::~MultiTypes ()
@@ -186,7 +184,7 @@ MultiTypes::init (int argc,
 
   sequence_supplier_->connect (this->supplier_admin_.in ());
 
-  consumer_start( 0 );
+  consumer_start(0);
 
   return 0;
 }
@@ -199,7 +197,7 @@ MultiTypes::parse_args(int, ACE_TCHAR **)
 }
 
 void
-MultiTypes::create_EC (void)
+MultiTypes::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -211,7 +209,7 @@ MultiTypes::create_EC (void)
 }
 
 void
-MultiTypes::run_test (void)
+MultiTypes::run_test ()
 {
   // Send an Any, all consumers should receive it.
   CORBA::Any any;
@@ -311,13 +309,13 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer)
 }
 
 void
-MultiTypes::end_test (void)
+MultiTypes::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
-MultiTypes::check_results (void)
+MultiTypes::check_results ()
 {
   // Destroy the channel.
   this->ec_->destroy ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 2ab66ed4b94..1deb3c1001c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -35,9 +35,7 @@ class MultiTypes_PushConsumer : public TAO_Notify_Tests_PushConsumer
 public:
   MultiTypes_PushConsumer (MultiTypes* client);
 
-  void push (
-             const CORBA::Any & data
-             );
+  void push (const CORBA::Any & data);
 
 protected:
   MultiTypes* client_;
@@ -51,8 +49,7 @@ public:
   MultiTypes_StructuredPushConsumer (MultiTypes* client);
 
   // = StructuredPushSupplier methods
-  virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      );
+  virtual void push_structured_event (const CosNotification::StructuredEvent & notification);
 
 protected:
   MultiTypes* client_;
@@ -65,8 +62,7 @@ public:
 
   // = SequencePushConsumer methods
   virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
 protected:
   MultiTypes* client_;
@@ -79,7 +75,7 @@ class MultiTypes : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  MultiTypes (void);
+  MultiTypes ();
   virtual ~MultiTypes ();
 
   void on_received_event (MultiTypes_PushConsumer* consumer);
@@ -94,20 +90,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// Check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   // Wait to receive events.
   void wait_for_all_consumers (int expected_count_per_consumer);
 
   /// Create EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index f61f6e17edd..3a12f9a84ff 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -5,7 +5,6 @@
 #include "Sequence.h"
 
 
-
 /***************************************************************************/
 
 SequencePushConsumer::SequencePushConsumer (Sequence *test_client)
@@ -37,19 +36,19 @@ SequencePushSupplier::SequencePushSupplier (
 {
 }
 
-SequencePushSupplier::~SequencePushSupplier (void)
+SequencePushSupplier::~SequencePushSupplier ()
 {
 }
 
 /***************************************************************************/
-Sequence::Sequence (void)
+Sequence::Sequence ()
   : event_count_ (15), supplier_batch_size_ (5), consumer_batch_size_ (3),
     pacing_ (2), order_policy_ (CosNotification::PriorityOrder), events_received_ (0),
     consumer_delay_ (1)
 {
 }
 
-Sequence::~Sequence (void)
+Sequence::~Sequence ()
 {
 }
 
@@ -189,7 +188,7 @@ Sequence::parse_args (int argc,
 }
 
 void
-Sequence::create_EC (void)
+Sequence::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -200,7 +199,7 @@ Sequence::create_EC (void)
 }
 
 void
-Sequence::on_event_received (void)
+Sequence::on_event_received ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -214,7 +213,7 @@ Sequence::on_event_received (void)
 }
 
 void
-Sequence::run_test (void)
+Sequence::run_test ()
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -293,13 +292,13 @@ Sequence::run_test (void)
 }
 
 void
-Sequence::end_test (void)
+Sequence::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
-Sequence::check_results (void)
+Sequence::check_results ()
 {
   // Destroy the channel.
   this->ec_->destroy ();
@@ -336,7 +335,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       events.run_test ();
 
-      events.ORB_run( );
+      events.ORB_run();
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index ebff1041c48..564cce98dba 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -47,7 +47,7 @@ public:
   SequencePushSupplier (Sequence * test_client);
 
   /// Destructor.
-  virtual ~SequencePushSupplier (void);
+  virtual ~SequencePushSupplier ();
 
 protected:
   Sequence* test_client_;
@@ -59,8 +59,8 @@ class Sequence : public Notify_Test_Client
 {
 public:
   // Initialization and termination code.
-  Sequence (void);
-  virtual ~Sequence (void);
+  Sequence ();
+  virtual ~Sequence ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
@@ -70,20 +70,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Called when an event is received.
-  void on_event_received (void);
+  void on_event_received ();
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Number of events to send
   int event_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index ddd0ad8f9ac..81c53e7c4fd 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -4,7 +4,6 @@
 #include "Simple.h"
 
 
-
 //***************************************************************************
 
 Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
@@ -33,18 +32,18 @@ Event_AnyPushSupplier::Event_AnyPushSupplier (Simple_Test* test_client)
 {
 }
 
-Event_AnyPushSupplier::~Event_AnyPushSupplier (void)
+Event_AnyPushSupplier::~Event_AnyPushSupplier ()
 {
 }
 
 //***************************************************************************
 
-Simple_Test::Simple_Test (void)
+Simple_Test::Simple_Test ()
   : event_count_ (5)
 {
 }
 
-Simple_Test::~Simple_Test (void)
+Simple_Test::~Simple_Test ()
 {
 }
 
@@ -93,7 +92,7 @@ Simple_Test::init (int argc,
 
   this->supplier_->connect (this->supplier_admin_.in ());
 
-  consumer_start( 0 );
+  consumer_start(0);
 
   return 0;
 }
@@ -136,7 +135,7 @@ Simple_Test::parse_args (int argc,
 }
 
 void
-Simple_Test::create_EC (void)
+Simple_Test::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -148,7 +147,7 @@ Simple_Test::create_EC (void)
 }
 
 void
-Simple_Test::on_event_received (void)
+Simple_Test::on_event_received ()
 {
   ++this->result_count_;
 
@@ -164,7 +163,7 @@ Simple_Test::on_event_received (void)
 }
 
 void
-Simple_Test::run_test (void)
+Simple_Test::run_test ()
 {
   CORBA::Any data;
 
@@ -177,13 +176,13 @@ Simple_Test::run_test (void)
 }
 
 void
-Simple_Test::end_test (void)
+Simple_Test::end_test ()
 {
-  consumer_done( 0 );
+  consumer_done(0);
 }
 
 int
-Simple_Test::check_results (void)
+Simple_Test::check_results ()
 {
   // Destroy the channel
   this->ec_->destroy ();
@@ -221,7 +220,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       events.run_test ();
 
-      events.ORB_run( );
+      events.ORB_run();
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index ad78485c81d..0c54c254799 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -33,9 +33,7 @@ public:
   Event_AnyPushConsumer (Simple_Test *test_client);
 
   // = PushSupplier methods
-  virtual void push (
-      const CORBA::Any & data
-    );
+  virtual void push (const CORBA::Any & data);
 
 protected:
   Simple_Test * test_client_;
@@ -50,7 +48,7 @@ public:
   Event_AnyPushSupplier (Simple_Test * test_client);
 
   /// Destructor.
-  virtual ~Event_AnyPushSupplier (void);
+  virtual ~Event_AnyPushSupplier ();
 
 protected:
   Simple_Test* test_client_;
@@ -62,8 +60,8 @@ class Simple_Test : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Simple_Test (void);
-  virtual ~Simple_Test (void);
+  Simple_Test ();
+  virtual ~Simple_Test ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
@@ -73,20 +71,20 @@ public:
             ACE_TCHAR *argv []);
 
   /// Called when an event is received.
-  void on_event_received (void);
+  void on_event_received ();
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// End the test.
-  void end_test (void);
+  void end_test ();
 
   /// check if we got the expected results.
-  int check_results (void);
+  int check_results ();
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index a3326305bcb..5910612b6fb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -4,7 +4,6 @@
 #include "Updates.h"
 
 
-
 Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client)
   : test_client_ (test_client)
 {
@@ -45,7 +44,7 @@ Updates_StructuredPushSupplier::subscription_change (
 
 /***************************************************************************/
 
-Updates::Updates (void)
+Updates::Updates ()
   : added_count_ (0), removed_count_ (0)
 {
 }
@@ -97,7 +96,7 @@ Updates::init (int argc,
 }
 
 void
-Updates::create_EC (void)
+Updates::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -162,7 +161,7 @@ Updates::wait_for_updates (int expected_added, int expected_removed)
 }
 
 void
-Updates::reset_counts (void)
+Updates::reset_counts ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
   this->added_count_ = 0;
@@ -170,7 +169,7 @@ Updates::reset_counts (void)
 }
 
 void
-Updates::run_test (void)
+Updates::run_test ()
 {
   this->test_subscription_change ();
 
@@ -183,7 +182,7 @@ Updates::run_test (void)
 }
 
 void
-Updates::test_subscription_change (void)
+Updates::test_subscription_change ()
 {
   {
     // reset counts.
@@ -210,9 +209,7 @@ Updates::test_subscription_change (void)
         this->print_event_types (removed);
       }
 
-    this->consumer_->get_proxy_supplier ()->subscription_change (added,
-                                                                 removed
-                                                                 );
+    this->consumer_->get_proxy_supplier ()->subscription_change (added, removed);
 
     this->wait_for_updates (3, 0); // The supplier should receive Added (RED, GREEN, BLUE)
 
@@ -246,9 +243,7 @@ Updates::test_subscription_change (void)
         this->print_event_types (removed);
       }
 
-    this->consumer_->get_proxy_supplier ()->subscription_change (added,
-                                                                 removed
-                                                                 );
+    this->consumer_->get_proxy_supplier ()->subscription_change (added, removed);
 
     this->wait_for_updates (1, 0); // The supplier should receive Added (PURPLE).
 
@@ -280,9 +275,7 @@ Updates::test_subscription_change (void)
         this->print_event_types (removed);
       }
 
-    this->consumer_->get_proxy_supplier ()->subscription_change (added,
-                                                                 removed
-                                                                 );
+    this->consumer_->get_proxy_supplier ()->subscription_change (added, removed);
 
     this->wait_for_updates (0, 4);
     // The supplier should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
@@ -301,7 +294,7 @@ Updates::test_subscription_change (void)
 }
 
 void
-Updates::test_offer_change (void)
+Updates::test_offer_change ()
 {
   {
     // reset counts.
@@ -328,9 +321,7 @@ Updates::test_offer_change (void)
         this->print_event_types (removed);
       }
 
-    this->supplier_->get_proxy_consumer ()->offer_change (added,
-                                                          removed
-                                                          );
+    this->supplier_->get_proxy_consumer ()->offer_change (added, removed);
 
     this->wait_for_updates (3, 0); // The consumer should receive Added (RED, GREEN, BLUE)
 
@@ -364,9 +355,7 @@ Updates::test_offer_change (void)
         this->print_event_types (removed);
       }
 
-    this->supplier_->get_proxy_consumer ()->offer_change (added,
-                                                          removed
-                                                                 );
+    this->supplier_->get_proxy_consumer ()->offer_change (added, removed);
 
     this->wait_for_updates (1, 0); // The consumer should receive Added (PURPLE).
 
@@ -398,9 +387,7 @@ Updates::test_offer_change (void)
         this->print_event_types (removed);
       }
 
-    this->supplier_->get_proxy_consumer ()->offer_change (added,
-                                                          removed
-                                                          );
+    this->supplier_->get_proxy_consumer ()->offer_change (added, removed);
 
     this->wait_for_updates (0, 4);
     // The consumer should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index a75cf37d52f..635f581017e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -53,8 +53,7 @@ public:
   /// Subscription change is conveyed here.
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    );
+      const CosNotification::EventTypeSeq & removed);
 
 protected:
   Updates* test_client_;
@@ -66,14 +65,14 @@ class Updates : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Updates (void);
+  Updates ();
   virtual ~Updates ();
 
   /// initialization.
   int init (int argc, ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// print_event_types
   void print_event_types (const CosNotification::EventTypeSeq &types);
@@ -86,19 +85,19 @@ public:
 
 protected:
   /// Create EC
-  void create_EC (void);
+  void create_EC ();
 
   /// Helper to add types.
   void add_type (CosNotification::EventTypeSeq& type_seq, const char* type);
 
   // test subscription_change
-  void test_subscription_change (void);
+  void test_subscription_change ();
 
   // test offer_change
-  void test_offer_change (void);
+  void test_offer_change ();
 
   /// Reset the counts.
-  void reset_counts (void);
+  void reset_counts ();
 
   /// Lock to serialize internal state.
   TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 8d8bb055f34..c75a790f8c5 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -2,7 +2,6 @@
 // Include Section
 // ******************************************************************
 
-#include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 
 #include "tao/ORB_Core.h"
@@ -17,6 +16,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -164,7 +164,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_ptr orb = client.orb ();
 
       // Activate the signaler with the POA
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 5853851ca20..7da4193f694 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -2,7 +2,6 @@
 // Include Section
 // ******************************************************************
 
-#include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
@@ -16,7 +15,7 @@
 #include "goS.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "Notify_Test_Client.h"
-
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -38,12 +37,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -174,7 +173,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
     {
       Supplier_Client client;
@@ -188,7 +187,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           CORBA::ORB_ptr orb = client.orb ();
 
           // Activate the signaler with the POA
-          sig_impl.reset ( new sig_i ( orb ) );
+          sig_impl.reset ( new sig_i (orb));
           sig_var sig = sig_impl->_this ();
 
           CORBA::String_var ior =
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 6f110389e8b..1e2ee3809d3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -16,7 +16,6 @@ get_event_channel(CORBA::ORB_ptr orb)
   CosNotification::AdminProperties init_admin(0);
 
 
-
   std::cout << "Get CosNotifyChannelAdmin::EventChannelFactory"  << std::endl;
   std::cout << "IorEventChannelFactory=" << ior << std::endl;
   CORBA::Object_var obj = orb->string_to_object(ior);
@@ -51,7 +50,6 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if( channelIdSeq->length() == 0 )
   {
-
     try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
@@ -229,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_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index 2628c22c28d..d18e1b903c7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -17,6 +16,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -85,7 +85,6 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
   while ((c = get_opts ()) != -1)
     switch (c)
   {
-
     case 'o':
       ior_output_file = get_opts.optarg;
       break;
@@ -181,7 +180,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   int status = 0;
   try
   {
@@ -195,7 +194,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index d434d603101..de467fb135a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Argv_Type_Converter.h"
 
 #include "tao/ORB_Core.h"
@@ -16,7 +15,7 @@
 #include "goS.h"
 
 #include "Notify_Test_Client.h"
-
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -40,12 +39,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -144,7 +143,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   int status = 0;
-  ACE_Auto_Ptr<sig_i> sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
     {
       Supplier_Client client;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index 5be7ee1c143..65fb7d87f58 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -5,8 +5,6 @@
 
 #include "DllORB.h"
 
-char const * const scpc_orbId = "testDllOrb";
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug2926",
@@ -90,8 +88,7 @@ void loadunloadcycle()
   v_ec = v_notifyFactory->create_channel(
     initialQos,
     initialAdmin,
-    id
-  );
+    id);
 
   ACE_DEBUG((
     LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index 67fcbe3c0f5..2e9f2f5cf5c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -74,8 +74,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
@@ -83,9 +82,8 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
 int
-DllOrb::fini (void)
+DllOrb::fini ()
 {
   try
   {
@@ -127,7 +125,7 @@ DllOrb::fini (void)
   return 0;
 }
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
@@ -163,7 +161,7 @@ int DllOrb::svc (void)
   }
 
   return 0;
-} /* end of DllOrb::svc ( ) */
+} /* end of DllOrb::svc () */
 
 
 ACE_FACTORY_DEFINE (bug_3252, DllOrb)
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
index a4900e8b420..5689963e201 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
@@ -12,8 +12,8 @@
 class bug_3252_Export DllOrb: public ACE_Task_Base
 {
 public:
-  DllOrb (void);
-  virtual ~DllOrb (void);
+  DllOrb ();
+  virtual ~DllOrb ();
 
   CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); }
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 96fe82eb761..a766af31cb0 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -69,9 +69,7 @@ loadNotify(ACE_Service_Config & service_config)
     p_notifyService->init_service(v_orb.in());
 
     CosNotifyChannelAdmin::EventChannelFactory_var v_notifyFactory =
-      p_notifyService->create(
-        v_rootPOA.in()
-      );
+      p_notifyService->create(v_rootPOA.in());
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("got EventChannelFactory\n")));
 
     // create an event channel
@@ -84,8 +82,7 @@ loadNotify(ACE_Service_Config & service_config)
       v_notifyFactory->create_channel(
         initialQos,
         initialAdmin,
-        id
-      );
+        id);
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("got EventChannel\n")));
 
     CosNotifyFilter::FilterFactory_var v_filterFactory =
@@ -136,7 +133,6 @@ int loadOrb(ACE_Service_Config & service_config)
 }
 
 
-
 int
 ACE_TMAIN(int, ACE_TCHAR **argv)
 {
@@ -157,8 +153,7 @@ ACE_TMAIN(int, ACE_TCHAR **argv)
                                ACE_DEFAULT_LOGGER_KEY,
                                true, // ignore_static_svcs = 1,
                                true, // ignore_default_svc_conf_file = 0,
-                               false  // ignore_debug_flag = 0
-                               );
+                               false);  // ignore_debug_flag = 0
 
   if(0 != result)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
index 2a8c410c42c..a38b5fc0ee2 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
@@ -5,8 +5,6 @@
 
 #include "DllORB.h"
 
-char const * const scpc_orbId = "testDllOrb";
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3646b",
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index 78ac583c59a..3909d532eaa 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -6,8 +6,6 @@
 
 #include "DllORB.h"
 
-char const * const scpc_orbId = "testDllOrb";
-
 const int max_length = 1000;
 
 #if defined (ACE_USES_WCHAR)
@@ -98,7 +96,6 @@ return 0;
 }
 
 
-
 void loadunloadcycle()
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
index 7dbb8a1f845..f7c129c3628 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
@@ -5,8 +5,6 @@
 
 #include "DllORB.h"
 
-char const * const scpc_orbId = "testDllOrb";
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3646d",
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
index f76c8350b20..dcb485c86ad 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
@@ -5,8 +5,6 @@
 
 #include "DllORB.h"
 
-char const * const scpc_orbId = "testDllOrb";
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3663",
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/Bug_3688b_Regression/TestBroadcaster.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
index 596cb624502..482ffe8721c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
@@ -40,22 +40,18 @@ bool TestBroadcaster::connect(
     v_supplierAdmin =
       v_eventChannel->new_for_suppliers (
       CosNotifyChannelAdmin::OR_OP,
-      supplierAdminId
-    );
+      supplierAdminId);
 
     v_proxyConsumer = v_supplierAdmin->obtain_notification_push_consumer(
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxyConsumerId
-    );
+      proxyConsumerId);
 
     mv_sequenceProxyPushConsumer =
       CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(
-        v_proxyConsumer.in()
-      );
+        v_proxyConsumer.in());
 
     mv_sequenceProxyPushConsumer->connect_sequence_push_supplier(
-      CosNotifyComm::SequencePushSupplier::_nil()
-    );
+      CosNotifyComm::SequencePushSupplier::_nil());
   }
   catch(...)
   {
@@ -85,7 +81,7 @@ bool TestBroadcaster::disconnect()
 } /* end of TestBroadcaster::disconnect */
 
 
-bool TestBroadcaster::sendData( )
+bool TestBroadcaster::sendData()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
index 7c743cbcbd7..8685542fc1c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
@@ -12,30 +12,27 @@ class bug3688_Export TestBroadcaster
   // public types and methods
   public:
     /// Default constructor.
-    TestBroadcaster ( );
+    TestBroadcaster ();
 
     /// Destructor.
-    ~TestBroadcaster ( )
+    ~TestBroadcaster ()
       throw ();
 
     bool connect(
       CORBA::ORB_ptr p_orb,
-      std::string const & rc_channelIor
-    );
+      std::string const & rc_channelIor);
 
-    bool disconnect( );
+    bool disconnect();
 
-    bool isConnected( ) const;
+    bool isConnected() const;
 
-    bool sendData( );
+    bool sendData();
 
   // protected types and methods
   protected:
-
   // private methods and instance variables
   private:
     CosNotifyChannelAdmin::SequenceProxyPushConsumer_var mv_sequenceProxyPushConsumer;
-
 }; /* end of TestBroadcaster */
 
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
index bd387c2fd5b..0b12de46451 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
@@ -22,8 +22,7 @@ TestListener::TestListener(
 
   mv_consumerAdmin = mv_eventChannel->new_for_consumers(
     CosNotifyChannelAdmin::AND_OP,
-    m_consumerAdminId
-  );
+    m_consumerAdminId);
 
   CosNotifyFilter::FilterFactory_var v_filterFactory =
     mv_eventChannel->default_filter_factory();
@@ -53,13 +52,11 @@ TestListener::TestListener(
   CosNotifyChannelAdmin::ProxySupplier_var v_proxySupplier =
     mv_consumerAdmin->obtain_notification_push_supplier(
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      m_proxySupplierId
-    );
+      m_proxySupplierId);
 
   mv_proxySupplier =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(
-      v_proxySupplier.in()
-    );
+      v_proxySupplier.in());
 
   mv_proxySupplier->connect_structured_push_consumer(mv_structuredPushConsumer.in());
 }
@@ -83,8 +80,7 @@ TestListener::~TestListener()
 
 
 void TestListener::push_structured_event (
-  const CosNotification::StructuredEvent & notification
-)
+  const CosNotification::StructuredEvent & notification)
 {
   CORBA::Long data;
   notification.remainder_of_body >>= data;
@@ -92,12 +88,10 @@ void TestListener::push_structured_event (
   m_receivedData.push_back(data);
 }
 
-
-void TestListener::disconnect_structured_push_consumer ( )
+void TestListener::disconnect_structured_push_consumer ()
 {
 }
 
-
 void TestListener::offer_change(
   const CosNotification::EventTypeSeq & ,
   const CosNotification::EventTypeSeq &
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
index ee832c1a759..3315f08aad0 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
@@ -17,21 +17,18 @@ struct bug3688_Export TestListener
   TestListener(
     CORBA::ORB * p_orb,
     std::string const & rc_channelIor,
-    std::string const & rc_filterExpression = ""
-  );
+    std::string const & rc_filterExpression = "");
 
   ~TestListener();
 
   virtual void push_structured_event (
-    const CosNotification::StructuredEvent & notification
-  );
+    const CosNotification::StructuredEvent & notification);
 
-  virtual void disconnect_structured_push_consumer ( );
+  virtual void disconnect_structured_push_consumer ();
 
   virtual void offer_change(
     const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed
-  );
+    const CosNotification::EventTypeSeq & removed);
 
   PortableServer::POA_var mv_rootPOA;
   PortableServer::ObjectId_var mv_oid;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index 9c61a834f92..2f61282b07d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -3,14 +3,10 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/CosNamingC.h"
 
-
 #include "DllORB.h"
 #include "TestListener.h"
 #include "TestBroadcaster.h"
 
-
-char const * const scpc_orbId = "testDllOrb";
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3688",
@@ -43,7 +39,6 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_D
 ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService");
 
 
-
 int publish()
 {
   int result = 0;
@@ -60,8 +55,7 @@ int publish()
 
   testBroadcaster.connect(
     v_orb.in(),
-    "corbaname:rir:#Channel1"
-  );
+    "corbaname:rir:#Channel1");
 
   TestListener testListener(
     v_orb.in(),
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 16973aee910..7c6a81077d0 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -157,7 +157,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 76323b2cf52..690f94e507d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -17,6 +16,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -51,12 +51,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -199,7 +199,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -219,7 +219,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ec->set_qos (qos);
       }
 
-      sig_impl.reset( new sig_i( client.orb() ) );
+      sig_impl.reset( new sig_i(client.orb()));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index 3b4e95cdb03..c7516eca02e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -158,7 +158,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
               ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-              client.ORB_run( );
+              client.ORB_run();
 
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
               consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index c32ac84d38e..2fb1055dc37 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -17,6 +16,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -42,12 +42,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -181,7 +181,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -201,7 +201,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ec->set_qos (qos);
       }
 
-      sig_impl.reset( new sig_i( client.orb() ) );
+      sig_impl.reset( new sig_i(client.orb()));
       sig_var sig = sig_impl->_this ();
 
       // If the ior_output_file exists, output the ior to it
diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
index 9765a241f0f..7b3ec37371c 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       client.ORB_run ();
 #ifdef PAUSE_ON_EXIT
       _cputs( "All events received. Still connected.\n");
-      _cputs( "Hit a key to exit consumer: " );
+      _cputs( "Hit a key to exit consumer: ");
       _getch();
 #endif // PAUSE_ON_EXIT
       ACE_DEBUG ((LM_DEBUG, "Consumer done.\n"));
diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 6f3a741ea98..8bcdf19c2e8 100644
--- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -18,7 +18,6 @@ sorter (const void* a, const void* b)
 }
 
 
-
 // It's reasonable to assume that there is only one event channel
 // factory and that we know its name.
 class MonitorTestInterface_i: public virtual POA_MonitorTestInterface
@@ -39,7 +38,7 @@ public:
 private:
   void brain_dump (const char * context);
   void stat_dump (const char * statName);
-  void consumer_stats_check (void);
+  void consumer_stats_check ();
 private:
   ACE_CString base_;
   CosNotification::NotificationServiceMonitorControl_var nsm_;
@@ -280,7 +279,6 @@ MonitorTestInterface_i::stat_dump (const char * statName)
     }
   catch (const CORBA::Exception& ex)
     {
-
       ex._tao_print_exception (statName);
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 911bb91a96d..bac88e1151d 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -104,7 +104,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 }
 
 static void
-disconnect_consumers (void)
+disconnect_consumers ()
 {
   for (unsigned int i = 0; i < consumer_count; i++)
   {
@@ -153,7 +153,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         // Tell the supplier to go
         sig->go ();
 
-        client.ORB_run( );
+        client.ORB_run();
 
         disconnect_consumers();
 
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index c2240ce41d0..06435cd4c45 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -16,6 +15,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -39,12 +39,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -169,7 +169,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 }
 
 static void
-disconnect_suppliers (void)
+disconnect_suppliers ()
 {
   for (unsigned int i = 0; i < supplier_count; ++i)
   {
@@ -183,7 +183,7 @@ disconnect_suppliers (void)
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Consumer_Client client;
@@ -196,7 +196,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 635d393a0ce..c586dd0e012 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -149,7 +149,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index efaf293783e..7af661f903f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -12,7 +12,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Short order_policy = CosNotification::FifoOrder;
@@ -29,12 +29,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -192,7 +192,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -211,7 +211,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index bec30a6d1f0..0df3dded203 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -145,7 +145,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 7529a8a8a21..7e7b31b43ef 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -12,7 +12,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 static TAO_Notify_Tests_StructuredPushSupplier* supplier_1 = 0;
 static CORBA::Short order_policy = CosNotification::FifoOrder;
@@ -28,12 +28,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -188,7 +188,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -207,7 +207,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 34b575fe3b8..afb7e2e08ad 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -20,7 +20,7 @@ int EVENTS_EXPECTED_TO_RECEIVE = 9*4;  // 2 consumers get the same events from 2
 
 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0;
 
-FilterClient::FilterClient (void)
+FilterClient::FilterClient ()
   :consumer_1 (0),
   consumer_2 (0),
   supplier_1 (0),
@@ -213,7 +213,7 @@ FilterClient::run_consumer ()
 }
 
 void
-FilterClient::done (void)
+FilterClient::done ()
 {
   this->done_ = 1;
 }
@@ -609,7 +609,7 @@ Filter_StructuredPushConsumer::Filter_StructuredPushConsumer (FilterClient* filt
 {
 }
 
-Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
+Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index 7e3d933ffdd..84674908576 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -38,7 +38,7 @@ class FilterClient
 {
  public:
   /// Constructor
-  FilterClient (void);
+  FilterClient ();
 
   /// Destructor
   ~FilterClient ();
@@ -52,10 +52,9 @@ class FilterClient
   void run_consumer ();
 
   /// Consumer calls done, We're done.
-  void done (void);
+  void done ();
 
  protected:
-
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
@@ -192,7 +191,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~Filter_StructuredPushConsumer (void);
+  virtual ~Filter_StructuredPushConsumer ();
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -249,11 +248,10 @@ protected:
   // = NotifySubscribe
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-                                    );
+        const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
-    virtual void disconnect_structured_push_supplier ();
+  virtual void disconnect_structured_push_supplier ();
 };
 
 /***************************************************************************/
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index 1dfc2c5ecdc..b1cd05702fd 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -14,6 +14,7 @@
 #include "goS.h"
 
 #include "Notify_Test_Client.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -166,7 +167,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -213,7 +214,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_ptr orb = client.orb ();
 
       // Activate the signaler with the POA
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index 02f9125570c..13f19d81ebe 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -1,11 +1,10 @@
 #include "RT_Application_Command.h"
 
 
-
 #include "../lib/LookupManager.h"
 #include "RT_Priority_Mapping.h"
 
-TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command (void)
+TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command ()
 {
 }
 
@@ -14,7 +13,7 @@ TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Comman
 }
 
 void
-TAO_Notify_Tests_RT_Application_Command::handle_init (void)
+TAO_Notify_Tests_RT_Application_Command::handle_init ()
 {
   // Call the Base class.
   TAO_Notify_Tests_Application_Command::handle_init ();
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
index eaa28d78de7..41a0e128742 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
@@ -26,12 +26,12 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Application_Command : public
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_Application_Command (void);
+  TAO_Notify_Tests_RT_Application_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_Application_Command ();
 
-  virtual void handle_init (void);
+  virtual void handle_init ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index e1f9c3d1a34..5622466deed 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,7 +1,6 @@
 #include "../lib/Factories_Define.h"
 
 
-
 #include "rt_notify_test_export.h"
 #include "../lib/Name.h"
 #include "../lib/Command_Factory_T.h"
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 88cda77d7ec..c314ac0cb78 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -1,12 +1,11 @@
 #include "RT_POA_Command.h"
 
 
-
 #include "tao/debug.h"
 #include "../lib/LookupManager.h"
 #include "../lib/Name.h"
 
-TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command (void)
+TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command ()
   :priority_model_ (RTCORBA::CLIENT_PROPAGATED)
   , server_priority_ (0)
   , thread_pool_static_threads_ (0)
@@ -19,13 +18,13 @@ TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command ()
 }
 
 const char*
-TAO_Notify_Tests_RT_POA_Command::get_name (void)
+TAO_Notify_Tests_RT_POA_Command::get_name ()
 {
   return TAO_Notify_Tests_RT_POA_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_RT_POA_Command::name (void)
+TAO_Notify_Tests_RT_POA_Command::name ()
 {
   return TAO_Notify_Tests_Name::poa_command;
 }
@@ -175,7 +174,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_RT_POA_Command::execute_i (void)
+TAO_Notify_Tests_RT_POA_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
@@ -270,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/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index 19188d711f6..110c1cbf2c6 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -30,7 +30,7 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_POA_Command : public TAO_Not
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_POA_Command (void);
+  TAO_Notify_Tests_RT_POA_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_POA_Command ();
@@ -40,11 +40,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Get the command name.
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   /// Create the POA with the params parsed.
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 10a8b6ba093..05512d1b4d5 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -1,10 +1,9 @@
 #include "RT_Priority_Mapping.h"
 
 
-
 #include "../lib/LookupManager.h"
 
-TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void)
+TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index 10adc098929..552a017a100 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -27,7 +27,7 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Priority_Mapping : public TA
 {
 public:
   /// The destructor
-  virtual ~TAO_Notify_Tests_RT_Priority_Mapping (void);
+  virtual ~TAO_Notify_Tests_RT_Priority_Mapping ();
 
   /// Init the Mapping manager.
   void init (CORBA::ORB_ptr orb);
@@ -40,7 +40,6 @@ public:
                 CORBA::Short &corba_priority);
 
 protected:
-
   /// The Priority Mapping helper.
   RTCORBA::PriorityMapping *priority_mapping_;
 };
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 4b43325d224..664ee1f2646 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -7,7 +7,6 @@
 #include "tao/AnyTypeCode/Any.h"
 
 
-
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
 
@@ -680,7 +679,7 @@ ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 }
 
 CORBA::Boolean
-ReconnectionCallback_i::is_alive (void)
+ReconnectionCallback_i::is_alive ()
 {
   return true;
 }
@@ -695,7 +694,7 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
 
 
 void
-ReconnectionCallback_i::fini (void)
+ReconnectionCallback_i::fini ()
 {
   if (this->id_is_valid_)
   {
@@ -995,7 +994,7 @@ Consumer_Main::save_ids()
       static_cast<int> (structured_proxy_id_),
       static_cast<int> (sequence_proxy_id_),
       static_cast<int> (any_proxy_id_),
-      static_cast<int> (endflag) );
+      static_cast<int> (endflag));
     ACE_OS::fclose (idf);
   }
 }
@@ -1109,7 +1108,7 @@ Consumer_Main::reconnect (
 
 
 int
-Consumer_Main::resolve_naming_service (void)
+Consumer_Main::resolve_naming_service ()
 {
   // ignore redundant calls
   if (CORBA::is_nil (this->naming_context_.in ()))
@@ -1125,7 +1124,7 @@ Consumer_Main::resolve_naming_service (void)
 }
 
 int
-Consumer_Main::find_notify_factory (void)
+Consumer_Main::find_notify_factory ()
 {
   int status = this->resolve_naming_service ();
   if (status)
@@ -1144,7 +1143,7 @@ Consumer_Main::find_notify_factory (void)
 }
 
 int
-Consumer_Main::resolve_notify_factory (void)
+Consumer_Main::resolve_notify_factory ()
 {
   CORBA::Object_var factory_obj =
     this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
@@ -1156,7 +1155,7 @@ Consumer_Main::resolve_notify_factory (void)
 }
 
 void
-Consumer_Main::init_event_channel (void)
+Consumer_Main::init_event_channel ()
 {
   bool ok = false;
   if (this->reconnecting_)
@@ -1276,7 +1275,7 @@ Consumer_Main::init_event_channel (void)
 CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
 
 void
-Consumer_Main::init_consumer_admin (void)
+Consumer_Main::init_consumer_admin ()
 {
   bool ok = false;
   if (this->reconnecting_)
@@ -1389,7 +1388,7 @@ Consumer_Main::init_consumer_admin (void)
   }
 }
 void
-Consumer_Main::init_structured_proxy_supplier (void)
+Consumer_Main::init_structured_proxy_supplier ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1479,7 +1478,7 @@ Consumer_Main::init_structured_proxy_supplier (void)
 }
 
 void
-Consumer_Main::init_sequence_proxy_supplier (void)
+Consumer_Main::init_sequence_proxy_supplier ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1561,7 +1560,6 @@ Consumer_Main::init_sequence_proxy_supplier (void)
   this->sequence_proxy_push_supplier_->connect_sequence_push_consumer (
     this->sequence_push_consumer_ref_.in ());
   this->sequence_push_consumer_.set_connected(true);
-
 }
 
 
@@ -1582,7 +1580,7 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy)
 }
 
 void
-Consumer_Main::init_any_proxy_supplier (void)
+Consumer_Main::init_any_proxy_supplier ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1678,9 +1676,8 @@ Consumer_Main::init_any_proxy_supplier (void)
   this->any_push_consumer_.set_connected(true);
 }
 
-int Consumer_Main::fini (void)
+int Consumer_Main::fini ()
 {
-
   this->reconnection_callback_.fini ();
 
   if (this->disconnect_on_exit_)
@@ -1714,7 +1711,7 @@ int Consumer_Main::fini (void)
 }
 
 
-int Consumer_Main::run (void)
+int Consumer_Main::run ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 26f4b891391..a4dd8f1e0f3 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -26,15 +26,12 @@ public:
   StructuredPushConsumer_i ();
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    );
+      const CosNotification::EventTypeSeq & removed);
 
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification
-      );
+        const CosNotification::StructuredEvent & notification);
 
-  virtual void disconnect_structured_push_consumer (
-    );
+  virtual void disconnect_structured_push_consumer ();
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
@@ -63,15 +60,12 @@ public:
   SequencePushConsumer_i ();
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
-      const CosNotification::EventTypeSeq & removed
-    );
+      const CosNotification::EventTypeSeq & removed);
 
   virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
-  virtual void disconnect_sequence_push_consumer (
-    );
+  virtual void disconnect_sequence_push_consumer ();
 
   size_t received () const;
   void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
@@ -139,13 +133,13 @@ public:
     PortableServer::POA_ptr poa,
     CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
-  void fini (void);
+  void fini ();
 
   size_t reconnect_count () const;
 
   virtual void reconnect (CORBA::Object_ptr reconnection);
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
 private:
   Consumer_Main & consumer_main_;
@@ -165,8 +159,8 @@ class Consumer_Main
   int parse_single_arg (int argc, ACE_TCHAR *argv[]);
 
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  int fini (void);
+  int run ();
+  int fini ();
   void usage (FILE * log) const;
 
   void reconnect (
@@ -174,19 +168,19 @@ class Consumer_Main
 
  private:
   /// Find naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Resolve the Notify factory from the Naming service.
-  int find_notify_factory (void);
+  int find_notify_factory ();
 
   /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
-  int resolve_notify_factory (void);
+  int resolve_notify_factory ();
 
-  void init_event_channel (void);
-  void init_consumer_admin (void);
-  void init_structured_proxy_supplier (void);
-  void init_sequence_proxy_supplier (void);
-  void init_any_proxy_supplier (void);
+  void init_event_channel ();
+  void init_consumer_admin ();
+  void init_structured_proxy_supplier ();
+  void init_sequence_proxy_supplier ();
+  void init_any_proxy_supplier ();
 
   void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy);
 
@@ -202,7 +196,6 @@ class Consumer_Main
   ////////////////
   // Data members
  private:
-
   // set by command line parameters
   bool verbose_;            // -v make a glorious noise
   enum Mode_T{
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index c550f4178fe..346246d79cc 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -7,7 +7,6 @@
 #include "ace/OS_NS_strings.h"
 
 
-
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
 
@@ -119,7 +118,7 @@ ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 }
 
 CORBA::Boolean
-ReconnectionCallback_i::is_alive (void)
+ReconnectionCallback_i::is_alive ()
 {
   return true;
 }
@@ -133,7 +132,7 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
 
 
 void
-ReconnectionCallback_i::fini (void)
+ReconnectionCallback_i::fini ()
 {
   if (this->id_is_valid_)
   {
@@ -168,7 +167,6 @@ ReconnectionCallback_i::init (
 }
 
 
-
 /////////////////
 // Supplier_Main
 
@@ -368,7 +366,6 @@ int Supplier_Main::init (int argc, ACE_TCHAR *argv[])
     }
     case MODE_ANY:
     {
-
       init_any_proxy_consumer ();
       break;
     }
@@ -405,7 +402,7 @@ Supplier_Main::save_ids()
       static_cast<int> (structured_proxy_id_),
       static_cast<int> (sequence_proxy_id_),
       static_cast<int> (any_proxy_id_),
-      static_cast<int> (endflag) );
+      static_cast<int> (endflag));
     ACE_OS::fclose (idf);
   }
 }
@@ -505,7 +502,7 @@ Supplier_Main::reconnect (
 
 
 int
-Supplier_Main::resolve_naming_service (void)
+Supplier_Main::resolve_naming_service ()
 {
   // ignore redundant calls
   if (CORBA::is_nil (this->naming_context_.in ()))
@@ -521,7 +518,7 @@ Supplier_Main::resolve_naming_service (void)
 }
 
 int
-Supplier_Main::find_notify_factory (void)
+Supplier_Main::find_notify_factory ()
 {
   int status = this->resolve_naming_service ();
   if (status)
@@ -540,7 +537,7 @@ Supplier_Main::find_notify_factory (void)
 }
 
 int
-Supplier_Main::resolve_notify_factory (void)
+Supplier_Main::resolve_notify_factory ()
 {
   CORBA::Object_var factory_obj =
     this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
@@ -552,7 +549,7 @@ Supplier_Main::resolve_notify_factory (void)
 }
 
 void
-Supplier_Main::init_event_channel (void)
+Supplier_Main::init_event_channel ()
 {
   bool ok = false;
   if (this->reconnecting_)
@@ -672,7 +669,7 @@ Supplier_Main::init_event_channel (void)
 CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
 
 void
-Supplier_Main::init_supplier_admin (void)
+Supplier_Main::init_supplier_admin ()
 {
   bool ok = false;
   if (this->reconnecting_ && this->sa_id_ != default_admin_id)
@@ -737,7 +734,7 @@ Supplier_Main::init_supplier_admin (void)
 }
 
 void
-Supplier_Main::init_structured_proxy_consumer (void)
+Supplier_Main::init_structured_proxy_consumer ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -745,9 +742,7 @@ Supplier_Main::init_structured_proxy_consumer (void)
   {
     try
     {
-      proxy = this->sa_->get_proxy_consumer (
-                          this->structured_proxy_id_
-                        );
+      proxy = this->sa_->get_proxy_consumer (this->structured_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -813,7 +808,7 @@ Supplier_Main::init_structured_proxy_consumer (void)
 }
 
 void
-Supplier_Main::init_sequence_proxy_consumer (void)
+Supplier_Main::init_sequence_proxy_consumer ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -889,7 +884,7 @@ Supplier_Main::init_sequence_proxy_consumer (void)
 }
 
 void
-Supplier_Main::init_any_proxy_consumer (void)
+Supplier_Main::init_any_proxy_consumer ()
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -964,7 +959,7 @@ Supplier_Main::init_any_proxy_consumer (void)
     any_push_supplier_ref_.in ());
 }
 
-int Supplier_Main::fini (void)
+int Supplier_Main::fini ()
 {
   if (this->disconnect_on_exit_)
   {
@@ -1015,7 +1010,7 @@ int Supplier_Main::fini (void)
   return 0;
 }
 
-void Supplier_Main::send_structured_event (void)
+void Supplier_Main::send_structured_event ()
 {
  CosNotification::StructuredEvent event;
 
@@ -1061,7 +1056,7 @@ void Supplier_Main::send_structured_event (void)
   this->structured_proxy_push_consumer_->push_structured_event (event);
 }
 
-void Supplier_Main::send_sequence_event (void)
+void Supplier_Main::send_sequence_event ()
 {
  CosNotification::EventBatch event_batch(1);
  event_batch.length (1);
@@ -1109,7 +1104,7 @@ void Supplier_Main::send_sequence_event (void)
   this->sequence_proxy_push_consumer_->push_structured_events (event_batch);
 }
 
-void Supplier_Main::send_any_event (void)
+void Supplier_Main::send_any_event ()
 {
   CORBA::Any event;
   event <<= CORBA::ULong (this->serial_number_);
@@ -1125,7 +1120,7 @@ void Supplier_Main::send_any_event (void)
   this->any_proxy_push_consumer_->push (event);
 }
 
-int Supplier_Main::run (void)
+int Supplier_Main::run ()
 {
   int result = 0;
   bool paused = false;
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 485055ef799..c1d529325e8 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -26,7 +26,7 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed);
 
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
 };
 
 class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSupplier
@@ -35,7 +35,7 @@ class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSup
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed);
 
-  virtual void disconnect_sequence_push_supplier (void);
+  virtual void disconnect_sequence_push_supplier ();
 };
 
 class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
@@ -44,7 +44,7 @@ class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 };
 
 class ReconnectionCallback_i : public virtual POA_NotifyExt::ReconnectionCallback
@@ -58,13 +58,13 @@ public:
     PortableServer::POA_ptr poa,
     CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
-  void fini (void);
+  void fini ();
 
   size_t reconnect_count () const;
 
   virtual void reconnect (CORBA::Object_ptr reconnection);
 
-  virtual CORBA::Boolean is_alive (void);
+  virtual CORBA::Boolean is_alive ();
 
 private:
   Supplier_Main & supplier_main_;
@@ -84,8 +84,8 @@ class Supplier_Main
   int parse_single_arg (int argc, ACE_TCHAR *argv[]);
 
   int init (int argc, ACE_TCHAR *argv[]);
-  int run (void);
-  int fini (void);
+  int run ();
+  int fini ();
   void usage (FILE * log) const;
 
   void reconnect (
@@ -93,24 +93,24 @@ class Supplier_Main
 
  private:
   /// Find naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Resolve the Notify factory from the Naming service.
-  int find_notify_factory (void);
+  int find_notify_factory ();
 
   /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
-  int resolve_notify_factory (void);
+  int resolve_notify_factory ();
 
-  void init_event_channel (void);
-  void init_supplier_admin (void);
-  void init_structured_proxy_consumer (void);
-  void init_sequence_proxy_consumer (void);
-  void init_any_proxy_consumer (void);
+  void init_event_channel ();
+  void init_supplier_admin ();
+  void init_structured_proxy_consumer ();
+  void init_sequence_proxy_consumer ();
+  void init_any_proxy_consumer ();
 
   /// send events.
-  void send_structured_event (void);
-  void send_sequence_event (void);
-  void send_any_event (void);
+  void send_structured_event ();
+  void send_sequence_event ();
+  void send_any_event ();
 
   void save_ids();
   bool load_ids();
@@ -124,7 +124,6 @@ class Supplier_Main
   ////////////////
   // Data members
  private:
-
   // set by command line parameters
   bool verbose_;             // -v make a glorious noise
   enum Mode_T {
@@ -171,5 +170,4 @@ class Supplier_Main
 };
 
 
-
 #endif /* RECONNECTNG_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index b2fd42bbe1e..4741cdba81c 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -164,7 +164,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
               // Tell the supplier to go
               sig->go ();
 
-              client.ORB_run( );
+              client.ORB_run();
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
               sig->done ();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 5c552723a2d..cc37a479d4d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -17,6 +16,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -194,7 +194,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   int status = 0;
   try
   {
@@ -208,7 +208,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
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..f12c1650539 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -157,13 +157,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Tell the supplier to go
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
     sig->done ();
 
     return 0;
-
   }
   catch (const CORBA::Exception& e)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 432b91c5077..ac1715fd5a3 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -19,6 +18,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -40,12 +40,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -195,7 +195,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   int status = 0;
   try
   {
@@ -210,7 +210,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 51ddc643cc3..3379933474d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -131,7 +131,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 8007cf18b4b..eef03ef2f3b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -13,8 +13,8 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 static const ACE_TCHAR *ior_file = ACE_TEXT ("supplier.ior");
 static TAO_Notify_Tests_StructuredPushSupplier* supplier = 0;
@@ -29,12 +29,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -153,7 +153,7 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Notify_Test_Client client;
@@ -168,7 +168,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index afaedc73a36..d58e3859128 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -151,7 +151,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     sig->go ();
 
-    client.ORB_run( );
+    client.ORB_run();
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 37c90df467c..d8678048838 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -10,8 +10,8 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 static const ACE_TCHAR *ior_output_file = ACE_TEXT ("supplier.ior");
 static bool useFilters = false;
@@ -30,12 +30,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -191,7 +191,7 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   try
   {
     Supplier_Client client;
@@ -206,7 +206,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     CORBA::ORB_ptr orb = client.orb ();
 
-    sig_impl.reset( new sig_i( orb ) );
+    sig_impl.reset( new sig_i(orb));
     sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index d0866878b38..483a288dcf5 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -5,7 +5,7 @@
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/PortableServer/Root_POA.h"
 
-TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void)
+TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter ()
   : expected_pool_id_ (0)
     , expected_lane_id_ (0)
 {
@@ -16,7 +16,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter ()
 }
 
 char*
-TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
+TAO_Notify_Tests_RT_Test_Filter::constraint_grammar ()
 {
   return CORBA::string_dup ("ETCL");
 }
@@ -82,18 +82,18 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void)
+TAO_Notify_Tests_RT_Test_Filter::get_all_constraints ()
 {
   return 0;
 }
 
 void
-TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void)
+TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints ()
 {
 }
 
 void
-TAO_Notify_Tests_RT_Test_Filter::destroy (void)
+TAO_Notify_Tests_RT_Test_Filter::destroy ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -229,7 +229,7 @@ TAO_Notify_Tests_RT_Test_Filter::detach_callback (
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void)
+TAO_Notify_Tests_RT_Test_Filter::get_callbacks ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 11fca2d5a0c..20a45a7890b 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -32,13 +32,13 @@ class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_Test_Filter (void);
+  TAO_Notify_Tests_RT_Test_Filter ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_Test_Filter ();
 
 protected:
-  virtual char * constraint_grammar (void);
+  virtual char * constraint_grammar ();
 
   virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
@@ -47,11 +47,11 @@ protected:
 
   virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ();
 
-  virtual void remove_all_constraints (void);
+  virtual void remove_all_constraints ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
 
@@ -63,10 +63,9 @@ protected:
 
   virtual void detach_callback (CosNotifyFilter::CallbackID callback);
 
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ();
 
 protected:
-
   /// Lock to serialize access to data members.
   TAO_SYNCH_MUTEX lock_;
 
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index ff86d67b4e7..56f8f4899d0 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -1,12 +1,11 @@
 #include "RT_Test_FilterFactory.h"
 
 
-
 #include "RT_Test_Filter.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
 
-TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory ()
 {
 }
 
@@ -29,7 +28,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_ptr filter_p
 }
 
 void
-TAO_Notify_Tests_RT_Test_FilterFactory::destroy (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::destroy ()
 {
   if (CORBA::is_nil(this->filter_poa_.in ()))
     return;
@@ -97,7 +96,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::get_filter (const TAO_Notify_Object::ID&
 }
 
 void
-TAO_Notify_Tests_RT_Test_FilterFactory::release (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::release ()
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index 67545801b90..84f14e864ef 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -34,7 +34,7 @@ class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_RT_Test_FilterFactory (void);
+  TAO_Notify_Tests_RT_Test_FilterFactory ();
 
   /// Destructor
   ~TAO_Notify_Tests_RT_Test_FilterFactory ();
@@ -42,7 +42,7 @@ public:
   ///= TAO_Notify_Tests_FilterFactory methods.
 
   virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_ptr filter_poa);
-  virtual void destroy (void);
+  virtual void destroy ();
 
   ///= CosNotifyFilter::FilterFactory methods
 
@@ -57,7 +57,7 @@ public:
 
 protected:
   /// Release this object.
-  virtual void release (void);
+  virtual void release ();
 
   /// The POA in which to activate the Filters.
   PortableServer::POA_var filter_poa_;
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
index fc060a2ffbd..5a8e6fe258d 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
@@ -32,12 +32,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index c80efafa937..be12aa0b2b0 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -22,7 +22,7 @@
 class TestSupplier
 : public POA_CosNotifyComm::StructuredPushSupplier
 {
-  virtual void disconnect_structured_push_supplier(void)
+  virtual void disconnect_structured_push_supplier()
   {
   }
 
@@ -35,7 +35,7 @@ class TestSupplier
 class TestConsumer
 : public POA_CosNotifyComm::StructuredPushConsumer
 {
-  virtual void disconnect_structured_push_consumer(void)
+  virtual void disconnect_structured_push_consumer()
   {
   }
 
@@ -291,12 +291,10 @@ 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)
     {
-
       // Create a new ecf, which should load itself from loadtest.xml
       CosNotifyChannelAdmin::EventChannelFactory_var
         cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 4f92d781e16..164aa7a40cd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -6,7 +6,7 @@
 #include "Name.h"
 #include "ace/Barrier.h"
 
-TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager (void)
+TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager ()
   : barrier_ (0)
   , active_suppliers_ (0)
   , active_consumers_ (0)
@@ -67,7 +67,7 @@ TAO_Notify_Tests_Activation_Manager::done (TAO_Notify_Tests_Periodic_Consumer* /
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::wait_for_completion (void)
+TAO_Notify_Tests_Activation_Manager::wait_for_completion ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -76,13 +76,13 @@ TAO_Notify_Tests_Activation_Manager::wait_for_completion (void)
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::supplier_count (void)
+TAO_Notify_Tests_Activation_Manager::supplier_count ()
 {
   return ACE_Utils::truncate_cast<int> (this->supplier_map_.current_size ());
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::consumer_count (void)
+TAO_Notify_Tests_Activation_Manager::consumer_count ()
 {
   return ACE_Utils::truncate_cast<int> (this->consumer_map_.current_size ());
 }
@@ -144,7 +144,7 @@ TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::activate_suppliers (void)
+TAO_Notify_Tests_Activation_Manager::activate_suppliers ()
 {
   TAO_Notify_Tests_PeriodicSupplier_Iterator iter(this->supplier_map_);
 
@@ -218,7 +218,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::write_ior (void)
+TAO_Notify_Tests_Activation_Manager::write_ior ()
 {
   PortableServer::ServantBase_var servant_var (this);
 
@@ -242,7 +242,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
+TAO_Notify_Tests_Activation_Manager::wait_for_start_signal ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -251,7 +251,7 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::start (void)
+TAO_Notify_Tests_Activation_Manager::start ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -261,7 +261,7 @@ TAO_Notify_Tests_Activation_Manager::start (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::signal_peer (void)
+TAO_Notify_Tests_Activation_Manager::signal_peer ()
 {
   CORBA::ORB_var orb;
   LOOKUP_MANAGER->resolve (orb);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index ad1133a038a..65010114bbf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -44,13 +44,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Activation_Manager : public TAO_No
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Activation_Manager (void);
+  TAO_Notify_Tests_Activation_Manager ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Activation_Manager ();
 
   /// Interface impl.
-  virtual void start (void);
+  virtual void start ();
 
   /// Register Supplier
   void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name);
@@ -64,16 +64,16 @@ public:
   void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name);
 
   // Activate the tasks for each supplier.
-  int activate_suppliers (void);
+  int activate_suppliers ();
 
   // Supplier Count
-  int supplier_count (void);
+  int supplier_count ();
 
   // Consumer Count
-  int consumer_count (void);
+  int consumer_count ();
 
   /// Wait till active suppliers and consumers are done.
-  void wait_for_completion (void);
+  void wait_for_completion ();
 
   /// TAO_Notify_Tests_Task_Callback methods
   virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier);
@@ -88,9 +88,9 @@ public:
   // Returns 1 if the file could be opened for read.
   int ior_input_file (const ACE_TCHAR *file_name);
 
-  void write_ior (void);
-  void wait_for_start_signal (void);
-  void signal_peer (void);
+  void write_ior ();
+  void wait_for_start_signal ();
+  void signal_peer ();
 
 protected:
   /// Lock to serialize internal state.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 3ebb4709a2d..8e462cdb5a2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -1,7 +1,6 @@
 #include "Application_Command.h"
 
 
-
 #include "tao/PortableServer/PortableServer.h"
 #include "LookupManager.h"
 #include "Name.h"
@@ -9,7 +8,7 @@
 #include "Driver_Base.h"
 #include "Priority_Mapping.h"
 
-TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void)
+TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command ()
   : dump_samples_ (0)
 {
 }
@@ -19,13 +18,13 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command ()
 }
 
 const char*
-TAO_Notify_Tests_Application_Command::get_name (void)
+TAO_Notify_Tests_Application_Command::get_name ()
 {
   return TAO_Notify_Tests_Application_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Application_Command::name (void)
+TAO_Notify_Tests_Application_Command::name ()
 {
   return TAO_Notify_Tests_Name::application_command;
 }
@@ -90,7 +89,7 @@ TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_init (void)
+TAO_Notify_Tests_Application_Command::handle_init ()
 {
   /// Fetch the root poa.
   PortableServer::POA_var root_poa;
@@ -108,7 +107,7 @@ TAO_Notify_Tests_Application_Command::handle_init (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void)
+TAO_Notify_Tests_Application_Command::handle_wait_for_completion ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n"));
 
@@ -119,7 +118,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_shutdown (void)
+TAO_Notify_Tests_Application_Command::handle_shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n"));
 
@@ -127,11 +126,10 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void)
   LOOKUP_MANAGER->resolve (driver);
 
   driver->shutdown ();
-
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_dump_stats (void)
+TAO_Notify_Tests_Application_Command::handle_dump_stats ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n"));
 
@@ -142,7 +140,7 @@ TAO_Notify_Tests_Application_Command::handle_dump_stats (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_run (void)
+TAO_Notify_Tests_Application_Command::handle_run ()
 {
   // Run the Consumers
 
@@ -158,7 +156,7 @@ TAO_Notify_Tests_Application_Command::handle_run (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_signal_peer (void)
+TAO_Notify_Tests_Application_Command::handle_signal_peer ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
@@ -167,7 +165,7 @@ TAO_Notify_Tests_Application_Command::handle_signal_peer (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_wait_to_start (void)
+TAO_Notify_Tests_Application_Command::handle_wait_to_start ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
@@ -178,7 +176,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_to_start (void)
 }
 
 void
-TAO_Notify_Tests_Application_Command::execute_i (void)
+TAO_Notify_Tests_Application_Command::execute_i ()
 {
   if (this->command_ == INIT)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index 7304c92558e..1f7ecaefee3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -29,7 +29,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Application_Command : public TAO_N
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Application_Command (void);
+  TAO_Notify_Tests_Application_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Application_Command ();
@@ -38,11 +38,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Get the command name.
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
 #ifdef HPUX_11
@@ -65,13 +65,13 @@ protected:
   int dump_samples_;
 
   ///= Handlers
-  virtual void handle_init (void);
-  void handle_run (void);
-  void handle_wait_for_completion (void);
-  void handle_shutdown (void);
-  void handle_dump_stats (void);
-  void handle_signal_peer (void);
-  void handle_wait_to_start (void);
+  virtual void handle_init ();
+  void handle_run ();
+  void handle_wait_for_completion ();
+  void handle_shutdown ();
+  void handle_dump_stats ();
+  void handle_signal_peer ();
+  void handle_wait_to_start ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 96dff4a1d34..c90be14789c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -6,8 +6,7 @@
 #include "ace/Log_Msg.h"
 
 
-
-TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
+TAO_Notify_Tests_Command::TAO_Notify_Tests_Command ()
   :next_ (0), command_ (INVALID)
 {
 }
@@ -29,7 +28,7 @@ TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command)
 }
 
 void
-TAO_Notify_Tests_Command::execute (void)
+TAO_Notify_Tests_Command::execute ()
 {
   if (this->command_ == INVALID)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 7321fa1a190..49bee3e6d5a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -36,7 +36,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command
   friend class TAO_Notify_Tests_Command_Builder;
 public:
   /// Constructor
-  TAO_Notify_Tests_Command (void);
+  TAO_Notify_Tests_Command ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Command ();
@@ -45,13 +45,13 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
     /// Implement command execution.
-  virtual void execute_i (void) = 0;
+  virtual void execute_i () = 0;
 
   /// Return the name of this command.
-  virtual const char* get_name (void)= 0;
+  virtual const char* get_name () = 0;
 
   ///= Each derived type must also implement the following signature:
-  // static const char* name (void);
+  // static const char* name ();
 
 protected:
   /// Next command after this one.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 94c10a875ba..1f5f3629983 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -6,8 +6,7 @@
 #include "Name.h"
 
 
-
-TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
+TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder ()
   : start_command_ (0),
     last_command_ (0)
 {
@@ -58,7 +57,7 @@ TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Notify_Tests_Command_Builder::fini (void)
+TAO_Notify_Tests_Command_Builder::fini ()
 {
         return 0;
 }
@@ -73,7 +72,7 @@ TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, T
 }
 
 void
-TAO_Notify_Tests_Command_Builder::execute (void)
+TAO_Notify_Tests_Command_Builder::execute ()
 {
   if (this->start_command_)
     this->start_command_->execute ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index ecb1789c077..2d391ce2495 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -2,8 +2,7 @@
 #include "Command_Factory.h"
 
 
-
-TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
+TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
index 8a9238ac437..2465bc2c227 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
@@ -26,13 +26,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Command_Factory (void);
+  TAO_Notify_Tests_Command_Factory ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Command_Factory ();
 
   /// Create the command.
-  virtual TAO_Notify_Tests_Command* create (void) = 0;
+  virtual TAO_Notify_Tests_Command* create () = 0;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index ad72f569edc..ba80b5e4382 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -4,14 +4,13 @@
 #include "Command_Factory_T.h"
 
 
-
 #include "ace/Dynamic_Service.h"
 #include "tao/debug.h"
 #include "Command_Builder.h"
 #include "Name.h"
 
 template <class COMMAND>
-TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T ()
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG, "Creating command factory for %s\n", COMMAND::name()));
@@ -37,13 +36,13 @@ TAO_Notify_Tests_Command_Factory_T<COMMAND>::init (int /*argc*/, ACE_TCHAR/*argv
 }
 
 template <class COMMAND> int
-TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini ()
 {
   return 0;
 }
 
 template <class COMMAND> TAO_Notify_Tests_Command*
-TAO_Notify_Tests_Command_Factory_T<COMMAND>::create (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::create ()
 {
   return new COMMAND ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index 6c2c7fd18e0..4cc0689e70c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -34,7 +34,7 @@ class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Facto
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Command_Factory_T (void);
+  TAO_Notify_Tests_Command_Factory_T ();
 
   /// Destructor
   ~TAO_Notify_Tests_Command_Factory_T ();
@@ -44,7 +44,7 @@ public:
   virtual int fini ();
 
   /// Create the <COMMAND> command.
-  TAO_Notify_Tests_Command* create (void);
+  TAO_Notify_Tests_Command* create ();
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index f64c5988d5f..2e8163b495d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -1,12 +1,11 @@
 #include "ConsumerAdmin_Command.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command ()
   :ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
@@ -16,19 +15,19 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command
 }
 
 const char*
-TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::get_name ()
 {
   return TAO_Notify_Tests_ConsumerAdmin_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_ConsumerAdmin_Command::name (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::name ()
 {
   return TAO_Notify_Tests_Name::consumer_admin_command;
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_create ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -44,7 +43,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
 
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions ()
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
@@ -70,7 +69,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos ()
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
@@ -80,7 +79,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_status ()
 {
   //@@ TODO:
 }
@@ -145,7 +144,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index c211128edf0..7b9a8b7cf82 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ConsumerAdmin_Command  : public TA
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_ConsumerAdmin_Command (void);
+  TAO_Notify_Tests_ConsumerAdmin_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_ConsumerAdmin_Command ();
@@ -37,14 +37,13 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
-
   /// = Data Members
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
@@ -75,10 +74,10 @@ protected:
   CosNotification::EventTypeSeq removed_;
 
   /// = Handlers
-  void handle_create (void);
-  void handle_subscriptions (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_subscriptions ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 615acf230fe..b9ef48ef248 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,9 +4,8 @@
 #include "Consumer_T.h"
 
 
-
 template <class Consumer_Traits>
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T ()
 {
 }
 
@@ -16,7 +15,7 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::~TAO_Notify_Tests_Consumer_T ()
 }
 
 template <class Consumer_Traits> typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier ()
 {
   return this->get_proxy ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 76a8e27df7f..e9cedf5d4db 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -50,13 +50,13 @@ class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Tra
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Consumer_T (void);
+  TAO_Notify_Tests_Consumer_T ();
 
   /// Destructor
   ~TAO_Notify_Tests_Consumer_T ();
 
   /// For backward compatibility. use <get_proxy> instead.
-  Proxy_Traits_PTR get_proxy_supplier (void);
+  Proxy_Traits_PTR get_proxy_supplier ();
 
   /// Send subscription_change
   virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 7d967fc85e2..5dec5dda194 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -1,10 +1,9 @@
 #include "Direct_Consumer.h"
 
 
-
 #include "LookupManager.h"
 
-TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void)
+TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer ()
 {
 }
 
@@ -13,7 +12,7 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer ()
 }
 
 void
-TAO_Notify_Tests_Direct_Consumer::connect (void)
+TAO_Notify_Tests_Direct_Consumer::connect ()
 {
   // Get the POA
   PortableServer::POA_var poa;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index 23817fc250b..c6e06c0eacf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -26,13 +26,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Consumer : public TAO_Notif
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Direct_Consumer (void);
+  TAO_Notify_Tests_Direct_Consumer ();
 
   /// Destructor
   ~TAO_Notify_Tests_Direct_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index e9c66c60d25..2751578c16e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 #include "LookupManager.h"
 
 TAO_Notify_Tests_Direct_Supplier::TAO_Notify_Tests_Direct_Supplier (ACE_CString& target)
@@ -18,7 +17,7 @@ TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier ()
 }
 
 void
-TAO_Notify_Tests_Direct_Supplier::connect (void)
+TAO_Notify_Tests_Direct_Supplier::connect ()
 {
   // Get the POA
   PortableServer::POA_var poa;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index b06ea5f9afc..695c9357a91 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -32,7 +32,7 @@ public:
   ~TAO_Notify_Tests_Direct_Supplier ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 
   // Send one event. Bypass sending to the Notify and send directly to taget consumer.
   virtual void send_event (const CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 45850fbc5e2..94502a02c92 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -1,7 +1,6 @@
 #include "Driver.h"
 
 
-
 #include "ace/Dynamic_Service.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Arg_Shifter.h"
@@ -61,7 +60,7 @@ check_supported_priorities (CORBA::ORB_ptr orb)
 }
 
 /*****************************************************************/
-TAO_Notify_Tests_Worker::TAO_Notify_Tests_Worker (void) :
+TAO_Notify_Tests_Worker::TAO_Notify_Tests_Worker () :
   cmd_builder_ (0)
 {
 }
@@ -73,7 +72,7 @@ TAO_Notify_Tests_Worker::command_builder (TAO_Notify_Tests_Command_Builder* cmd_
 }
 
 int
-TAO_Notify_Tests_Worker::svc (void)
+TAO_Notify_Tests_Worker::svc ()
 {
 #if 0
   ACE_hthread_t current;
@@ -108,7 +107,7 @@ TAO_Notify_Tests_Worker::svc (void)
 
 /*****************************************************************/
 
-TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker (void)
+TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker ()
 {
 }
 
@@ -125,7 +124,7 @@ TAO_Notify_Tests_ORB_Run_Worker::run_period (ACE_Time_Value run_period)
 }
 
 int
-TAO_Notify_Tests_ORB_Run_Worker::svc (void)
+TAO_Notify_Tests_ORB_Run_Worker::svc ()
 {
 #if 0
   // ACE_Thread::getprio() fails on systems that do not support thread
@@ -152,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&)
     {
@@ -162,7 +160,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
 
 /*****************************************************************/
 
-TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver (void)
+TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver ()
   :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0), skip_priority_levels_check_ (0)
 {
   this->activation_manager_ = new TAO_Notify_Tests_Activation_Manager ();
@@ -262,7 +260,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-TAO_Notify_Tests_Driver::run (void)
+TAO_Notify_Tests_Driver::run ()
 {
   // Task activation flags.
   long flags =
@@ -310,7 +308,7 @@ TAO_Notify_Tests_Driver::run (void)
 }
 
 void
-TAO_Notify_Tests_Driver::shutdown (void)
+TAO_Notify_Tests_Driver::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 054eba9e8f9..a5401c3cfe5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -33,7 +33,7 @@ class TAO_Notify_Tests_Activation_Manager;
 class TAO_Notify_Tests_Worker : public ACE_Task_Base
 {
 public:
-  TAO_Notify_Tests_Worker (void);
+  TAO_Notify_Tests_Worker ();
   // ctor
 
   /// Set the command builder.
@@ -42,7 +42,7 @@ public:
   virtual int svc ();
   // The thread entry point.
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The command builder
@@ -50,7 +50,6 @@ private:
 };
 
 
-
 /**
  * Run a server thread
  *
@@ -59,7 +58,7 @@ private:
 class TAO_Notify_Tests_ORB_Run_Worker : public ACE_Task_Base
 {
 public:
-  TAO_Notify_Tests_ORB_Run_Worker (void);
+  TAO_Notify_Tests_ORB_Run_Worker ();
   // ctor
 
   void orb (CORBA::ORB_ptr orb);
@@ -88,7 +87,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver : public TAO_Notify_Tests_D
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Driver (void);
+  TAO_Notify_Tests_Driver ();
 
   /// Destructor
   ~TAO_Notify_Tests_Driver ();
@@ -97,10 +96,10 @@ public:
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Execute the commands.
-  void run (void);
+  void run ();
 
   /// Shutdown
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   /// Parse command line parameters.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
index 4a0c994ac33..fc2e00cc992 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
@@ -26,7 +26,7 @@ public:
   virtual ~TAO_Notify_Tests_Driver_Base () {};
 
   /// Shutdown
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 16745bb20e5..68d4ad61f5e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -2,13 +2,12 @@
 #include "ace/Log_Msg.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
 #include "orbsvcs/Notify/Service.h"
 
-TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command (void)
+TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command ()
   : collocated_ (0)
 {
 }
@@ -18,13 +17,13 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command ()
 }
 
 const char*
-TAO_Notify_Tests_EventChannel_Command::get_name (void)
+TAO_Notify_Tests_EventChannel_Command::get_name ()
 {
   return TAO_Notify_Tests_EventChannel_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_EventChannel_Command::name (void)
+TAO_Notify_Tests_EventChannel_Command::name ()
 {
   return TAO_Notify_Tests_Name::event_channel_command;
 }
@@ -85,7 +84,7 @@ TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
+TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf ()
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
@@ -124,7 +123,7 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_create (void)
+TAO_Notify_Tests_EventChannel_Command::handle_create ()
 {
   if (this->collocated_ == 1)
     {
@@ -148,7 +147,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
+TAO_Notify_Tests_EventChannel_Command::handle_destroy ()
 {
   ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ()));
   CosNotifyChannelAdmin::EventChannel_var ec;
@@ -158,7 +157,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
   ec->destroy ();
 }
 void
-TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
+TAO_Notify_Tests_EventChannel_Command::handle_set_qos ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -168,13 +167,13 @@ TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_status (void)
+TAO_Notify_Tests_EventChannel_Command::handle_status ()
 {
   //@@ TODO: Implement
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::execute_i (void)
+TAO_Notify_Tests_EventChannel_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 3ffc40f87d4..aa45aef7489 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -32,7 +32,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_EventChannel_Command : public TAO_
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_EventChannel_Command (void);
+  TAO_Notify_Tests_EventChannel_Command ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_EventChannel_Command ();
@@ -41,11 +41,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   ///= Data Members
@@ -76,13 +76,13 @@ protected:
   CORBA::Boolean collocated_;
 
   /// Helper method to create a collocated ECF.
-  void create_collocated_ecf (void);
+  void create_collocated_ecf ();
 
   /// = Handlers
-  void handle_create (void);
-  void handle_destroy (void);
-  void handle_set_qos (void);
-  void handle_status (void);
+  void handle_create ();
+  void handle_destroy ();
+  void handle_set_qos ();
+  void handle_status ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 1822f47896d..9311312b506 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,7 +1,6 @@
 #include "Factories_Define.h"
 
 
-
 #include "Name.h"
 #include "Command_Factory_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 93fe8e5af33..9932b190831 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -2,11 +2,10 @@
 #include "ace/Log_Msg.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 
-TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command (void)
+TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command ()
 {
 }
 
@@ -15,13 +14,13 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command ()
 }
 
 const char*
-TAO_Notify_Tests_Filter_Command::get_name (void)
+TAO_Notify_Tests_Filter_Command::get_name ()
 {
   return TAO_Notify_Tests_Filter_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Filter_Command::name (void)
+TAO_Notify_Tests_Filter_Command::name ()
 {
   return TAO_Notify_Tests_Name::filter_command;
 }
@@ -96,7 +95,7 @@ TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
+TAO_Notify_Tests_Filter_Command::handle_create_filter_factory ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -109,7 +108,7 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
+TAO_Notify_Tests_Filter_Command::handle_create_filter ()
 {
   CosNotifyFilter::FilterFactory_var ff;
 
@@ -122,7 +121,7 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
+TAO_Notify_Tests_Filter_Command::handle_add_constraint ()
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -139,7 +138,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
+TAO_Notify_Tests_Filter_Command::handle_add_filter ()
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -153,7 +152,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
+TAO_Notify_Tests_Filter_Command::handle_destroy_filter ()
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -163,7 +162,7 @@ TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::execute_i (void)
+TAO_Notify_Tests_Filter_Command::execute_i ()
 {
   if (this->command_ == CREATE_FACTORY)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 3389c9b0186..f679a6682b4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Filter_Command : public TAO_Notify
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Filter_Command (void);
+  TAO_Notify_Tests_Filter_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Filter_Command ();
@@ -37,14 +37,13 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
-
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
 #undef COMMAND
@@ -67,11 +66,11 @@ protected:
   ACE_CString constraint_;
 
   ///= Handlers
-  void handle_create_filter_factory (void);
-  void handle_create_filter (void);
-  void handle_add_constraint (void);
-  void handle_add_filter (void);
-  void handle_destroy_filter (void);
+  void handle_create_filter_factory ();
+  void handle_create_filter ();
+  void handle_add_constraint ();
+  void handle_add_filter ();
+  void handle_destroy_filter ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 492a6a2f2bf..c06c2834a62 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -2,10 +2,9 @@
 #include "ace/OS_NS_string.h"
 
 
-
 #include "Name.h"
 
-TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void)
+TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager ()
   : app_ (0)
     , activation_manager_ (0)
     , priority_mapping_ (0)
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 6b1db928a77..44fe125c79e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -36,7 +36,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_LookupManager (void);
+  TAO_Notify_Tests_LookupManager ();
 
   /// Destructor
   ~TAO_Notify_Tests_LookupManager ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index f86ec08f39e..e0594607bd6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -1,7 +1,6 @@
 #include "Name.h"
 
 
-
 #define TAO_Notify_Tests_DECLARE_NAME(target, name) \
 const char* const TAO_Notify_Tests_Name::target = name;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index 4851b4e8013..5b4e67bf58e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -2,7 +2,7 @@
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 
-Notify_Test_Client::Notify_Test_Client (void)
+Notify_Test_Client::Notify_Test_Client ()
 : num_clients_( 0 )
 , done_( false )
 {
@@ -77,7 +77,7 @@ Notify_Test_Client::init_ORB (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Notify_Test_Client::resolve_naming_service (void)
+Notify_Test_Client::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -91,7 +91,7 @@ Notify_Test_Client::resolve_naming_service (void)
 }
 
 void
-Notify_Test_Client::resolve_Notify_factory (void)
+Notify_Test_Client::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -105,7 +105,7 @@ Notify_Test_Client::resolve_Notify_factory (void)
 }
 
 int
-Notify_Test_Client::ORB_run (void)
+Notify_Test_Client::ORB_run ()
 {
   while (! is_done())
   {
@@ -156,26 +156,26 @@ Notify_Test_Client::is_done () const
 }
 
 CORBA::ORB_ptr
-Notify_Test_Client::orb (void)
+Notify_Test_Client::orb ()
 {
   return this->orb_.in ();
 }
 
 
 PortableServer::POA_ptr
-Notify_Test_Client::root_poa (void)
+Notify_Test_Client::root_poa ()
 {
   return this->root_poa_.in ();
 }
 
 CosNaming::NamingContext_ptr
-Notify_Test_Client::naming_context (void)
+Notify_Test_Client::naming_context ()
 {
   return this->naming_context_.in ();
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-Notify_Test_Client::notify_factory (void)
+Notify_Test_Client::notify_factory ()
 {
   return this->notify_factory_.in ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 93f28c2c2c1..5a8e6b551e1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -32,7 +32,7 @@ class TAO_Notify_Tests_Peer;
 class TAO_NOTIFY_TEST_Export Notify_Test_Client
 {
 public:
-  Notify_Test_Client (void);
+  Notify_Test_Client ();
   virtual ~Notify_Test_Client ();
 
   /// starts the orb and resolves the notify factory via a naming service.
@@ -42,7 +42,7 @@ public:
   virtual int parse_args (int argc, ACE_TCHAR* argv[]);
 
   /// Call ORB::run to accept requests.
-  int ORB_run (void);
+  int ORB_run ();
   int ORB_run (ACE_Time_Value& tv);
 
   /// How many clients will call consumer_done.
@@ -55,16 +55,16 @@ public:
   bool is_done () const;
 
   /// Access the ORB.  This class retains ownership.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Access the Root POA.  This class retains ownership.
-  PortableServer::POA_ptr root_poa (void);
+  PortableServer::POA_ptr root_poa ();
 
   /// Access the Naming Context.  This class retains ownership.
-  CosNaming::NamingContext_ptr naming_context (void);
+  CosNaming::NamingContext_ptr naming_context ();
 
   /// Access the Notify Factory.  This class retains ownership.
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory ();
 
   /// Create an Event Channel.  Ownership is passed to the caller.
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
@@ -77,10 +77,10 @@ protected:
                 ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   // = Data Members
   /// Reference to the root poa.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 42a2d0a676d..88d48237464 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -3,7 +3,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
+TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser ()
 {
 }
 
@@ -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/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 655b44e80cf..ecc83844eb0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -27,7 +27,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Options_Parser
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Options_Parser (void);
+  TAO_Notify_Tests_Options_Parser ();
 
   /// Destructor
   ~TAO_Notify_Tests_Options_Parser ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index fce46f2b1f9..b8ce5e420d6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -9,7 +9,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void)
+TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer ()
   : poa_name_ (TAO_Notify_Tests_Name::root_poa)
   , ifgop_ (CosNotifyChannelAdmin::OR_OP)
 {
@@ -75,7 +75,7 @@ TAO_Notify_Tests_Peer::set_name (ACE_CString& name)
 }
 
 const ACE_CString&
-TAO_Notify_Tests_Peer::get_name (void)
+TAO_Notify_Tests_Peer::get_name ()
 {
   return this->name_;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index d4ee7d05813..0583742a62f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -29,7 +29,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Peer (void);
+  TAO_Notify_Tests_Peer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Peer ();
@@ -45,10 +45,9 @@ public:
 
   // Accessor to set/get our name.
   void set_name (ACE_CString& name);
-  const ACE_CString& get_name (void);
+  const ACE_CString& get_name ();
 
 protected:
-
   /// My name.
   ACE_CString name_;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 1e65754e8f5..a6d350b7010 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -10,7 +10,7 @@
 #include "orbsvcs/NotifyExtC.h"
 
 template <class Peer_Traits>
-TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T ()
   : proxy_id_ (0)
 {
 }
@@ -22,14 +22,14 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T ()
 
 template <class Peer_Traits>
 typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy ()
 {
   return proxy_.in ();
 }
 
 template <class Peer_Traits>
 typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
-TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::activate ()
 {
   return this->_this ();
 }
@@ -76,7 +76,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr)
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect ()
 {
   // Get the POA
   PortableServer::POA_var poa;
@@ -118,7 +118,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status ()
 {
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   try
@@ -158,7 +158,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
@@ -195,7 +195,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index e74225f343b..263b2df4803 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -41,7 +41,7 @@ class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Peer_T (void);
+  TAO_Notify_Tests_Peer_T ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_Peer_T ();
@@ -55,29 +55,29 @@ public:
   void connect (Admin_Traits_PTR admin_ptr);
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 
   // Disconnect from the Peer.
-  void disconnect (void);
+  void disconnect ();
 
   /// Set Qos
   void set_qos (CosNotification::QoSProperties& qos);
 
   /// Dump status
-  void status (void);
+  void status ();
 
   // Accessor for <proxy_>.
-  Proxy_Traits_PTR get_proxy (void);
+  Proxy_Traits_PTR get_proxy ();
 
   /// Deactivate the object.
-  void deactivate (void);
+  void deactivate ();
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 protected:
   /// Activate this object in the default POA.
-  virtual Peer_Traits_PTR activate (void);
+  virtual Peer_Traits_PTR activate ();
 
   ///= To be implemented by specializations.
 
@@ -92,7 +92,7 @@ protected:
                                          , CosNotification::QoSProperties& qos) = 0;
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void) = 0;
+  virtual void disconnect_from_proxy () = 0;
 
   // = Data Members
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index b479801e745..87615780943 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -13,7 +13,7 @@
 
 int WARMUP_COUNT = 10;
 
-TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void)
+TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer ()
   : count_ (-2)
   , warmup_countdown_ (WARMUP_COUNT)
   , max_count_ (-1)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 3ce0155662e..423b38510a5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -34,7 +34,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer : public TAO_Not
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Consumer (void);
+  TAO_Notify_Tests_Periodic_Consumer ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Consumer ();
@@ -49,7 +49,6 @@ public:
   void dump_stats (ACE_TCHAR* msg, int dump_samples);
 
 protected:
-
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification);
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index d3971798566..fec946fe400 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -8,7 +8,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command ()
 {
 }
 
@@ -17,13 +17,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::get_name ()
 {
   return TAO_Notify_Tests_Periodic_Consumer_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Consumer_Command::name (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::name ()
 {
   return TAO_Notify_Tests_Name::periodic_consumer_command;
 }
@@ -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..
         {
@@ -141,7 +140,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 TAO_Notify_Tests_Periodic_Consumer*
-TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::consumer ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
 
@@ -161,13 +160,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos ()
 {
   this->consumer ()->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_create ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
@@ -180,7 +179,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
@@ -190,7 +189,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
@@ -200,7 +199,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
   if (consumer == 0)
@@ -210,7 +209,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_status ()
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
@@ -221,7 +220,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index fab2d15add8..12778f61a6e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -30,7 +30,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer_Command : public
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Consumer_Command (void);
+  TAO_Notify_Tests_Periodic_Consumer_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Consumer_Command ();
@@ -39,11 +39,11 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
   ///= Data Members
@@ -75,15 +75,15 @@ protected:
 
   ///= Methods
   // Retreive the consumer.
-  TAO_Notify_Tests_Periodic_Consumer* consumer (void);
+  TAO_Notify_Tests_Periodic_Consumer* consumer ();
 
   ///= Handlers
-  void handle_create (void);
-  void handle_subscriptions (void);
-  void handle_disconnect (void);
-  void handle_deactivate (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_subscriptions ();
+  void handle_disconnect ();
+  void handle_deactivate ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 6fb6b4f1306..7819c118b08 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -13,7 +13,7 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void)
+TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier ()
   : barrier_ (0),
     priority_ (0),
     period_ (0),
@@ -172,7 +172,7 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
+TAO_Notify_Tests_Periodic_Supplier::send_warmup_events ()
 {
   int WARMUP_COUNT = 10;
 
@@ -183,7 +183,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
+TAO_Notify_Tests_Periodic_Supplier::send_prologue ()
 {
   // populate event.
   // send the base time and max count.
@@ -208,7 +208,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
+TAO_Notify_Tests_Periodic_Supplier::handle_svc ()
 {
   this->send_prologue ();
 
@@ -291,7 +291,7 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
 }
 
 int
-TAO_Notify_Tests_Periodic_Supplier::svc (void)
+TAO_Notify_Tests_Periodic_Supplier::svc ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 77000e7abd5..f1a56c220d8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -33,7 +33,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier : public TAO_Not
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Supplier (void);
+  TAO_Notify_Tests_Periodic_Supplier ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Supplier ();
@@ -54,18 +54,17 @@ public:
   void dump_stats (ACE_TCHAR* msg, int dump_samples);
 
   /// Get the name of the proxy
-  const char* proxy_name (void);
+  const char* proxy_name ();
 
 protected:
-
   /// svc method.
-  void handle_svc (void);
+  void handle_svc ();
 
   /// Send a few events before the actual measurements.
-  void send_warmup_events (void);
+  void send_warmup_events ();
 
   /// Send Prologue
-  void send_prologue (void);
+  void send_prologue ();
 
   /// All tasks synch at this barrier.
   ACE_Barrier* barrier_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 893ec715baa..e198d73f345 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -7,7 +7,7 @@
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command ()
 {
 }
 
@@ -16,13 +16,13 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::get_name ()
 {
   return TAO_Notify_Tests_Periodic_Supplier_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_Periodic_Supplier_Command::name (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::name ()
 {
   return TAO_Notify_Tests_Name::periodic_supplier_command;
 }
@@ -130,7 +130,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 TAO_Notify_Tests_Periodic_Supplier*
-TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::supplier ()
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
@@ -147,7 +147,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_create ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
@@ -159,7 +159,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
@@ -169,7 +169,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier ();
   if (supplier == 0)
@@ -179,7 +179,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
@@ -189,7 +189,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_status ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
@@ -200,7 +200,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos ()
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
@@ -211,7 +211,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 8d2be6a6a5b..e0d01d2559d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -30,7 +30,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier_Command : public
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_Periodic_Supplier_Command (void);
+  TAO_Notify_Tests_Periodic_Supplier_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_Periodic_Supplier_Command ();
@@ -39,14 +39,13 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
-
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
 #undef COMMAND
@@ -75,15 +74,15 @@ protected:
 
   ///= Methods
   // Retreive the suppliers.
-  TAO_Notify_Tests_Periodic_Supplier* supplier (void);
+  TAO_Notify_Tests_Periodic_Supplier* supplier ();
 
   ///= Handlers
-  void handle_create (void);
-  void handle_offers (void);
-  void handle_disconnect (void);
-  void handle_deactivate (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_offers ();
+  void handle_disconnect ();
+  void handle_deactivate ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 19e60fa7c72..6a663b6b6a9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -1,8 +1,7 @@
 #include "Priority_Mapping.h"
 
 
-
-TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
+TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
index 2af5dd5c60b..f06f83f368e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
@@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_Notify_Tests_Priority_Mapping (void);
+  virtual ~TAO_Notify_Tests_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (CORBA::Short corba_priority,
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 9358f2326ba..d0a5f3ad66e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -5,15 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
+TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits ()
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer (void)
+TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer ()
 {
 }
 
@@ -28,14 +27,14 @@ TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee
 }
 
 void
-TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void)
+TAO_Notify_Tests_PushConsumer::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
   this->proxy_->disconnect_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
+TAO_Notify_Tests_PushConsumer::disconnect_push_consumer ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 27f11806aa7..d547df8b1cb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer_Traits
 {
 public:
-  TAO_Notify_Tests_PushConsumer_Traits (void);
+  TAO_Notify_Tests_PushConsumer_Traits ();
 
   typedef CosNotifyComm::PushConsumer INTERFACE;
   typedef CosNotifyComm::PushConsumer_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer : public TAO_Notify_T
 
 public:
   /// Constructor
-  TAO_Notify_Tests_PushConsumer (void);
+  TAO_Notify_Tests_PushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_PushConsumer ();
@@ -72,10 +72,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = PushConsumer methods
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Default does nothing.
   void push (const CORBA::Any & data);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index e32616ff243..caaf7bbe6d3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -5,15 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
+TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits ()
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier (void)
+TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier ()
 {
 }
 
@@ -36,14 +35,14 @@ TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee
 }
 
 void
-TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void)
+TAO_Notify_Tests_PushSupplier::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
   this->proxy_->disconnect_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void)
+TAO_Notify_Tests_PushSupplier::disconnect_push_supplier ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index a0889463f96..d87ee30deb0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier_Traits
 {
 public:
-  TAO_Notify_Tests_PushSupplier_Traits (void);
+  TAO_Notify_Tests_PushSupplier_Traits ();
 
   typedef CosNotifyComm::PushSupplier INTERFACE;
   typedef CosNotifyComm::PushSupplier_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier : public TAO_Notify_T
 
 public:
   /// Constructor
-  TAO_Notify_Tests_PushSupplier (void);
+  TAO_Notify_Tests_PushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_PushSupplier ();
@@ -75,10 +75,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = PushSupplier method
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 4e6aeca4a33..7e7aed692d5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -1,7 +1,6 @@
 #include "Relay_Consumer.h"
 
 
-
 #include "LookupManager.h"
 
 TAO_Notify_Tests_Relay_Consumer::TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination)
@@ -14,7 +13,7 @@ TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer ()
 }
 
 void
-TAO_Notify_Tests_Relay_Consumer::connect (void)
+TAO_Notify_Tests_Relay_Consumer::connect ()
 {
   TAO_Notify_Tests_Direct_Consumer::connect ();
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index e41b059d7cc..ffd3c21b456 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -32,10 +32,9 @@ public:
   ~TAO_Notify_Tests_Relay_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (void);
+  virtual void connect ();
 
-  void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
-                              );
+  void push_structured_event (const CosNotification::StructuredEvent &/*notification*/);
 
 protected:
   /// Destination object.
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index a9d59c40b55..78c0ffbe9a1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -5,15 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
+TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits ()
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer (void)
+TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer ()
 {
 }
 
@@ -28,14 +27,14 @@ TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
   this->proxy_->disconnect_sequence_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 6bb54ea72d0..3398d342583 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer_Traits
 {
 public:
-  TAO_Notify_Tests_SequencePushConsumer_Traits (void);
+  TAO_Notify_Tests_SequencePushConsumer_Traits ();
 
   typedef CosNotifyComm::SequencePushConsumer INTERFACE;
   typedef CosNotifyComm::SequencePushConsumer_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer : public TAO_
 
 public:
   /// Constructor
-  TAO_Notify_Tests_SequencePushConsumer (void);
+  TAO_Notify_Tests_SequencePushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_SequencePushConsumer ();
@@ -72,10 +72,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = SequencePushConsumer methods
-  virtual void disconnect_sequence_push_consumer (void);
+  virtual void disconnect_sequence_push_consumer ();
 
  /// Default does nothing.
   virtual void push_structured_events (
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index bdb78afc0d3..6c3b5ce66d0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -5,15 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
+TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits ()
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier (void)
+TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier ()
 {
 }
 
@@ -37,14 +36,14 @@ TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
   this->proxy_->disconnect_sequence_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index d047bcf2f02..57d4e540967 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier_Traits
 {
 public:
-  TAO_Notify_Tests_SequencePushSupplier_Traits (void);
+  TAO_Notify_Tests_SequencePushSupplier_Traits ();
 
   typedef CosNotifyComm::SequencePushSupplier INTERFACE;
   typedef CosNotifyComm::SequencePushSupplier_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier : public TAO_
 
 public:
   /// Constructor
-  TAO_Notify_Tests_SequencePushSupplier (void);
+  TAO_Notify_Tests_SequencePushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_SequencePushSupplier ();
@@ -75,10 +75,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = SequencePushSupplier method
-  virtual void disconnect_sequence_push_supplier (void);
+  virtual void disconnect_sequence_push_supplier ();
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index 45d6bd1add4..f05dad97be8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -1,8 +1,7 @@
 #include "StructuredEvent.h"
 
 
-
-TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
+TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent ()
 {
 }
 
@@ -42,7 +41,7 @@ TAO_Notify_Tests_StructuredEvent::type (const char* domain, const char* type)
 }
 
 const char*
-TAO_Notify_Tests_StructuredEvent::type (void)
+TAO_Notify_Tests_StructuredEvent::type ()
 {
   return event_.header.fixed_header.event_type.type_name;
 }
@@ -80,7 +79,7 @@ TAO_Notify_Tests_StructuredEvent::payload (CORBA::Any& value)
 }
 
 CosNotification::StructuredEvent&
-TAO_Notify_Tests_StructuredEvent::event (void)
+TAO_Notify_Tests_StructuredEvent::event ()
 {
   return this->event_;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index e7216cff97e..605b84bfb95 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredEvent
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_StructuredEvent (void);
+  TAO_Notify_Tests_StructuredEvent ();
   TAO_Notify_Tests_StructuredEvent (const char* name);
   TAO_Notify_Tests_StructuredEvent (const char* domain, const char* type);
   TAO_Notify_Tests_StructuredEvent (const char* name, const char* domain, const char* type);
@@ -37,7 +37,7 @@ public:
   void name (const char* name);
   void type (const char* domain, const char* type);
 
-  const char* type (void);
+  const char* type ();
 
   /// add <name,value> to optional header sequence.
   void opt_header (const char* name, CORBA::Any& value);
@@ -52,7 +52,7 @@ public:
   void payload (CORBA::Any& value);
 
   /// access the underlying event.
-  CosNotification::StructuredEvent& event (void);
+  CosNotification::StructuredEvent& event ();
 
 private:
   CosNotification::StructuredEvent event_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index 3c47d0c1201..1de6725538b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -5,15 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
+TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits ()
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer (void)
+TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer ()
 {
 }
 
@@ -28,14 +27,14 @@ TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR prox
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
   this->proxy_->disconnect_structured_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 3701c977647..76a878d02ae 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer_Traits
 {
 public:
-  TAO_Notify_Tests_StructuredPushConsumer_Traits (void);
+  TAO_Notify_Tests_StructuredPushConsumer_Traits ();
 
   typedef CosNotifyComm::StructuredPushConsumer INTERFACE;
   typedef CosNotifyComm::StructuredPushConsumer_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer : public TA
 
 public:
   /// Constructor
-  TAO_Notify_Tests_StructuredPushConsumer (void);
+  TAO_Notify_Tests_StructuredPushConsumer ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_StructuredPushConsumer ();
@@ -72,10 +72,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = StructuredPushConsumer methods
-  virtual void disconnect_structured_push_consumer (void);
+  virtual void disconnect_structured_push_consumer ();
 
  /// Default does nothing.
   virtual void push_structured_event (
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index b5ef2bfc9f6..609a65e2798 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -5,15 +5,14 @@
 #endif /* __ACE_INLINE__ */
 
 
-
-TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
+TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits ()
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier (void)
+TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier ()
 {
 }
 
@@ -38,14 +37,14 @@ TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR prox
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy ()
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
   this->proxy_->disconnect_structured_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier ()
 {
   bool this_method_used_only_by_notify_service = false;
   ACE_ASSERT(this_method_used_only_by_notify_service);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 72a1bf22d23..906df4ed279 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -32,7 +32,7 @@ public:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier_Traits
 {
 public:
-  TAO_Notify_Tests_StructuredPushSupplier_Traits (void);
+  TAO_Notify_Tests_StructuredPushSupplier_Traits ();
 
   typedef CosNotifyComm::StructuredPushSupplier INTERFACE;
   typedef CosNotifyComm::StructuredPushSupplier_ptr PTR;
@@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier : public TA
 
 public:
   /// Constructor
-  TAO_Notify_Tests_StructuredPushSupplier (void);
+  TAO_Notify_Tests_StructuredPushSupplier ();
 
   /// Destructor
   virtual ~TAO_Notify_Tests_StructuredPushSupplier ();
@@ -75,10 +75,10 @@ protected:
   virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (void);
+  virtual void disconnect_from_proxy ();
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (void);
+  virtual void disconnect_structured_push_supplier ();
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 5735508d687..80ba61097f1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -1,12 +1,11 @@
 #include "SupplierAdmin_Command.h"
 
 
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command (void)
+TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command ()
 : ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
@@ -16,13 +15,13 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command
 }
 
 const char*
-TAO_Notify_Tests_SupplierAdmin_Command::get_name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::get_name ()
 {
   return TAO_Notify_Tests_SupplierAdmin_Command::name ();
 }
 
 const char*
-TAO_Notify_Tests_SupplierAdmin_Command::name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::name ()
 {
   return TAO_Notify_Tests_Name::supplier_admin_command;
 }
@@ -88,7 +87,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_create ()
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -103,7 +102,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_offers ()
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -129,12 +128,12 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_status (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_status ()
 {
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos ()
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -144,7 +143,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::execute_i (void)
+TAO_Notify_Tests_SupplierAdmin_Command::execute_i ()
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index aa4119f149d..e7b13a30048 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SupplierAdmin_Command : public TAO
 {
 public:
   /// Constructor
-  TAO_Notify_Tests_SupplierAdmin_Command (void);
+  TAO_Notify_Tests_SupplierAdmin_Command ();
 
   /// Destructor
   ~TAO_Notify_Tests_SupplierAdmin_Command ();
@@ -37,14 +37,13 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (void);
+  virtual void execute_i ();
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const char* get_name ();
+  static const char* name ();
 
 protected:
-
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
 #undef COMMAND
@@ -74,10 +73,10 @@ protected:
   CosNotification::EventTypeSeq removed_;
 
   /// = Handlers
-  void handle_create (void);
-  void handle_offers (void);
-  void handle_status (void);
-  void handle_set_qos (void);
+  void handle_create ();
+  void handle_offers ();
+  void handle_status ();
+  void handle_set_qos ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 33fb119d383..170fa2a4ab7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,9 +4,8 @@
 #include "Supplier_T.h"
 
 
-
 template <class Supplier_Traits>
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T ()
 {
 }
 
@@ -16,7 +15,7 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::~TAO_Notify_Tests_Supplier_T ()
 }
 
 template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer ()
 {
   return this->get_proxy ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 8b9e22292c8..43d4e6310b2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -50,13 +50,13 @@ class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Tra
 
 public:
   /// Constructor
-  TAO_Notify_Tests_Supplier_T (void);
+  TAO_Notify_Tests_Supplier_T ();
 
   /// Destructor
   ~TAO_Notify_Tests_Supplier_T ();
 
   /// For backward compatibility. use <get_proxy> instead.
-  Proxy_Traits_PTR get_proxy_consumer (void);
+  Proxy_Traits_PTR get_proxy_consumer ();
 
   /// Send offer change.
   void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
index 89e9ca09e88..63780e8d631 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
@@ -1,5 +1,5 @@
 #include "Task_Callback.h"
 
-TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback (void)
+TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback ()
 {
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
index fa25715f91d..5961ff0407e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
@@ -26,7 +26,7 @@ class TAO_Notify_Tests_Periodic_Consumer;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Task_Callback
 {
 public:
-  virtual ~TAO_Notify_Tests_Task_Callback (void);
+  virtual ~TAO_Notify_Tests_Task_Callback ();
   virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier) = 0;
   virtual void done (TAO_Notify_Tests_Periodic_Consumer* consumer) = 0;
 };
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 89ee2135cd5..98efa2bd726 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -9,12 +9,12 @@
 ACE_High_Res_Timer::global_scale_factor_type Task_Stats::gsf_ =
   ACE_High_Res_Timer::global_scale_factor ();
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
 
-Task_Stats::Task_Stats (void)
+Task_Stats::Task_Stats ()
   : base_time_(0),
     end_time_ (0),
     max_samples_ (0),
@@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->time_inv_;
   delete[] this->time_exec_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index 90c1e76fec5..15c70bfd8c3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -26,7 +26,7 @@
 class TAO_NOTIFY_TEST_Export Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -41,10 +41,10 @@ class TAO_NOTIFY_TEST_Export Task_Stats
 {
  public:
   /// Constructor
-  Task_Stats (void);
+  Task_Stats ();
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Useful Global Scale Factor
   static ACE_High_Res_Timer::global_scale_factor_type gsf_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index b6ddc735664..fd735f871b4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -71,7 +71,7 @@ Notify_Sequence_Push_Consumer::push_structured_events(
   if (this->count_ >= this->expected_)
   {
     this->client_.consumer_done (this);
-    ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_ );
+    ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_);
     double events_per_ms = static_cast<double>(this->count_) /
       static_cast<double>(totaltime.msec());
     ACE_DEBUG((LM_DEBUG, "\nConsumer %s received %d at %.2f events/ms\n", name_.c_str(), this->count_, events_per_ms ));
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 034893d48e2..c27ddbc0c90 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -65,7 +65,7 @@ Notify_Structured_Push_Consumer::push_structured_event(
   if (this->count_ == this->expected_)
     {
       this->client_.consumer_done (this);
-      ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_ );
+      ACE_Time_Value totaltime = ( ACE_OS::gettimeofday() - this->first_);
       double events_per_ms = static_cast<double>(this->count_) /
         static_cast<double>(totaltime.msec());
       ACE_DEBUG((LM_DEBUG, "Consumer %s received %d at %.2f events/ms\n", name_.c_str(), this->count_, events_per_ms ));
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 09358f9d053..04d4b41ce83 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -16,6 +15,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -38,12 +38,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -130,7 +130,7 @@ SendEvents (int id)
 
   for(CORBA::ULong z = 0; z < amount; z++)
   {
-    const char* type = ( (z & 1) == 1 ? "odd" : "even" );
+    const char* type = ( (z & 1) == 1 ? "odd" : "even");
     events[z].header.fixed_header.event_type.domain_name =
       CORBA::string_dup("Orbix 2000 Demos");
     events[z].header.fixed_header.event_type.type_name =
@@ -174,7 +174,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   int status = 0;
   try
   {
@@ -189,7 +189,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset(new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 2fb227c9be3..92efbea6c63 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -183,7 +183,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
               // Tell the supplier to go
               sig->go ();
 
-              client.ORB_run( );
+              client.ORB_run();
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
               sig->done ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 84d4860bb16..8e647d69ae6 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -3,7 +3,6 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
 
@@ -16,6 +15,7 @@
 #include "Notify_Test_Client.h"
 
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 // ******************************************************************
 // Data Section
@@ -37,12 +37,12 @@ public:
   {
   }
 
-  void go (void)
+  void go ()
   {
     started_ = true;
   }
 
-  void done (void)
+  void done ()
   {
     started_ = false;
   }
@@ -123,7 +123,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 static void
 SendEvent (int id)
 {
-  const char* type = ( (id & 1) == 1 ? "odd" : "even" );
+  const char* type = ( (id & 1) == 1 ? "odd" : "even");
   CosNotification::StructuredEvent event;
 
   event.header.fixed_header.event_type.domain_name =
@@ -169,7 +169,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Auto_Ptr< sig_i > sig_impl;
+  std::unique_ptr<sig_i> sig_impl;
   int status = 0;
   try
   {
@@ -183,7 +183,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::ORB_ptr orb = client.orb ();
 
-      sig_impl.reset( new sig_i( orb ) );
+      sig_impl.reset( new sig_i(orb));
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 910eae6827d..224aa3988d9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -61,7 +61,7 @@ RedGreen_Test::parse_args (int argc,
   return 0;
 }
 
-RedGreen_Test::RedGreen_Test (void)
+RedGreen_Test::RedGreen_Test ()
   : burst_size_ (10),
     nthreads_ (2)
 {
@@ -117,7 +117,7 @@ RedGreen_Test::init (int argc,
 }
 
 void
-RedGreen_Test::run (void)
+RedGreen_Test::run ()
 {
   try
   {
@@ -142,7 +142,7 @@ RedGreen_Test::run (void)
 }
 
 void
-RedGreen_Test::done (void)
+RedGreen_Test::done ()
 {
   dump_results ();
   worker_.done ();
@@ -181,7 +181,7 @@ RedGreen_Test::init_ORB (int argc, ACE_TCHAR *argv [])
 }
 
 void
-RedGreen_Test::resolve_naming_service (void)
+RedGreen_Test::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
@@ -197,7 +197,7 @@ RedGreen_Test::resolve_naming_service (void)
 }
 
 void
-RedGreen_Test::resolve_Notify_factory (void)
+RedGreen_Test::resolve_Notify_factory ()
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -207,13 +207,11 @@ RedGreen_Test::resolve_Notify_factory (void)
     this->naming_context_->resolve (name);
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-        obj.in ()
-      );
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
 }
 
 void
-RedGreen_Test::create_EC (void)
+RedGreen_Test::create_EC ()
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -225,7 +223,7 @@ RedGreen_Test::create_EC (void)
 }
 
 void
-RedGreen_Test::create_supplieradmin (void)
+RedGreen_Test::create_supplieradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -237,7 +235,7 @@ RedGreen_Test::create_supplieradmin (void)
 }
 
 void
-RedGreen_Test::create_consumeradmin (void)
+RedGreen_Test::create_consumeradmin ()
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
@@ -249,7 +247,7 @@ RedGreen_Test::create_consumeradmin (void)
 }
 
 void
-RedGreen_Test::create_consumers (void)
+RedGreen_Test::create_consumers ()
 {
   ACE_NEW (this->normal_consumer_,
            RedGreen_Test_StructuredPushConsumer (this));
@@ -261,7 +259,7 @@ RedGreen_Test::create_consumers (void)
 }
 
 void
-RedGreen_Test::create_suppliers (void)
+RedGreen_Test::create_suppliers ()
 {
   ACE_NEW (this->supplier_,
            RedGreen_Test_StructuredPushSupplier ());
@@ -269,7 +267,7 @@ RedGreen_Test::create_suppliers (void)
 }
 
 void
-RedGreen_Test::send_events (void)
+RedGreen_Test::send_events ()
 {
   // Setup the Consumer 1 to receive
   //event_type : "DOMAIN_GREEN", "DOMAIN_GREEN".
@@ -281,10 +279,7 @@ RedGreen_Test::send_events (void)
   added_1[0].domain_name =  CORBA::string_dup (DOMAIN_GREEN);
   added_1[0].type_name = CORBA::string_dup (TYPE_GREEN);
 
-  this->normal_consumer_->get_proxy_supplier ()->subscription_change (
-                                                     added_1,
-                                                     removed_1
-                                                   );
+  this->normal_consumer_->get_proxy_supplier ()->subscription_change (added_1, removed_1);
 
   // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED"
   CosNotification::EventTypeSeq added_2(1);
@@ -295,10 +290,7 @@ RedGreen_Test::send_events (void)
   added_2[0].domain_name =  CORBA::string_dup (DOMAIN_RED);
   added_2[0].type_name = CORBA::string_dup (TYPE_RED);
 
-  this->slow_consumer_->get_proxy_supplier ()->subscription_change (
-                                                   added_2,
-                                                   removed_2
-                                                 );
+  this->slow_consumer_->get_proxy_supplier ()->subscription_change (added_2, removed_2);
 
   // Create the events - one of each type
 
@@ -337,7 +329,7 @@ RedGreen_Test::send_events (void)
 
 
 void
-RedGreen_Test::dump_results (void)
+RedGreen_Test::dump_results ()
 {
   ACE_Throughput_Stats throughput;
   ACE_High_Res_Timer::global_scale_factor_type gsf =
@@ -420,16 +412,14 @@ RedGreen_Test_StructuredPushConsumer::connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        proxy_supplier_id_
-      );
+        proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-        proxysupplier.in ()
-      );
+        proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
@@ -437,7 +427,7 @@ RedGreen_Test_StructuredPushConsumer::connect (
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::disconnect (void)
+RedGreen_Test_StructuredPushConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier ();
@@ -505,7 +495,7 @@ RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (
 }
 
 CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr
-RedGreen_Test_StructuredPushConsumer::get_proxy_supplier (void)
+RedGreen_Test_StructuredPushConsumer::get_proxy_supplier ()
 {
   return this->proxy_supplier_.in ();
 }
@@ -525,22 +515,16 @@ SlowConsumer::push_structured_event (
   // Slow it down ...
   ACE_OS::sleep (1);
 
-  RedGreen_Test_StructuredPushConsumer::push_structured_event (
-      notification
-    );
+  RedGreen_Test_StructuredPushConsumer::push_structured_event (notification);
 }
 
 // *****************************************************************
 
-RedGreen_Test_StructuredPushSupplier::RedGreen_Test_StructuredPushSupplier (
-    void
-  )
+RedGreen_Test_StructuredPushSupplier::RedGreen_Test_StructuredPushSupplier ()
 {
 }
 
-RedGreen_Test_StructuredPushSupplier::~RedGreen_Test_StructuredPushSupplier (
-    void
-  )
+RedGreen_Test_StructuredPushSupplier::~RedGreen_Test_StructuredPushSupplier ()
 {
 }
 
@@ -570,16 +554,14 @@ RedGreen_Test_StructuredPushSupplier::connect (
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        proxy_consumer_id_
-      );
+        proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-        proxyconsumer.in ()
-      );
+        proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
@@ -587,27 +569,24 @@ RedGreen_Test_StructuredPushSupplier::connect (
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect (void)
+RedGreen_Test_StructuredPushSupplier::disconnect ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer (
-                           );
+  this->proxy_consumer_->disconnect_structured_push_consumer ();
 }
 
 void
 RedGreen_Test_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-  )
+    const CosNotification::EventTypeSeq &) /*removed */
 {
   //No-Op.
 }
 
 void
 RedGreen_Test_StructuredPushSupplier::send_event (
-    CosNotification::StructuredEvent& event
-  )
+    CosNotification::StructuredEvent& event)
 {
   event.filterable_data.length (1);
   event.filterable_data[0].name = CORBA::string_dup("latency_base");
@@ -629,15 +608,14 @@ RedGreen_Test_StructuredPushSupplier::send_event (
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
-  )
+RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier ()
 {
   // No-Op.
 }
 
 //*****************************************************************
 
-Worker::Worker (void)
+Worker::Worker ()
 {
 }
 
@@ -648,13 +626,13 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 void
-Worker::done (void)
+Worker::done ()
 {
   consumer_is_done = true;
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 7579b33c5c1..44f32fc0028 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -42,7 +42,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -50,7 +50,7 @@ public:
   virtual int svc ();
 
   // Shutdown ORB
-  void done (void);
+  void done ();
 
 private:
   /// The orb
@@ -66,28 +66,27 @@ private:
  */
 class RedGreen_Test
 {
-
  public:
   // = Initialization
-  RedGreen_Test (void);
+  RedGreen_Test ();
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
-  void dump_results (void);
+  void dump_results ();
 
   /// Initialize the Client.
   void init (int argc,
              ACE_TCHAR *argv []);
 
   /// Run the demo.
-  void run (void);
+  void run ();
 
   /// Called when all events we are waiting for have occurred.
-  void done (void);
+  void done ();
 
   /// Destroy from the EC
-  void destroy_ec (void);
+  void destroy_ec ();
 
   int burst_size_;
   Worker worker_;
@@ -99,28 +98,28 @@ class RedGreen_Test
                  ACE_TCHAR *argv []);
 
   /// Try to get hold of a running naming service.
-  void resolve_naming_service (void);
+  void resolve_naming_service ();
 
   /// Try to resolve the Notify factory from the Naming service.
-  void resolve_Notify_factory (void);
+  void resolve_Notify_factory ();
 
   /// Create an EC.
-  void create_EC (void);
+  void create_EC ();
 
   /// Create the Supplier Admin.
-  void create_supplieradmin(void);
+  void create_supplieradmin();
 
   /// Create the Consumer Admin.
-  void create_consumeradmin (void);
+  void create_consumeradmin ();
 
   /// Create and initialize the consumers.
-  void create_consumers (void);
+  void create_consumers ();
 
   /// create and initialize the suppliers.
-  void create_suppliers (void);
+  void create_suppliers ();
 
   /// send the events.
-  void send_events (void);
+  void send_events ();
 
   // = Data Members.
   /// Reference to the root poa.
@@ -178,10 +177,10 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from the supplier.
-  virtual void disconnect (void);
+  virtual void disconnect ();
 
   /// Accessor for the Proxy that we're connected to.
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
+  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier ();
 
   /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -211,7 +210,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~RedGreen_Test_StructuredPushConsumer (void);
+  virtual ~RedGreen_Test_StructuredPushConsumer ();
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -248,14 +247,14 @@ class RedGreen_Test_StructuredPushSupplier
   //
 public:
   /// Constructor.
-  RedGreen_Test_StructuredPushSupplier (void);
+  RedGreen_Test_StructuredPushSupplier ();
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
 
   /// Disconnect from the supplier.
-  void disconnect (void);
+  void disconnect ();
 
   /// Send one event.
   virtual void send_event (CosNotification::StructuredEvent& event);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
index 107472cd390..9411ec61050 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
@@ -10,7 +10,7 @@ PerlACE::check_privilege_group();
 
 $status = 0;
 
-@test_configs = ( "reactive.conf", "lookup.conf", "listener.conf" );
+@test_configs = ( "reactive.conf", "lookup.conf", "listener.conf");
 
 my $nm_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $test = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 5fbc76eb76d..8705f8d4586 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -115,7 +115,7 @@ Throughput_StructuredPushSupplier::dump_stats (
 }
 
 int
-Throughput_StructuredPushSupplier::svc (void)
+Throughput_StructuredPushSupplier::svc ()
 {
   // Initialize a time value to pace the test.
   ACE_Time_Value tv (0, test_client_->burst_pause_);
@@ -179,7 +179,7 @@ Throughput_StructuredPushSupplier::svc (void)
 }
 
 /***************************************************************************/
-Notify_Throughput::Notify_Throughput (void)
+Notify_Throughput::Notify_Throughput ()
   : collocated_ec_ (0),
     burst_count_ (1),
     burst_pause_ (10000),
@@ -285,8 +285,7 @@ Notify_Throughput::init (int argc, ACE_TCHAR* argv [])
                       Throughput_StructuredPushSupplier (this),
                       -1);
       suppliers_[i]->TAO_Notify_Tests_StructuredPushSupplier::init (
-                         root_poa_.in ()
-                       );
+                         root_poa_.in ());
       suppliers_[i]->connect (this->supplier_admin_.in ());
     }
 
@@ -388,7 +387,7 @@ Notify_Throughput::parse_args(int argc, ACE_TCHAR *argv[])
 }
 
 void
-Notify_Throughput::create_EC (void)
+Notify_Throughput::create_EC ()
 {
   if (this->collocated_ec_ == 1)
     {
@@ -438,9 +437,8 @@ else
 }
 
 void
-Notify_Throughput::run_test (void)
+Notify_Throughput::run_test ()
 {
-
   ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ,"
               "burst_count_ %d, "
               "burst_pause_ %d, "
@@ -492,7 +490,7 @@ Notify_Throughput::run_test (void)
 }
 
 void
-Notify_Throughput::peer_done (void)
+Notify_Throughput::peer_done ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lock_);
 
@@ -504,7 +502,7 @@ Notify_Throughput::peer_done (void)
 }
 
 void
-Notify_Throughput::dump_results (void)
+Notify_Throughput::dump_results ()
 {
   ACE_Throughput_Stats throughput;
   ACE_High_Res_Timer::global_scale_factor_type gsf =
@@ -563,7 +561,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       events.dump_results();
 
       ACE_DEBUG ((LM_DEBUG, "ending main...\n"));
-
     }
   catch (const CORBA::Exception& se)
     {
@@ -577,7 +574,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Worker::Worker (void)
+Worker::Worker ()
 :done_ (0)
 {
 }
@@ -589,7 +586,7 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_Time_Value tv(5);
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 3608ad848c4..c59c08aca11 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -36,7 +36,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// ctor
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -63,8 +63,7 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification
-      );
+        const CosNotification::StructuredEvent & notification);
 
   /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -131,7 +130,7 @@ class Notify_Throughput : public Notify_Test_Client
 {
 public:
   // Initialization and termination code
-  Notify_Throughput (void);
+  Notify_Throughput ();
   virtual ~Notify_Throughput ();
 
   int parse_args(int argc, ACE_TCHAR *argv[]) ;
@@ -140,18 +139,18 @@ public:
   int init (int argc, ACE_TCHAR *argv []);
 
   /// Run the test.
-  void run_test (void);
+  void run_test ();
 
   /// Peers call this when done.
-  void peer_done (void);
+  void peer_done ();
 
   /// check if we got the expected results.
-  void dump_results (void);
+  void dump_results ();
 
   Worker worker_;
 protected:
   /// Create participants.
-  void create_EC (void);
+  void create_EC ();
 
   /// is the ec collocated.
   CORBA::Boolean collocated_ec_;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 02c8642afea..b67966b3f46 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -14,8 +14,7 @@
 #include "tao/debug.h"
 
 
-
-  Client::Client (void)
+  Client::Client ()
 {
 }
 
@@ -53,7 +52,7 @@ Client::init (int argc,
 // Testing the methods of the property service.
 
 int
-Client::property_tester (void)
+Client::property_tester ()
 {
   // = Testing PropertySet & Iterators.
 
@@ -104,7 +103,7 @@ Client::property_tester (void)
 // Testing define_property.
 
 int
-Client::test_define_property (void)
+Client::test_define_property ()
 {
   CORBA::Any anyval;
 
@@ -160,7 +159,7 @@ Client::test_define_property (void)
 // Testing get_all_property_names of the PropertySet.
 
 int
-Client::test_get_all_property_names (void)
+Client::test_get_all_property_names ()
 {
   // Get the size.
   CORBA::ULong num_of_properties =
@@ -234,7 +233,7 @@ Client::test_get_all_property_names (void)
 // properties.
 
 int
-Client::test_get_properties (void)
+Client::test_get_properties ()
 {
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
@@ -323,7 +322,7 @@ Client::test_get_properties (void)
 // Testing, get_number_of_properties.
 
 int
-Client::test_get_number_of_properties (void)
+Client::test_get_number_of_properties ()
 {
   CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties ();
 
@@ -367,7 +366,7 @@ Client::test_delete_property (const char *property_name)
 // properties.
 
 int
-Client::test_delete_properties (void)
+Client::test_delete_properties ()
 {
   CosPropertyService::PropertyNames prop_names;
   prop_names.length (3);
@@ -384,7 +383,7 @@ Client::test_delete_properties (void)
 // float in the property set.
 
 int
-Client::test_define_properties (void)
+Client::test_define_properties ()
 {
   CosPropertyService::Properties nproperties;
   nproperties.length (4);
@@ -430,7 +429,7 @@ Client::test_define_properties (void)
 // Test get_all_properties.
 
 int
-Client::test_get_all_properties (void)
+Client::test_get_all_properties ()
 {
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
@@ -564,7 +563,7 @@ Client::test_get_all_properties (void)
 // Testing define property with mode.
 // Defines char, short, long and float properties with different modes.
 int
-Client::test_define_property_with_mode (void)
+Client::test_define_property_with_mode ()
 {
   CORBA::Any anyval;
 
@@ -621,7 +620,7 @@ Client::test_define_property_with_mode (void)
 }
 
 int
-Client::test_get_property_value (void)
+Client::test_get_property_value ()
 {
   try
     {
@@ -651,7 +650,6 @@ Client::test_get_property_value (void)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       Client client;
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 18c81e93438..2bcb7e48f87 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -38,17 +38,17 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Initialize the ORB etc, and bind the MMDevices.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the client.  This will call StreamCtrl::bind_devs.
-  int run (void);
+  int run ();
 
   /// Testing  the property service methods.
-  int property_tester (void);
+  int property_tester ();
 
 protected:
   /// Bind to the remote MMDevice.
@@ -58,34 +58,34 @@ protected:
   // = Property Testing.
 
   /// Testing the define property method.
-  int test_define_property (void);
+  int test_define_property ();
 
   /// Testing the number of properties, currently in the Property Set.
-  int test_get_number_of_properties (void);
+  int test_get_number_of_properties ();
 
   ///Testing get_all_property_names.
-  int test_get_all_property_names (void);
+  int test_get_all_property_names ();
 
   /// Testing get_property_value.
-  int test_get_property_value (void);
+  int test_get_property_value ();
 
   ///Testing get_properties.  Give the names and get their properties.
-  int test_get_properties (void);
+  int test_get_properties ();
 
   /// Testing get_all_properties.
-  int test_get_all_properties (void);
+  int test_get_all_properties ();
 
   /// Testing delete_property.
   int test_delete_property (const char *property_name);
 
   /// Testing delete_properties.
-  int test_delete_properties (void);
+  int test_delete_properties ();
 
   /// Defining a sequence of properties.
-  int test_define_properties (void);
+  int test_define_properties ();
 
   /// Defines properties with various modes.
-  int test_define_property_with_mode (void);
+  int test_define_property_with_mode ();
 
   /// The ORB manager, handles ORB initialization etc.
   TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 261b126d520..cfa6d7e40bd 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -17,7 +17,6 @@
 #include "orbsvcs/Property/CosPropertyService_i.h"
 
 
-
 class TAO_PropertySet_Tester
 {
   // = TITLE
@@ -32,36 +31,36 @@ public:
   // He has to instantiate TAO_NamesIterator class using the instance
   // of TAO_PropertySet.
 
-  TAO_PropertySet_Tester (void);
+  TAO_PropertySet_Tester ();
   // Constructor.
 
-  ~TAO_PropertySet_Tester (void);
+  ~TAO_PropertySet_Tester ();
   // Destructor.
 
-  int test_define_property (void);
+  int test_define_property ();
   // Defines a char,a short, a long, a float and a string property.
 
-  int test_get_number_of_properties (void);
+  int test_get_number_of_properties ();
   // Gets the number of properties currently defined in the PropertySet.
 
   int test_delete_property (const char *property_name);
   // Delete a given property.
 
-  int test_is_property_defined (void);
+  int test_is_property_defined ();
   // Check the following properties are defined or
   // no. "char_property", "short_property" and a "string_property".
 
-  int test_get_property_value (void);
+  int test_get_property_value ();
   // Get the "float_property" and "string_property" and print them
   // out.
 
-  int test_delete_properties (void);
+  int test_delete_properties ();
   // Delete char, short,long, and string properties.
 
-  int test_delete_all_properties (void);
+  int test_delete_all_properties ();
   // Delete all the properties.
 
-  int test_define_properties (void);
+  int test_define_properties ();
   // Define a sequence of properties. a char, a short, a long, a float
   // and a string.
 
@@ -83,14 +82,14 @@ public:
   TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester);
   // Constructor. To make names iterator from the property set object.
 
-  ~TAO_PropertyNamesIterator_Tester (void);
+  ~TAO_PropertyNamesIterator_Tester ();
   // Destructor.
 
-  int test_next_one (void);
+  int test_next_one ();
   // Test next one method. Iterate thru all the names in the
   // PropertySet and print them out.
 
-  int test_reset (void);
+  int test_reset ();
   // Test the reset method.
 
   int test_next_n (size_t n);
@@ -102,18 +101,18 @@ private:
 
 
 // Constructor.
-TAO_PropertySet_Tester::TAO_PropertySet_Tester (void)
+TAO_PropertySet_Tester::TAO_PropertySet_Tester ()
 {
 }
 
 // Destructor.
-TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
+TAO_PropertySet_Tester::~TAO_PropertySet_Tester ()
 {
 }
 
 // Defines a char, a short, a long, a float and a string.
 int
-TAO_PropertySet_Tester::test_define_property (void)
+TAO_PropertySet_Tester::test_define_property ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
@@ -186,7 +185,7 @@ TAO_PropertySet_Tester::test_define_property (void)
 
 // Testing, get_number_of_properties.
 int
-TAO_PropertySet_Tester::test_get_number_of_properties (void)
+TAO_PropertySet_Tester::test_get_number_of_properties ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Main : Number of props : %d\n",
@@ -209,7 +208,7 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name)
 // Gets the value of "short_property" and "string_property".
 
 int
-TAO_PropertySet_Tester::test_get_property_value (void)
+TAO_PropertySet_Tester::test_get_property_value ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
@@ -247,7 +246,7 @@ TAO_PropertySet_Tester::test_get_property_value (void)
 // "string_property" and "char_property".
 
 int
-TAO_PropertySet_Tester::test_is_property_defined (void)
+TAO_PropertySet_Tester::test_is_property_defined ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
@@ -277,7 +276,7 @@ TAO_PropertySet_Tester::test_is_property_defined (void)
 // PropertySet.  Deleting char, short, long, float and string
 // properties.
 int
-TAO_PropertySet_Tester::test_delete_properties (void)
+TAO_PropertySet_Tester::test_delete_properties ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -299,7 +298,7 @@ TAO_PropertySet_Tester::test_delete_properties (void)
 // Defines a sequnce of properties containing, char, short, long,
 // float and string property in the property set.
 int
-TAO_PropertySet_Tester::test_define_properties (void)
+TAO_PropertySet_Tester::test_define_properties ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties == Defining sequence of properties\n"));
@@ -354,7 +353,7 @@ TAO_PropertySet_Tester::test_define_properties (void)
 
 // Delete all the properties.
 int
-TAO_PropertySet_Tester::test_delete_all_properties (void)
+TAO_PropertySet_Tester::test_delete_all_properties ()
 {
   // Deleting all the properties
   ACE_DEBUG ((LM_DEBUG,
@@ -376,14 +375,14 @@ TAO_PropertyNamesIterator_Tester::TAO_PropertyNamesIterator_Tester (TAO_Property
 }
 
 // Destructor.
-TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
+TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester ()
 {
 }
 
 // Test next one method. Iterate thru all the names in the
 // PropertySet and print them out.
 int
-TAO_PropertyNamesIterator_Tester::test_next_one (void)
+TAO_PropertyNamesIterator_Tester::test_next_one ()
 {
   CORBA::String_var strvar;
   ACE_DEBUG ((LM_DEBUG,
@@ -400,7 +399,7 @@ TAO_PropertyNamesIterator_Tester::test_next_one (void)
 
 // Reset the names iterator.
 int
-TAO_PropertyNamesIterator_Tester::test_reset (void)
+TAO_PropertyNamesIterator_Tester::test_reset ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Resetting (reset ()) the NamesIterator."));
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index 8e65a4fe98d..7b73e2d140b 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -13,13 +13,11 @@
 #include "server.h"
 
 
-
 // Main program
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 6d6c95ac717..959933e9d5c 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -27,7 +27,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
   // Constructor.
 
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
   // Destructor.
 
   // = Interface implementation accessor methods.
@@ -35,7 +35,7 @@ public:
   void id (CORBA::Short id);
   // Sets id.
 
-  CORBA::Short id (void);
+  CORBA::Short id ();
   // Gets id.
 
 private:
@@ -47,12 +47,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
@@ -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)
   {
@@ -536,5 +532,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   // All tests have passed up to this point
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index e18ea654f85..965ebf7746b 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -17,7 +17,6 @@ class DynSched_Test
   //    Wraps static functions for test
 {
 public:
-
   static void setup_rt_info (RtecScheduler::RT_Info &info,
                              const char *entry_point,
                              u_long period,
@@ -47,7 +46,6 @@ public:
                            const char *output_filename,
                            const char *heading);
   // Creates the schedule, runs timelines.
-
 };
 
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index d29a5967756..17af9a4bd31 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -399,8 +399,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                 add_dependency (config_infos[i].handle,
                                 config_infos[i - (operation_count / 2)].handle,
                                 2,                             // number of calls
-                                RtecBase::ONE_WAY_CALL    // type of dependency
-                                );
+                                RtecBase::ONE_WAY_CALL);    // type of dependency
             }
         }
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index fcaf868bf25..c6d9e993aa8 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -10,7 +10,6 @@
 #include "orbsvcs/Naming/Naming_Server.h"
 
 
-
 const char* service_name = "ScheduleService";
 
 const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, "
@@ -253,8 +252,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[1].handle,
                         config_infos[0].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // register dependency of consumer that will have unresolved remote
       // dependencies on supplier with unresolved remote dependencies
@@ -262,9 +260,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[3].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
-
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // register dependency of consumer that will have unresolved local
       // dependencies on supplier with unresolved local dependencies
@@ -272,9 +268,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[5].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
-
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // register dependencies on each supplier of first consumer that will
       // have both unresolved local and unresolved remote dependencies.
@@ -282,22 +276,19 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[6].handle,
                         config_infos[0].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       // Register dependencies on each of the other consumers by second
       // consumer that will have both unresolved local and unresolved remote
@@ -306,29 +297,25 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         add_dependency (config_infos[7].handle,
                         config_infos[1].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[3].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[5].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[6].handle,
                         1,                            // number of calls
-                        RtecBase::ONE_WAY_CALL  // type of dependency
-                        );
+                        RtecBase::ONE_WAY_CALL);  // type of dependency
 
       RtecScheduler::RT_Info_Set_var infos;
       RtecScheduler::Dependency_Set_var deps;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
index 1be4a63169b..6da2cf94406 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
@@ -20,7 +20,6 @@ ERROR: The following entry points have unresolved local dependencies:
 // both_unresolved_consumer_2
 
 
-
 static ACE_Scheduler_Factory::POD_RT_Info infos[] = {
 {"good_supplier", 1, 5000, 5000, 5000,   500000, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 1,  15, 0, 0, (RtecScheduler::Info_Type_t) 0}
 ,
@@ -37,7 +36,6 @@ static ACE_Scheduler_Factory::POD_RT_Info infos[] = {
 {"both_unresolved_consumer_1", 7, 5000, 5000, 5000,        0, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 0,   0, 0, 0, (RtecScheduler::Info_Type_t) 0}
 ,
 {"both_unresolved_consumer_2", 8, 5000, 5000, 5000,        0, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 0,   0, 0, 0, (RtecScheduler::Info_Type_t) 0}
-
 };
 
 static int infos_size = sizeof(infos)/sizeof(infos[0]);
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 55ef7703736..f720fdbabb9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -15,7 +15,6 @@
 
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -141,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/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index 73b37fffaff..1239114260f 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -39,7 +39,6 @@ static ACE_Scheduler_Factory::POD_RT_Info infos[] = {
  {"high_01_C" , 15, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 0,  15, 0, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
  {"low_01_C"  , 16, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 0,   2, 0, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
-
 };
 
 static int infos_size = sizeof(infos)/sizeof(infos[0]);
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/README b/TAO/orbsvcs/tests/Security/BiDirectional/README
index 1de6290032e..c8339ee99b6 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/README
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/README
@@ -1,4 +1,4 @@
-This is a test that exercises the birectional GIOP connection
+This is a test that exercises the bidirectional GIOP connection
 implementation in TAO over SSLIOP connection.
 
 Basically, the test is a copy of the $TAO_ROOT/tests/BiDirectional with
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 9c81e257b95..b2e4d80e1d8 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -8,10 +8,9 @@
 #include "tao/Thread_Lane_Resources.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
index a0ce7f7ffd1..43ad684e88f 100755
--- a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
@@ -184,7 +184,7 @@ B<run_test.pl> [B<-help|?>] [B<-iter iterations>] [B<-chost host>]
 
 =head1 DESCRIPTION
 
-This is a test that exercises the birectional GIOP connection
+This is a test that exercises the bidirectional GIOP connection
 implementation in TAO over SSLIOP connection. Start the server like this
 
     $ server -ORBSvcConf server.conf -o <file.ior> -i <no_iterations>
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 0b3a484f806..66d184ba1be 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -5,7 +5,6 @@
 #include "tao/AnyTypeCode/Any.h"
 
 
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
index 7c9af9920c1..1921d9ea10d 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
@@ -1,30 +1,42 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAMbGhxdklZZcMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEArCdzE7kixfdqothlf8iOtfM23jlN+njYUn1nmaCy
-R8LL7S5FZNX9M3SHEwAHLxwRjOM+0B8IRFHlGfptbUhQ/NIm6m9YPo17PigNG3p7
-OLym9MDJ6gstX8gFvwIS5CI1u7fDlfhTp5pxr/2MqYeExVR2OPRBFQ1A6VpKKaMn
-GFsCAwEAAaNQME4wHQYDVR0OBBYEFAlDj/Cyl+QUdOrQMyqasHJoFKrXMB8GA1Ud
-IwQYMBaAFAlDj/Cyl+QUdOrQMyqasHJoFKrXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEALdQDVKo5exyv9KK+8Zzjngc/gO3Zd5+eY9NJGxNUzY63lEv0
-nIPXZ+8To/E2FLiSDrdc8VhcXe4S+3/3EyNlPVx4+v9N9AlAffmhp5wJ8OCFPjkS
-DqRhqHmLoCu3fcCvf2IjPSYxlgZcTy7Lm39yyOsLOFR6KdTH4iKYOJ8qtiM=
+MIIDfTCCAmWgAwIBAgIUQ2HUuuPwxy7ChX8dJUETFpwf/mwwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZzEImzIbS4eidyWnt
+Rxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6R3tO
+0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg4TKs
+SmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2KSI4
+1BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshwIw2I
+ypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1zxmjG
+yUOdAgMBAAGjUzBRMB0GA1UdDgQWBBQdbqSqh4WXVO84H9hXbOtcbFlTYTAfBgNV
+HSMEGDAWgBQdbqSqh4WXVO84H9hXbOtcbFlTYTAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAxwOsIDBW0WyHfvVrYltysf+BOPEA8j4C3jfMy8170
+n0cCl+yyXrpQjCdSCkClc1mdH2uRbKlzitL0/pQntGk2ejBO6JqqtftUiLpiU8yM
+GiQJCgnW0a2uHQPnEBotmr/FK0kfQy5SfWk7BS3FDwbCdAAMUFeED7e94Nd+I3tl
+dITYI5jUrafpf/evMhTkB5EdQx1Y3FYdRPYSEBqO64bBWz7xE8ZmNqb993fIfrTR
+tJ00U0Mitd+4zDNhmJGtPF96FRAbr5HW25r1CCIc8TubsbggrqqjYaxxvKRJ0wH8
+Qxr2KZNxjrQgnryJuB0UfLQNv8VzVKMK6aUaOxxGJTHq
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAOTaZ2YfN2i1MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAwiNOsDLsnIfyVZB3pCSHF7R+i7BaTTT8vROVPbz1
-OM0jXyVRMM0KsDtu7qaY68gesArTzTcZ06ZVEbQOCe4uSJNnbzQt2g3je6QNArRB
-g4Nj2JBA8QYSA2Ij60F39yfTmUauyyhOyGPJPdgEFD0C4BR8zNYLW2LgadbEJro+
-g3ECAwEAAaNQME4wHQYDVR0OBBYEFAsfrcafDjLQI6O72xwcdZhCWTJ5MB8GA1Ud
-IwQYMBaAFAsfrcafDjLQI6O72xwcdZhCWTJ5MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAEokrFPraZtDbP0yMfHSjnQeQK5uu19hHPxE30qXHWSNH2L+m
-J882d1aSrkZYauZbfhx4iJhusGgsh/64I9UIdlKKXDSTcEti1CrLbBEtfkgdsoYs
-QcXXCoEvHw/IVF2tT05+j6HfQRZy5J/8qTyCFfpz7HVhjKNG71cy38kkfLg=
+MIIDfTCCAmWgAwIBAgIUAJl4rVO3FCXlqUTipB/Q+uvt6OYwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xU5YemdyBOfpmVIi
+LqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtvi5qF
+FM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4MZXNc
+Kv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDOB9cz
+1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xeO7cI
+xVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO7pbr
+ZIe7AgMBAAGjUzBRMB0GA1UdDgQWBBQwVMUpq/fwvG3ivOUmQZv78vwDojAfBgNV
+HSMEGDAWgBQwVMUpq/fwvG3ivOUmQZv78vwDojAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAYMfP5PYjCMW+QSzeDGnSIlI72iSWWCWqfD4naaPxB
+yVwKzRjS8RqQby0XgqrpDdz1eUuqnOg+4fkQ5taly43tgevJcprKTD3LYvYkVisM
+Yim0yNB08X6oXrkr4Rmh65x2rG/1aWLm8/tMfVZQrT/48BP2vMIEITcpG4RYoZid
+3hxhFoFqdYINJ2aPcs1bid1AKIH3taO/LF11hvYafQGLd3M6xkuLhIJFNCYnbJjk
+nzdz8GVvqBGHQbfMO+1eRnnBT4uccX/twTZkdbEr908ZH3BVO4My226NblfR0Tod
+s2SmwCNGXzm4GVCNnqGBEtvkbOUwnYURZdhFA5WXkQdQ
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
index 1ac5a1ae820..a574db7b541 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAOTaZ2YfN2i1MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAwiNOsDLsnIfyVZB3pCSHF7R+i7BaTTT8vROVPbz1
-OM0jXyVRMM0KsDtu7qaY68gesArTzTcZ06ZVEbQOCe4uSJNnbzQt2g3je6QNArRB
-g4Nj2JBA8QYSA2Ij60F39yfTmUauyyhOyGPJPdgEFD0C4BR8zNYLW2LgadbEJro+
-g3ECAwEAAaNQME4wHQYDVR0OBBYEFAsfrcafDjLQI6O72xwcdZhCWTJ5MB8GA1Ud
-IwQYMBaAFAsfrcafDjLQI6O72xwcdZhCWTJ5MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAEokrFPraZtDbP0yMfHSjnQeQK5uu19hHPxE30qXHWSNH2L+m
-J882d1aSrkZYauZbfhx4iJhusGgsh/64I9UIdlKKXDSTcEti1CrLbBEtfkgdsoYs
-QcXXCoEvHw/IVF2tT05+j6HfQRZy5J/8qTyCFfpz7HVhjKNG71cy38kkfLg=
+MIIDfTCCAmWgAwIBAgIUAJl4rVO3FCXlqUTipB/Q+uvt6OYwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xU5YemdyBOfpmVIi
+LqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtvi5qF
+FM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4MZXNc
+Kv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDOB9cz
+1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xeO7cI
+xVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO7pbr
+ZIe7AgMBAAGjUzBRMB0GA1UdDgQWBBQwVMUpq/fwvG3ivOUmQZv78vwDojAfBgNV
+HSMEGDAWgBQwVMUpq/fwvG3ivOUmQZv78vwDojAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAYMfP5PYjCMW+QSzeDGnSIlI72iSWWCWqfD4naaPxB
+yVwKzRjS8RqQby0XgqrpDdz1eUuqnOg+4fkQ5taly43tgevJcprKTD3LYvYkVisM
+Yim0yNB08X6oXrkr4Rmh65x2rG/1aWLm8/tMfVZQrT/48BP2vMIEITcpG4RYoZid
+3hxhFoFqdYINJ2aPcs1bid1AKIH3taO/LF11hvYafQGLd3M6xkuLhIJFNCYnbJjk
+nzdz8GVvqBGHQbfMO+1eRnnBT4uccX/twTZkdbEr908ZH3BVO4My226NblfR0Tod
+s2SmwCNGXzm4GVCNnqGBEtvkbOUwnYURZdhFA5WXkQdQ
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
index 4debafe74d4..71984e28a51 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMIjTrAy7JyH8lWQ
-d6Qkhxe0fouwWk00/L0TlT289TjNI18lUTDNCrA7bu6mmOvIHrAK0803GdOmVRG0
-DgnuLkiTZ280LdoN43ukDQK0QYODY9iQQPEGEgNiI+tBd/cn05lGrssoTshjyT3Y
-BBQ9AuAUfMzWC1ti4GnWxCa6PoNxAgMBAAECgYBIbuv5CccGUCK2kgRRld9hlNJy
-RAYtMEvsL9ZLBqln3AIKid3VG2uVfVdSa446ypvIiwGjW5+jPDgZNtjWE6voeNCy
-gJNvxfJzADznzastxdivkLirBqGdFdNa73wL8bPgxun3WNe9owsHNtx+UhbEsmJ6
-ESCFcNThsk1gUoA5AQJBAPlVC1A7KbYAtTvEg5pcPwcLkE2as/ZkVMww3eYi18Gx
-qlH4/S2i5Bah8YneMImYuObjnPZMbaq4VFH6Ht/sgzkCQQDHVGWizrZGhmyXxhaL
-+1fSlnTNw/l6QEy5Cd4hbQp7yQrb+TRXZhje9zLS3MIWcdRU2MDGokHWiSF2ZJMj
-5On5AkBwzUsLB1k9oGBeI/AuW+Gf/FlS4tTcelPq9YjO36ChXxHheDaC+RkcLDQs
-3bsz5UZyHzQaMkXDYRW06OYjBMvxAkBriOB8AMDdM1AKYVdwlVw/w+Onzn4cseuy
-N9yac9UgCsnM+ph+PhpUz0+f6nDa4vYGABmgD5EtSDXBRWkMCEchAkAE6v3PKzOe
-ryn/BKaLX6Z0OTCVIcZWu40onGME40t8f7xCoF65611A6rmj/9KddZf8WCgmQLFJ
-GzcLNDmr4ccC
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3xU5YemdyBOfp
+mVIiLqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtv
+i5qFFM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4M
+ZXNcKv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDO
+B9cz1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xe
+O7cIxVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO
+7pbrZIe7AgMBAAECggEBAKs49ORPN+7uTz5Bklsy5SFBkUf5/qhq78Ywxg4SXh6o
+kZGrxp+b+wvBibhA+eYvUJF0EfUmB/Wd4uAtTI1Oc5nWw2zUPzvOMPx/1ljJqlgO
+6Vy5xhwubvHv2s5id0NnTj+oBfd5vIH5kukN5Uws64oT5gDPPOzeVo2nvTt8OiW9
+cZzPCvcqv6wF0hhwAFEeSht9IsyDhwHUF5ffO4XpjxBeEKLdlVdOOg6lsbM7SxJk
+Gd6+GQNTuWnA3ADWododJ7GqVXyt6lBazUYUo8ltXylr52il0DHn9lgk42x+rkmo
+KYSgZBdn3DFc4j+I9wDGs5fRqqQGdhDkYiJIOelnneECgYEA5vmRbyOGeKPcVRuO
+Woai+7GJ67m+gIlJCmFEMqwZACsU2yxpYVx2HH1vy9tk1GTae/FVzBjMbnaA2pL+
+U8PPVafgvrL6AFqHpvsyutQun3PuMugxSU2HC+rIxEo49v4hLZpYaVY0B2ZDG8AV
+liYwL5yjqQEVnUf8feeqTAdSlikCgYEAy65163SFURCmBdEMNgT4mwVzHWiTKcxN
+OZzBjItnCrJkq8Jyar7fN/DNifBsGqoh6GRLlp+7yyDQyx3D7ZswrcDs88Uizs55
+LdeLPtcRGvBnX4PhzzvexsCP2NuhUyxhkvMdDDUsjZ9AOuUHQKaY0etpRhh4iOhO
+1r6sggX2w0MCgYBC9YCy3nKiUKaUSavIFJX1L2/TVYKjkqkJCE+T/Q42XUbrjwFx
+xzM6aSbay1x8skwgeEMuKtZBA7uxIcH3GKHnrAZcYlhVd+kxgEshnFdzxFD+kw+O
+t5n523OebAH9oIiPxtnwl5v3tS6pQdNANwvrEZbkbLsOYIsTGPDmn4zSmQKBgAg5
+NP2aqL9LIsjdVdbggIERyUIItNhdLUkEMTRRdImUBkiBA0mYBz8k88d784FoGRJe
+6kZckKJ04rkwrHZta5u4TFjTPsKGx5G4QCD7Ye9qgWHz2ywYyLfRkn048NyA0De0
+pRmXFANryJYYJSDRGR5wmMGBv2wXpQc6j5B4WSwtAoGBAOKHHWOdS3ZkvUjtd4Nt
+YMk1nG/k6iozIh6bz06Cry4EkDE9Qi7zLe8FP2hRAJkbF1clbrhfOGyfoNjZ/Zjt
+ouKkl2HWcJSKVbMLM3GTktjdnOoowAznzQSGAdTxl+zJEctTpPDy5M+HzbsHmjmi
+fVCV7vbCgOjxuGpyFz+Nv0kC
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAOTaZ2YfN2i1MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAwiNOsDLsnIfyVZB3pCSHF7R+i7BaTTT8vROVPbz1
-OM0jXyVRMM0KsDtu7qaY68gesArTzTcZ06ZVEbQOCe4uSJNnbzQt2g3je6QNArRB
-g4Nj2JBA8QYSA2Ij60F39yfTmUauyyhOyGPJPdgEFD0C4BR8zNYLW2LgadbEJro+
-g3ECAwEAAaNQME4wHQYDVR0OBBYEFAsfrcafDjLQI6O72xwcdZhCWTJ5MB8GA1Ud
-IwQYMBaAFAsfrcafDjLQI6O72xwcdZhCWTJ5MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAEokrFPraZtDbP0yMfHSjnQeQK5uu19hHPxE30qXHWSNH2L+m
-J882d1aSrkZYauZbfhx4iJhusGgsh/64I9UIdlKKXDSTcEti1CrLbBEtfkgdsoYs
-QcXXCoEvHw/IVF2tT05+j6HfQRZy5J/8qTyCFfpz7HVhjKNG71cy38kkfLg=
+MIIDfTCCAmWgAwIBAgIUAJl4rVO3FCXlqUTipB/Q+uvt6OYwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xU5YemdyBOfpmVIi
+LqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtvi5qF
+FM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4MZXNc
+Kv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDOB9cz
+1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xeO7cI
+xVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO7pbr
+ZIe7AgMBAAGjUzBRMB0GA1UdDgQWBBQwVMUpq/fwvG3ivOUmQZv78vwDojAfBgNV
+HSMEGDAWgBQwVMUpq/fwvG3ivOUmQZv78vwDojAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAYMfP5PYjCMW+QSzeDGnSIlI72iSWWCWqfD4naaPxB
+yVwKzRjS8RqQby0XgqrpDdz1eUuqnOg+4fkQ5taly43tgevJcprKTD3LYvYkVisM
+Yim0yNB08X6oXrkr4Rmh65x2rG/1aWLm8/tMfVZQrT/48BP2vMIEITcpG4RYoZid
+3hxhFoFqdYINJ2aPcs1bid1AKIH3taO/LF11hvYafQGLd3M6xkuLhIJFNCYnbJjk
+nzdz8GVvqBGHQbfMO+1eRnnBT4uccX/twTZkdbEr908ZH3BVO4My226NblfR0Tod
+s2SmwCNGXzm4GVCNnqGBEtvkbOUwnYURZdhFA5WXkQdQ
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
index 704a96b0745..68c43cd8802 100755
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 
-openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:2048 \
     -out server-cert.pem -keyout server-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
 
 cat server-cert.pem >>server-key.pem
 cat server-cert.pem >ca.pem
 
-openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:2048 \
     -out client-cert.pem -keyout client-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
 
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
index af092fb60c5..e69147e73f9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAMbGhxdklZZcMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEArCdzE7kixfdqothlf8iOtfM23jlN+njYUn1nmaCy
-R8LL7S5FZNX9M3SHEwAHLxwRjOM+0B8IRFHlGfptbUhQ/NIm6m9YPo17PigNG3p7
-OLym9MDJ6gstX8gFvwIS5CI1u7fDlfhTp5pxr/2MqYeExVR2OPRBFQ1A6VpKKaMn
-GFsCAwEAAaNQME4wHQYDVR0OBBYEFAlDj/Cyl+QUdOrQMyqasHJoFKrXMB8GA1Ud
-IwQYMBaAFAlDj/Cyl+QUdOrQMyqasHJoFKrXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEALdQDVKo5exyv9KK+8Zzjngc/gO3Zd5+eY9NJGxNUzY63lEv0
-nIPXZ+8To/E2FLiSDrdc8VhcXe4S+3/3EyNlPVx4+v9N9AlAffmhp5wJ8OCFPjkS
-DqRhqHmLoCu3fcCvf2IjPSYxlgZcTy7Lm39yyOsLOFR6KdTH4iKYOJ8qtiM=
+MIIDfTCCAmWgAwIBAgIUQ2HUuuPwxy7ChX8dJUETFpwf/mwwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZzEImzIbS4eidyWnt
+Rxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6R3tO
+0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg4TKs
+SmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2KSI4
+1BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshwIw2I
+ypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1zxmjG
+yUOdAgMBAAGjUzBRMB0GA1UdDgQWBBQdbqSqh4WXVO84H9hXbOtcbFlTYTAfBgNV
+HSMEGDAWgBQdbqSqh4WXVO84H9hXbOtcbFlTYTAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAxwOsIDBW0WyHfvVrYltysf+BOPEA8j4C3jfMy8170
+n0cCl+yyXrpQjCdSCkClc1mdH2uRbKlzitL0/pQntGk2ejBO6JqqtftUiLpiU8yM
+GiQJCgnW0a2uHQPnEBotmr/FK0kfQy5SfWk7BS3FDwbCdAAMUFeED7e94Nd+I3tl
+dITYI5jUrafpf/evMhTkB5EdQx1Y3FYdRPYSEBqO64bBWz7xE8ZmNqb993fIfrTR
+tJ00U0Mitd+4zDNhmJGtPF96FRAbr5HW25r1CCIc8TubsbggrqqjYaxxvKRJ0wH8
+Qxr2KZNxjrQgnryJuB0UfLQNv8VzVKMK6aUaOxxGJTHq
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
index a0264ef1abd..bfe1f853da9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKwncxO5IsX3aqLY
-ZX/IjrXzNt45Tfp42FJ9Z5mgskfCy+0uRWTV/TN0hxMABy8cEYzjPtAfCERR5Rn6
-bW1IUPzSJupvWD6Nez4oDRt6ezi8pvTAyeoLLV/IBb8CEuQiNbu3w5X4U6eaca/9
-jKmHhMVUdjj0QRUNQOlaSimjJxhbAgMBAAECgYAIJVG3pDH2BhAAppae5kGCcICv
-IS0EZgVuWcq2JTlqVdhKX78e11VEwwXFK2Iro3tdHD+Tn3RHr0xU31mgKyTRzcfg
-elZkI7FqEELS+P3kd/U43pCaHmNZ6eZ4JkAkWEDIPXCGkYkf5/sWfoPnua8rjeHf
-1RppyM1gFFfCTq0oaQJBANxljEq+Xl6GUAGM2ZWCreqsN4vL7SZ3CzdBVT5p3sjV
-YOlm4KxKrj/elF/Cx7B+KL+NYjnytFmsF3vVZjCaNCcCQQDH9tdlqhl4DcyT5PQ5
-7ho6mdW+PZSg5Ya80chk8ly9wGgpWyOViJDqDdOUWC95gDGrfnNAhMpFMYRfv8Bb
-ZZatAkAK8yCdNggKOjIPYagNvYhWeGfqEh+eIZv1CtHpX+kpoTBHaE0RQkSV98D3
-YP36zsnHeoa+ykgbjGk+RcPl9kNRAkEAuoL6ldD6wIfecXP0eLQlstMaEr/NieWM
-r0Hc8Is/BZ4ZibmAj1E6GZWb65n1bhasPZFMXrl9EN0G42gvOxCeYQJAFA2/sc/z
-WSAz9qTBr6uJo/ZCptBTBN2qf7JXd24t2Hrl2xV69ey22gFLrmvn4C3tXOeHhWuN
-9AsMMQrC7dUU0Q==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZzEImzIbS4eid
+yWntRxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6
+R3tO0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg
+4TKsSmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2
+KSI41BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshw
+Iw2IypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1z
+xmjGyUOdAgMBAAECggEASUM+4+Kb+wr4V2mh1xD93LcUdr3PJo7ZwFxIjKQwIt1g
+gDYlt99T4DXJX4QEFLR8Va4zPOsbfJX1JfU1LRdrrYLYZjS5cQHyNqQmu9Pd/Dyf
+0f5LjxZb2jRYNA7Agf/JQMb2NCNj4i83zFfaXq5Wc0T3EBJ9ql/rttJoAVppaa22
+IE8NjmIk9PYM+7tP5ZMjG2/pm3TsaxsR//pklVPtnz8RH7n9qd4QLrHTfMTWVKXb
+g1ErdzFHKFLh9wpgy177I//ReE4qlNthrboGI2F4lhnEBsJee0YT8fBylUwxKnQi
+I6PNz3td8olGsOq1B5WCDpbV7tKbVY55SwxQT9KL4QKBgQDGr5nhNRE35/GYEeD5
+tCkNEELe6IPrQjd5OlutuAzRBQQP9apkSMMfx4SaJB3NYWC0lS+aXSRQgYRSl/4s
+Z71bmDCUoOZ1W7XpMsYvLq/585mJ2amsNDOXzcEqHafrVyn/AYGClfqgzl81gxLc
+7iuZM2Ow4UO1+joPBqXpoCHzyQKBgQDGKczhh9/NkpiMPJx692nsYWvFdeDmgzUn
+CQnYL6iRKXv53TJjh1Tl9x6RNfGgUwwTkn9s1pKMOMRhPH1sQ8mmOAQkBJ11BqI4
+MaF9B4o3xyaBbd61Qsw7iEN0ZMeCyxelwDcvl0BJ3LXrAI3HXnjUSso2vrHqfStb
+Kwdko4rzNQKBgFj2zf9CRMh0qf/+mW8V1X/M9TRchp0z1CULFXvuuoZpKY1/4eDv
+l7dGHkDqxRFudd/GIT+MTzNhGv/koOH/PZGizrXuaeLIwuZ9XrJHxHI2Oly4Qroh
+0aw6bDDQgJznNZ3CbdwsDcItRgJvA2Y7mvgJQ60y4J++QHrz7hxzIGDJAoGAUpkX
+yiXtlm11YnbdLrA0GZBd8Jd63/puzE+LJ+5tj9w/zd1yZGQDcjt4JUTb61zSWtIk
+hQRHX2VGDdW93cO/qKYOq8i0rRPPyCZ/znK3HRrIpQhb3SfzoxjgLQLY2l63A6LE
+HfUomeECfurjLefl628lLH5+AGSeDsk3sq4se8UCgYBspQ70kknXqUZmVs+bCewZ
+LYaZnPkWaKhQDPgd+hddJfoHEz7Koljad7BMKe+1MGo/hIxvxFpOFvIB6LFKY7HG
+cA273ZncnD8u//wLLnjQrZR5GXvj1VYEpRcEeql7bAPdsD9CoyHCD6bh1ZWqBqqf
+IxzRIPaJwoaZA2Dfe7t6eQ==
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAMbGhxdklZZcMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEArCdzE7kixfdqothlf8iOtfM23jlN+njYUn1nmaCy
-R8LL7S5FZNX9M3SHEwAHLxwRjOM+0B8IRFHlGfptbUhQ/NIm6m9YPo17PigNG3p7
-OLym9MDJ6gstX8gFvwIS5CI1u7fDlfhTp5pxr/2MqYeExVR2OPRBFQ1A6VpKKaMn
-GFsCAwEAAaNQME4wHQYDVR0OBBYEFAlDj/Cyl+QUdOrQMyqasHJoFKrXMB8GA1Ud
-IwQYMBaAFAlDj/Cyl+QUdOrQMyqasHJoFKrXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEALdQDVKo5exyv9KK+8Zzjngc/gO3Zd5+eY9NJGxNUzY63lEv0
-nIPXZ+8To/E2FLiSDrdc8VhcXe4S+3/3EyNlPVx4+v9N9AlAffmhp5wJ8OCFPjkS
-DqRhqHmLoCu3fcCvf2IjPSYxlgZcTy7Lm39yyOsLOFR6KdTH4iKYOJ8qtiM=
+MIIDfTCCAmWgAwIBAgIUQ2HUuuPwxy7ChX8dJUETFpwf/mwwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZzEImzIbS4eidyWnt
+Rxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6R3tO
+0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg4TKs
+SmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2KSI4
+1BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshwIw2I
+ypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1zxmjG
+yUOdAgMBAAGjUzBRMB0GA1UdDgQWBBQdbqSqh4WXVO84H9hXbOtcbFlTYTAfBgNV
+HSMEGDAWgBQdbqSqh4WXVO84H9hXbOtcbFlTYTAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAxwOsIDBW0WyHfvVrYltysf+BOPEA8j4C3jfMy8170
+n0cCl+yyXrpQjCdSCkClc1mdH2uRbKlzitL0/pQntGk2ejBO6JqqtftUiLpiU8yM
+GiQJCgnW0a2uHQPnEBotmr/FK0kfQy5SfWk7BS3FDwbCdAAMUFeED7e94Nd+I3tl
+dITYI5jUrafpf/evMhTkB5EdQx1Y3FYdRPYSEBqO64bBWz7xE8ZmNqb993fIfrTR
+tJ00U0Mitd+4zDNhmJGtPF96FRAbr5HW25r1CCIc8TubsbggrqqjYaxxvKRJ0wH8
+Qxr2KZNxjrQgnryJuB0UfLQNv8VzVKMK6aUaOxxGJTHq
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 0fd0602b0b4..d1e7215d8ee 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -10,9 +10,8 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
@@ -49,7 +48,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (void)
+Simple_Server_i::call_client ()
 {
   size_t pre_call_connections =
     this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
@@ -87,7 +86,7 @@ Simple_Server_i::call_client (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index 7536e63f0d6..8444d669abe 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -28,15 +28,14 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
   CORBA::ORB_var orb_;
-
 };
 
 /**
@@ -57,9 +56,9 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
-  int call_client (void);
+  int call_client ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index a4fbe6a2637..e9dbb84e823 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -20,7 +20,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class  TX_Object_i : public virtual POA_TX_Object
+class TX_Object_i : public virtual POA_TX_Object
 {
 public:
   // Constructor
@@ -29,15 +29,14 @@ public:
   // Destructor
   ~TX_Object_i () override = default;
 
-  virtual void send (const DataSeq & data);
+  void send (const DataSeq & data) override;
 
-  virtual void recv (DataSeq_out data);
+  void recv (DataSeq_out data) override;
 
-  virtual void shutdown ();
+  void shutdown () override;
 
 private:
   CORBA::ORB_var orb_;
-
   DataSeq data_;
 };
 
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem b/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem
+++ b/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem b/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem b/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem b/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem b/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
index c2e101e5072..c9bce7f4a55 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
@@ -11,7 +11,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (void)
+Foo_i::baz ()
 {
   // Make sure that logging will occur.
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
@@ -30,7 +30,7 @@ Foo_i::baz (void)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
index b1b539d8812..37311e46ef9 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
@@ -19,24 +19,21 @@
 class Foo_i : public virtual POA_Foo::Bar
 {
 public:
-
   /// Constructor.
   Foo_i (CORBA::ORB_ptr,
          SecurityLevel3::SecurityCurrent_ptr current);
 
   /// Test method.
-  virtual void baz (void);
+  virtual void baz ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Reference to the ORB.
   CORBA::ORB_var orb_;
 
   /// Reference to the "SecurityCurrent" object.
   SecurityLevel3::SecurityCurrent_var current_;
-
 };
 
 #endif  /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 2aea77e7ca2..6a2b9729e2c 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
index f1b2d8da72f..754f82a4803 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   int result_;
 private:
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
index 791102d90eb..e6201b088d5 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
@@ -2,7 +2,7 @@ interface Messenger
   {
     boolean send_message (in string user_name,
                           in string subject,
-                          inout string message );
+                          inout string message);
 
     boolean call_message(in string user_name);
 
@@ -12,4 +12,3 @@ interface Messenger
      */
     oneway void shutdown ();
   };
-
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
index 53e4756bb70..939ac5713d9 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
   {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index 9e692470a23..e347070986f 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -42,8 +42,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
 
     //Get reference to Root POA
-    CORBA::Object_var POA_obj = orb->resolve_initial_references( "RootPOA" );
-    PortableServer::POA_var poa = PortableServer::POA::_narrow( POA_obj.in() );
+    CORBA::Object_var POA_obj = orb->resolve_initial_references( "RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow( POA_obj.in());
 
     // Activate POA Manager
     PortableServer::POAManager_var mgr = poa->the_POAManager();
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
index 613fff71ac8..55b31a10e62 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
@@ -10,7 +10,7 @@ Messenger_i::Messenger_i (CORBA::ORB_var orb)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -56,7 +56,7 @@ Messenger_i::call_message (const char * user_name)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
index cdd6cad484a..0172d33db30 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
@@ -17,7 +17,7 @@ public:
   Messenger_i (CORBA::ORB_var orb);
 
   // Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message ( const char * user_name,
                                         const char * subject,
@@ -25,7 +25,7 @@ public:
 
   virtual CORBA::Boolean call_message (const char * user_name);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys
index 704a96b0745..68c43cd8802 100755
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 
-openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:2048 \
     -out server-cert.pem -keyout server-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
 
 cat server-cert.pem >>server-key.pem
 cat server-cert.pem >ca.pem
 
-openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:2048 \
     -out client-cert.pem -keyout client-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/cacert.pem b/TAO/orbsvcs/tests/Security/Callback/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/tests/Security/Callback/cacert.pem
+++ b/TAO/orbsvcs/tests/Security/Callback/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 723a82b5006..fcbdaf63893 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -55,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Get the Root POA.
       //
       CORBA::Object_var obj =
-        orb->resolve_initial_references ( "RootPOA" );
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (obj.in ());
@@ -63,7 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       //
       // Get a reference to the server.
       //
-      obj = orb->string_to_object ( ior );
+      obj = orb->string_to_object (ior);
 
       if (CORBA::is_nil (obj.in ()))
         {
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_cert.pem b/TAO/orbsvcs/tests/Security/Callback/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Callback/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index a78901c9e85..eea1bb60430 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -6,7 +6,7 @@ client_i::client_i (server_ptr s)
 {
 }
 
-client_i::~client_i (void)
+client_i::~client_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index c359db5051a..1966178c441 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -26,16 +26,13 @@ class client_i
   : public virtual POA_client
 {
 public:
-
   client_i (server_ptr s);
-  virtual ~client_i (void);
+  virtual ~client_i ();
 
   virtual void test_reply (const char *msg);
 
 private:
-
   server_var server_;
-
 };
 
 #endif  /* CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_key.pem b/TAO/orbsvcs/tests/Security/Callback/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_key.pem
+++ b/TAO/orbsvcs/tests/Security/Callback/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index b08537aa825..61182c9d451 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ACE_TString env (ACE_TEXT("SSL_CERT_FILE="));
       env += cert_file;
-      ACE_OS::putenv ( ACE_TEXT_ALWAYS_CHAR(env.c_str ()) );
+      ACE_OS::putenv ( ACE_TEXT_ALWAYS_CHAR(env.c_str ()));
 
       //
       // Initialize the ORB
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_cert.pem b/TAO/orbsvcs/tests/Security/Callback/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Callback/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index 8084f520be6..8483de6b74d 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -6,7 +6,7 @@ server_i::server_i (CORBA::ORB_ptr orb)
 {
 }
 
-server_i::~server_i (void)
+server_i::~server_i ()
 {
 }
 
@@ -23,7 +23,7 @@ server_i::test_request (const char *msg)
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 81e804e754a..759001a23a5 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -24,22 +24,19 @@ class server_i
   : public virtual POA_server
 {
 public:
-
   server_i (CORBA::ORB_ptr orb);
-  virtual ~server_i (void);
+  virtual ~server_i ();
 
   virtual void set_client (client_ptr c);
 
   virtual void test_request (const char *msg);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   CORBA::ORB_var orb_;
 
   client_var client_;
-
 };
 
 #endif  /* SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_key.pem b/TAO/orbsvcs/tests/Security/Callback/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_key.pem
+++ b/TAO/orbsvcs/tests/Security/Callback/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem b/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index cc3033c6037..f79a12c7ecf 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       ACE_CString env ("SSL_CERT_FILE=");
@@ -117,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (call_shutdown)
         {
-
           // Let other clients to finish their task if any
           ACE_OS::sleep (wait_time);
 
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem b/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem b/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 2bc01f9b689..e8c9238936c 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       ACE_CString env ("SSL_CERT_FILE=");
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem b/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem b/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index a44b4fe03df..7cfc74c06c0 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -7,7 +7,6 @@
 void
 Simple_Server_i::send_line (const char *)
 {
-
   /*
   static unsigned long count = 0;
 
@@ -25,7 +24,7 @@ Simple_Server_i::send_line (const char *)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index fb2e86350c9..3391e218fca 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   void send_line (const char *line);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
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..4f1b86398cc 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -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/MT_BiDir_SSL/Client_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
index f0e94c59e2a..cf414bdc1bd 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README
index ba3837a0f48..7e512b9da42 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README
@@ -1,10 +1,8 @@
 /**
 
-
-
 @page MT_BiDir_SSL Test README File
 
-      This is a stress test that exercises the birectional GIOP
+      This is a stress test that exercises the bidirectional GIOP
 connection implementation with multiple threads in TAO using SSLIOP.
 
 To run the test use the run_test.pl script:
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
index 900e505506a..751dc660f08 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
@@ -1,6 +1,6 @@
 #include "Receiver_i.h"
 
-Receiver_i::Receiver_i (void)
+Receiver_i::Receiver_i ()
   :  message_count_ (0)
   ,  byte_count_ (0)
 {
@@ -16,7 +16,7 @@ Receiver_i::receive_payload (const Receiver::Payload &payload)
 }
 
 CORBA::Long
-Receiver_i::get_event_count (void)
+Receiver_i::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
index 8f426fb3106..ea27d75337e 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
@@ -13,11 +13,11 @@ class Receiver_i
 {
 public:
   /// Constructor
-  Receiver_i (void);
+  Receiver_i ();
 
 
   /// Get the number of events that have been received, local method
-  CORBA::Long get_event_count (void);
+  CORBA::Long get_event_count ();
 
   // = The skeleton methods
   virtual void receive_payload (const Receiver::Payload &payload);
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
index 00b43a9ed7d..262880457aa 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
@@ -19,7 +19,7 @@ Sender_i::Sender_i (CORBA::ULong no_clients,
     this->payload_[j] = (j % 256);
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
   delete []this->receivers_;
 }
@@ -49,7 +49,7 @@ Sender_i::receiver_object (Receiver_ptr recv)
 
 
 void
-Sender_i::send_message (void)
+Sender_i::send_message ()
 {
   // NOTE:No synchronization with purpose. Synchrnozing this is
   // going to spoil the whole purpose of this test.
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
index a57494d613d..e19766d6b8e 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
@@ -20,13 +20,13 @@ public:
   Sender_i (CORBA::ULong no_clients,
             ACE_Manual_Event &event);
 
-  virtual ~Sender_i (void);
+  virtual ~Sender_i ();
 
   // = The skeleton methods
   virtual CORBA::Long receiver_object (Receiver *recv);
 
   /// Public method defined locally
-  void send_message (void);
+  void send_message ();
 
 private:
   /// Synchronizing acces to this class
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
index c2919011234..48b6835359c 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
@@ -20,7 +20,7 @@ Server_Task::Server_Task (Sender_i *sender,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Wait for the Event\n"));
 
@@ -30,7 +30,6 @@ Server_Task::svc (void)
   this->event_.wait ();
 
 
-
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n"));
 
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
index 3a34b55d44c..71c65b4a4c2 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
@@ -30,7 +30,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// The sender object
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
index 58430f8754a..d3840afb384 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
index e9b17485db7..2de95d001d7 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
@@ -1,30 +1,42 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAKuAYVO4ksZ9MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4CPH9SubJrsaeuu6hssu/LbzOiNcF3/UehwrdkRA
-260uzpfcjPYZI7q5VQ/r8DwngJO2MsrZZUJ2V0eXHUyPOB/P1f7cDRhyv4pQZGq2
-iujBv45CBOoeg2xynI6HwoPX9F2d8L/x4aLhoz91GGxtUmaHWs3nFQBucGwYHAsr
-qgECAwEAAaNQME4wHQYDVR0OBBYEFN6xjSsmVHEEHASMbwbsmziIAK6aMB8GA1Ud
-IwQYMBaAFN6xjSsmVHEEHASMbwbsmziIAK6aMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAXmOUq0pSZAGxIMgAg4a4GfwIsyEjpDoUCyvTzKZlPQlqYc7G
-/4uBO4h2ppHORjmktR7VoD4yFSkltu8eX2dUThFMnLLP7jvMauDbR9/xEmiz6UFC
-4zetTrF9OuWbR8r9vXnhQ2UHw3GvRAsUb1/YFqoTv+M9Fqa+bsVHIaU7rnA=
+MIIDfTCCAmWgAwIBAgIUIOF6qH/s4kCSvf3GI0GN5RAJdZAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTgw
+NloYDzIwNTAwMTMwMTM1ODA2WjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1pNAwDrGOATwaYmnf
+seWdDJ/E2ubRGDNn6i7zTqjZG91RGvOHRkoL1rxZMZToalS/z0FPVosUU1OyPwyL
+R7VIaNwySd6T7zuzS7frvEWPKRasrXSXffaMQixCwEbSht7SjtkD0MrkT82a/KT2
+3Xuot4lGYBm1vNOImS6WOBYYcYyh1hfa5ozdk1F7mkZX6vUFPxMx4kK+MzESl5h8
+AfbaItAcR0UK4bhyjbbq8O/A6EcuatlBN+uPATdc08KqX2uvOTkhdkLa0AbXu7te
+HDNREY0oxIu7Vxtjy8hPAr1WNJmtfPORi7JBfWtZzp/UVipLEYBzJTnpbPN9PrJH
++S+fAgMBAAGjUzBRMB0GA1UdDgQWBBSG9kwf4KFPLjy9WUFTNiXDnsVtUzAfBgNV
+HSMEGDAWgBSG9kwf4KFPLjy9WUFTNiXDnsVtUzAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQA7jmwfbM+L0s3KerUXiye/icx1jggZnMO/v6jOW/vd
+yOicvj20w43izxo5eyWT8Mx++2yA5VNbyfFBCtY8ndl/txFYm5t3UTvwoj3OEWEF
+Lo2Bg2gb6s1x6P81j/YE4T6JZ7YoRAXDFB8LcpW830y5SugZUTGhRlAmary33RG3
+tKm+yPkFRdb9+qG3zZBloz88uI7Y4HOz4WNRaVK6EOmDV83fmiFN22bbjWY1CVV8
+j7dbHe0ZhUu26fNqAElROLo8vXeVrKa70U3hOHrOJMR6dquSVqEX5WgB5pF6iXAM
+FOReHdzmDVEIyWwBjU9r9v9cb1jbFlCpqQSoHALfYahh
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAM3CfzOObfOTMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAvwjlFgnEbTY2TKSc0FXEY+UVm8HKrPusXF6I98mo
-gCOcx+3MBBFgW5rc9R1XFkQowF4y8IW/0HXtziBcxlqPFDIi3zfnTn+8xEIK+3j1
-CEbUCpfdf23t2MIedd+/VKZ9T83DTxGfo7jjOeD0x6rjhLfZPzE+kq4tDFdr8ZMV
-VE8CAwEAAaNQME4wHQYDVR0OBBYEFJFL46pVEsip1DNKpRwbe25OW4L8MB8GA1Ud
-IwQYMBaAFJFL46pVEsip1DNKpRwbe25OW4L8MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAPjw7GXbGKDj7rHSNu/ILuz+eYAC0lPu8ncZXPgVnLfBZs1tJ
-zJvREYsoU5f3qi0M7IStntq/t0GgJ2azd7KK8hMRWPEDN1JPBdvTDew2EKGOj+by
-wPRqhgY3+hpdaSaQ6SG1O9+0YUxdODSpBN0Xf9FpudALpHcFqKgXtRVyITA=
+MIIDfTCCAmWgAwIBAgIUNP+MOI52XT5Rb680RdphE0czlO8wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTgw
+N1oYDzIwNTAwMTMwMTM1ODA3WjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQd7Xhe06WRK9KDLsQ
+wDxSsG2TT7kPgYYhhFqYc+KKWYG6wSA07WU/JptKMCu5n8IVWezTDyx0aluw3pu1
+PravUDUm/sPkeVKh5EUskFmY+xGly45fFMAwurr0ebK4kRmBsnEJrWMnwN1dZism
+ckqp7xt20u0Sc6Tf65Fr5F1XiiUrj8IHaYNtv5JjDJaEtZp47r2zbZBQNP35M44M
+i6Jhe/3cHqWzdhUEDE/2BHUB60u3lfZy016W+Zntbmp1Cwy43SB1zTp+doUT4PzU
+JplYYCEsRhff2ukToz/qCkh5sWwyGWpGDRP+lC6iM+ufwJM1wSwFDOqLMkN0G/N/
+YaVHAgMBAAGjUzBRMB0GA1UdDgQWBBT09HtWyL9IPGk8OmLvcE3K2MjKADAfBgNV
+HSMEGDAWgBT09HtWyL9IPGk8OmLvcE3K2MjKADAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQBWLv7c5/fp7eXw7asi5cJsUzSOZJURRXBGDUZzMTWM
+TgeqZaD7XjeA3gwcjn5wJbXyvAfmVdb2Xcm5PVJGCy3NPJuOXCiXgY0uNSymnjH7
+gj7Gp2AEf+KTHKXKe+hp/RyjPoacWl9/2R/V7TMKqxF08PTpfO5CHdWYzVbNiZfm
+LXJEGKEviEgFnxtnGx+6Q5GVShUKL2uOXRi5vdufbwbMsJzoXurbESVc09VyxLAy
+6tOhhAtXYx25uEj63crq/Y+8tX3vbufM2DI5Qnqb26se9nqQ+0LRX9gDyhRO7ieD
+kgXRY2+FkQqghVQq4ARlorMQgfYy5kPcKaJ+c6hlDeZK
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
index 84697501f07..58a298d6c34 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAM3CfzOObfOTMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAvwjlFgnEbTY2TKSc0FXEY+UVm8HKrPusXF6I98mo
-gCOcx+3MBBFgW5rc9R1XFkQowF4y8IW/0HXtziBcxlqPFDIi3zfnTn+8xEIK+3j1
-CEbUCpfdf23t2MIedd+/VKZ9T83DTxGfo7jjOeD0x6rjhLfZPzE+kq4tDFdr8ZMV
-VE8CAwEAAaNQME4wHQYDVR0OBBYEFJFL46pVEsip1DNKpRwbe25OW4L8MB8GA1Ud
-IwQYMBaAFJFL46pVEsip1DNKpRwbe25OW4L8MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAPjw7GXbGKDj7rHSNu/ILuz+eYAC0lPu8ncZXPgVnLfBZs1tJ
-zJvREYsoU5f3qi0M7IStntq/t0GgJ2azd7KK8hMRWPEDN1JPBdvTDew2EKGOj+by
-wPRqhgY3+hpdaSaQ6SG1O9+0YUxdODSpBN0Xf9FpudALpHcFqKgXtRVyITA=
+MIIDfTCCAmWgAwIBAgIUNP+MOI52XT5Rb680RdphE0czlO8wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTgw
+N1oYDzIwNTAwMTMwMTM1ODA3WjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQd7Xhe06WRK9KDLsQ
+wDxSsG2TT7kPgYYhhFqYc+KKWYG6wSA07WU/JptKMCu5n8IVWezTDyx0aluw3pu1
+PravUDUm/sPkeVKh5EUskFmY+xGly45fFMAwurr0ebK4kRmBsnEJrWMnwN1dZism
+ckqp7xt20u0Sc6Tf65Fr5F1XiiUrj8IHaYNtv5JjDJaEtZp47r2zbZBQNP35M44M
+i6Jhe/3cHqWzdhUEDE/2BHUB60u3lfZy016W+Zntbmp1Cwy43SB1zTp+doUT4PzU
+JplYYCEsRhff2ukToz/qCkh5sWwyGWpGDRP+lC6iM+ufwJM1wSwFDOqLMkN0G/N/
+YaVHAgMBAAGjUzBRMB0GA1UdDgQWBBT09HtWyL9IPGk8OmLvcE3K2MjKADAfBgNV
+HSMEGDAWgBT09HtWyL9IPGk8OmLvcE3K2MjKADAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQBWLv7c5/fp7eXw7asi5cJsUzSOZJURRXBGDUZzMTWM
+TgeqZaD7XjeA3gwcjn5wJbXyvAfmVdb2Xcm5PVJGCy3NPJuOXCiXgY0uNSymnjH7
+gj7Gp2AEf+KTHKXKe+hp/RyjPoacWl9/2R/V7TMKqxF08PTpfO5CHdWYzVbNiZfm
+LXJEGKEviEgFnxtnGx+6Q5GVShUKL2uOXRi5vdufbwbMsJzoXurbESVc09VyxLAy
+6tOhhAtXYx25uEj63crq/Y+8tX3vbufM2DI5Qnqb26se9nqQ+0LRX9gDyhRO7ieD
+kgXRY2+FkQqghVQq4ARlorMQgfYy5kPcKaJ+c6hlDeZK
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
index 71cde978fe0..cece95b57e3 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAL8I5RYJxG02Nkyk
-nNBVxGPlFZvByqz7rFxeiPfJqIAjnMftzAQRYFua3PUdVxZEKMBeMvCFv9B17c4g
-XMZajxQyIt83505/vMRCCvt49QhG1AqX3X9t7djCHnXfv1SmfU/Nw08Rn6O44zng
-9Meq44S32T8xPpKuLQxXa/GTFVRPAgMBAAECgYEAhyTow9V3E3fFpCTUFwKF49Gd
-nsnS8ts8jUAHj5wmyzfmYv3UVZBhZYzCAdmW0Va4qZY6XTORhgzXhfoZB+3qxzhU
-y8vFzjYdHKoDZyfsOXa/74UqctHHOGE4uY0t9ANY4c/eRDYtQ1Xm1Ze0LYmRgtZI
-/7c1tbULjZD69j/zM/kCQQD7Y3JkbW1ta19GsjHxJQpY1dhxaZfGlLEfeDDb1LAX
-wlOJbu8WMXt2Ow4wfyLajZo2lknsLYR+PL7mBxpUy8JTAkEAwooE4MNsC9hEcpYc
-E8ohnb6j6X5084qM8xaWLEbp9+3qizdNk3jAHwqXW79sNRJ9LtoXTGy0QfF950oF
-WXqelQJBAKonQrtVEfc48PFCFem5/4nnnKwPI8smw8igKrnw+Qvr3W0tqCimb4G0
-MUOEGkxCAjqmePyiRobHiRLbhegVTr8CQQCaBs8/6lp0smHXW9SVMpgVHmkHKTGN
-1igtG7gBDJCY1Y27dij810E+EpOud8xD5QSqgNCrmPHLuFmYM7oyk2xVAkEApncl
-77y5+vjjOBuVIOujfls52NQIliK5DwwrG9s2rnvPcQ8UGeNb9cpWxBnr8ENALj6Y
-dO8d7Zudp94vU/mSkg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQd7Xhe06WRK9K
+DLsQwDxSsG2TT7kPgYYhhFqYc+KKWYG6wSA07WU/JptKMCu5n8IVWezTDyx0aluw
+3pu1PravUDUm/sPkeVKh5EUskFmY+xGly45fFMAwurr0ebK4kRmBsnEJrWMnwN1d
+Zismckqp7xt20u0Sc6Tf65Fr5F1XiiUrj8IHaYNtv5JjDJaEtZp47r2zbZBQNP35
+M44Mi6Jhe/3cHqWzdhUEDE/2BHUB60u3lfZy016W+Zntbmp1Cwy43SB1zTp+doUT
+4PzUJplYYCEsRhff2ukToz/qCkh5sWwyGWpGDRP+lC6iM+ufwJM1wSwFDOqLMkN0
+G/N/YaVHAgMBAAECggEAT4Npj0B+ABjglyj17PS1zYBXuxlsZ7qqk3wtJfsFjGmJ
+btcc1rM5q/Wow4pOEzYZTBWJnBMsjJbItFSkJWRvP70jGOWRiEKyPueXbuD8G7qf
+x5I1kpSSncOLbZZBkd5eUTbjoKJOsKoChQ5kJPzw95Io8pCPNjt/xpzOUc2/wJRS
+xS2/raReRe+1xLzacgSOyFsQ1SEHeC+LjhHchLL7OvRMpUSXM+fg8bwSAvUoOyUb
+WCKGpk5myAKUXZpL3hrzK7cnIAvjNlfpMRpnKbWaKUKNb8XlEfiaGnkA754sRobJ
+EUilb4k9LC2F98sBhYh+DKkr5F9tsIhsRf/XqJdTqQKBgQD55j6D4kxqTmsfYxPE
+ngIDKHyMVsYmmlMsV9lkRO/dl0na4CS4reBO0BJ08vwd4p+shEvPB+l7FwXMhfF3
+laRJWRUKe2Mc3QLVDDd8YNZ9OMkcbOS/BHyLWIfXgZO5FVXOSlaG9sQI9hbbNIoY
+sq6OduxU8JMMaIPJt+THAr7bywKBgQDVjoltdzeVM7XI7fDmzgpl1FrKKLjbnHk1
+FjiJBHTsqNrvyvWWyRwZh5XSYNHtPs3gA72v/xKtuAo00Xz+v5VzOs60DKyrvFA6
+HL4ilqMoRVotsuxssg8RSiKNUkJPesZ6W3g41RR/kvbeB6k3au9YlBzsKT3yFfX2
+FxMTstpk9QKBgQDO3GMfdPJghW1zW+Z/OXTc/GStHx+D0PfMmyPfNpmASr3eKvD6
+1yP42ZCNsp40duZKPnEqfZguRk6MkMvje8G03cLnHGBdAi5YAXbkxJyIp7sChrmL
+zcDy8GPyZtbLvPd8fljF+/sml98vsXwnGbIZSCQ147c17EY7crg0bPdkpQKBgCue
+g39yXE4DU9wIja3247TM3QZxruBcY31uXnnOCTvVeXKFGAiGZ1DnmrhvwjEdJNve
+p73s8Zm9/4euSkOWSiZRGqs384TYX+KewE88SXMOR08SPqws6lrzs37+EEE/qI6R
+ZErnatpr4DSViACjvONwzT+HZPmvdp+fMuxRGb6JAoGBAKrCbGUDfEJdBfHpfU2G
+8P4kW+eAU4tMl9BeMhWmYB2aUIkHgcivQKNNBLSYnKt9B/0fe2qoyPteyFOi/mur
+68IIc0aZm8ut8rw3QguX6HnKa6Lmxz7KO3/rrcDY1iOUbvu9rLncqWipTsavurRi
+GDdTB467Bg1cPkS+1u3hZa2k
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAM3CfzOObfOTMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAvwjlFgnEbTY2TKSc0FXEY+UVm8HKrPusXF6I98mo
-gCOcx+3MBBFgW5rc9R1XFkQowF4y8IW/0HXtziBcxlqPFDIi3zfnTn+8xEIK+3j1
-CEbUCpfdf23t2MIedd+/VKZ9T83DTxGfo7jjOeD0x6rjhLfZPzE+kq4tDFdr8ZMV
-VE8CAwEAAaNQME4wHQYDVR0OBBYEFJFL46pVEsip1DNKpRwbe25OW4L8MB8GA1Ud
-IwQYMBaAFJFL46pVEsip1DNKpRwbe25OW4L8MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAPjw7GXbGKDj7rHSNu/ILuz+eYAC0lPu8ncZXPgVnLfBZs1tJ
-zJvREYsoU5f3qi0M7IStntq/t0GgJ2azd7KK8hMRWPEDN1JPBdvTDew2EKGOj+by
-wPRqhgY3+hpdaSaQ6SG1O9+0YUxdODSpBN0Xf9FpudALpHcFqKgXtRVyITA=
+MIIDfTCCAmWgAwIBAgIUNP+MOI52XT5Rb680RdphE0czlO8wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTgw
+N1oYDzIwNTAwMTMwMTM1ODA3WjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQd7Xhe06WRK9KDLsQ
+wDxSsG2TT7kPgYYhhFqYc+KKWYG6wSA07WU/JptKMCu5n8IVWezTDyx0aluw3pu1
+PravUDUm/sPkeVKh5EUskFmY+xGly45fFMAwurr0ebK4kRmBsnEJrWMnwN1dZism
+ckqp7xt20u0Sc6Tf65Fr5F1XiiUrj8IHaYNtv5JjDJaEtZp47r2zbZBQNP35M44M
+i6Jhe/3cHqWzdhUEDE/2BHUB60u3lfZy016W+Zntbmp1Cwy43SB1zTp+doUT4PzU
+JplYYCEsRhff2ukToz/qCkh5sWwyGWpGDRP+lC6iM+ufwJM1wSwFDOqLMkN0G/N/
+YaVHAgMBAAGjUzBRMB0GA1UdDgQWBBT09HtWyL9IPGk8OmLvcE3K2MjKADAfBgNV
+HSMEGDAWgBT09HtWyL9IPGk8OmLvcE3K2MjKADAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQBWLv7c5/fp7eXw7asi5cJsUzSOZJURRXBGDUZzMTWM
+TgeqZaD7XjeA3gwcjn5wJbXyvAfmVdb2Xcm5PVJGCy3NPJuOXCiXgY0uNSymnjH7
+gj7Gp2AEf+KTHKXKe+hp/RyjPoacWl9/2R/V7TMKqxF08PTpfO5CHdWYzVbNiZfm
+LXJEGKEviEgFnxtnGx+6Q5GVShUKL2uOXRi5vdufbwbMsJzoXurbESVc09VyxLAy
+6tOhhAtXYx25uEj63crq/Y+8tX3vbufM2DI5Qnqb26se9nqQ+0LRX9gDyhRO7ieD
+kgXRY2+FkQqghVQq4ARlorMQgfYy5kPcKaJ+c6hlDeZK
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
index 704a96b0745..68c43cd8802 100755
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 
-openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:2048 \
     -out server-cert.pem -keyout server-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
 
 cat server-cert.pem >>server-key.pem
 cat server-cert.pem >ca.pem
 
-openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:2048 \
     -out client-cert.pem -keyout client-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
index 285f66707b9..2ff8794143d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAKuAYVO4ksZ9MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4CPH9SubJrsaeuu6hssu/LbzOiNcF3/UehwrdkRA
-260uzpfcjPYZI7q5VQ/r8DwngJO2MsrZZUJ2V0eXHUyPOB/P1f7cDRhyv4pQZGq2
-iujBv45CBOoeg2xynI6HwoPX9F2d8L/x4aLhoz91GGxtUmaHWs3nFQBucGwYHAsr
-qgECAwEAAaNQME4wHQYDVR0OBBYEFN6xjSsmVHEEHASMbwbsmziIAK6aMB8GA1Ud
-IwQYMBaAFN6xjSsmVHEEHASMbwbsmziIAK6aMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAXmOUq0pSZAGxIMgAg4a4GfwIsyEjpDoUCyvTzKZlPQlqYc7G
-/4uBO4h2ppHORjmktR7VoD4yFSkltu8eX2dUThFMnLLP7jvMauDbR9/xEmiz6UFC
-4zetTrF9OuWbR8r9vXnhQ2UHw3GvRAsUb1/YFqoTv+M9Fqa+bsVHIaU7rnA=
+MIIDfTCCAmWgAwIBAgIUIOF6qH/s4kCSvf3GI0GN5RAJdZAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTgw
+NloYDzIwNTAwMTMwMTM1ODA2WjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1pNAwDrGOATwaYmnf
+seWdDJ/E2ubRGDNn6i7zTqjZG91RGvOHRkoL1rxZMZToalS/z0FPVosUU1OyPwyL
+R7VIaNwySd6T7zuzS7frvEWPKRasrXSXffaMQixCwEbSht7SjtkD0MrkT82a/KT2
+3Xuot4lGYBm1vNOImS6WOBYYcYyh1hfa5ozdk1F7mkZX6vUFPxMx4kK+MzESl5h8
+AfbaItAcR0UK4bhyjbbq8O/A6EcuatlBN+uPATdc08KqX2uvOTkhdkLa0AbXu7te
+HDNREY0oxIu7Vxtjy8hPAr1WNJmtfPORi7JBfWtZzp/UVipLEYBzJTnpbPN9PrJH
++S+fAgMBAAGjUzBRMB0GA1UdDgQWBBSG9kwf4KFPLjy9WUFTNiXDnsVtUzAfBgNV
+HSMEGDAWgBSG9kwf4KFPLjy9WUFTNiXDnsVtUzAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQA7jmwfbM+L0s3KerUXiye/icx1jggZnMO/v6jOW/vd
+yOicvj20w43izxo5eyWT8Mx++2yA5VNbyfFBCtY8ndl/txFYm5t3UTvwoj3OEWEF
+Lo2Bg2gb6s1x6P81j/YE4T6JZ7YoRAXDFB8LcpW830y5SugZUTGhRlAmary33RG3
+tKm+yPkFRdb9+qG3zZBloz88uI7Y4HOz4WNRaVK6EOmDV83fmiFN22bbjWY1CVV8
+j7dbHe0ZhUu26fNqAElROLo8vXeVrKa70U3hOHrOJMR6dquSVqEX5WgB5pF6iXAM
+FOReHdzmDVEIyWwBjU9r9v9cb1jbFlCpqQSoHALfYahh
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
index 570f605a1a0..65ef88f36da 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOAjx/Urmya7Gnrr
-uobLLvy28zojXBd/1HocK3ZEQNutLs6X3Iz2GSO6uVUP6/A8J4CTtjLK2WVCdldH
-lx1Mjzgfz9X+3A0Ycr+KUGRqtorowb+OQgTqHoNscpyOh8KD1/RdnfC/8eGi4aM/
-dRhsbVJmh1rN5xUAbnBsGBwLK6oBAgMBAAECgYAuEWyhyYqkFUTGCvlVhyFrM7ce
-NfJRqiZjyrJsJm8mN5wtPi1Ik7RrEY/SGemmgNalqLaEDglMtLJaEg7PKNMulWpN
-FIP1uBfA6Kv8vTJvf3PWNiZ9E70Yxsj9xxYDiIhwaNd8UMDMu9i4ipOkZkUWGkTr
-bPESK4sSytRh8K3+2QJBAPYLGJnqNVb+e8b5Z5S8bNiQaP5ZWUgUSlsUhcpcI5sy
-h3HQhTK/Z0sbGANpW8OVa3RM3SP43mJk+FD2WY11+/MCQQDpNcX4Gea7FBRRZ9Zi
-hGLTgLXRAeLR2oxQFs8KCZb0RyRMAjuKNg+FeXORQvxKZbY6qCga41I9PSgsBjAE
-TkM7AkALgb9Xy21NMT+msZlXimxowHA4nQMg7NoBYndTXHXJ11YgS4k/M1ZoW88G
-sdG51u4clU+uVABKh8BZQPw1MnRjAkEAvE1sBTE8yW+kHDsAstl8RpTVueaQ86tI
-wl44XD10AtfyqeDfnHCcRcTUGMWCmrvX0TL39wX34HSiHDH+0Ws0AwJAMuzL2UA4
-2aBTBcTe4CZu1zUHnJHQLKfWdDdjDQML8Dh9cOczibmNi3D4v9XDuCk8xOvzyG5d
-3VSuogRvmdH1GA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1pNAwDrGOATwa
+YmnfseWdDJ/E2ubRGDNn6i7zTqjZG91RGvOHRkoL1rxZMZToalS/z0FPVosUU1Oy
+PwyLR7VIaNwySd6T7zuzS7frvEWPKRasrXSXffaMQixCwEbSht7SjtkD0MrkT82a
+/KT23Xuot4lGYBm1vNOImS6WOBYYcYyh1hfa5ozdk1F7mkZX6vUFPxMx4kK+MzES
+l5h8AfbaItAcR0UK4bhyjbbq8O/A6EcuatlBN+uPATdc08KqX2uvOTkhdkLa0AbX
+u7teHDNREY0oxIu7Vxtjy8hPAr1WNJmtfPORi7JBfWtZzp/UVipLEYBzJTnpbPN9
+PrJH+S+fAgMBAAECggEASxYFJUh9pxjlknaKE3lDVGdKiCKA9YBOh68rl1I1xAGb
+vBIrBwlMRJaQp0Iyrtx9igiPk89PkKhdWbpsYgrTakpGc9dLVdW31QcA0Uazbllq
+0RimsJTWXOZhy3oWDKLJ6zo3hTdDF5vRfzberlmh631rFpdVKWYT/0xrEJfAsntS
+akrYm+oFH83hLayJhf/hii/N6c9vjhE0Wa4cgnaEqQZnf50anZdGSp0J0LaLVj/o
+wypN0Bb74Rr9J8ks5WdngKWB4UDMjqx/sAlETJDnEoWTu1xdKRnLeU3Hq2RWCCJ/
+MOUGX6pOD3gldYysMMNBIoRBBBc/f1xDkCkaNHuXyQKBgQDw310b07h2dUKRJhYZ
+YbcEic1LodaG1QVDBT1cNHs/QG3+1gBQmxHLP+uf/mofADkR27ell9MgvyhUZirj
+LyTA3GWIW7OLRcg0Zrr4SmAFv5zXXbVfbigZapd+MJpUXPVKbUzX6zBy/2BDNG0x
+dplxkzSm2nAMdSOVyybCTYQPqwKBgQDBDTKkcRERPX1ajmfhrk5nF+YVrU7cWywv
+7TgohjSUbuYce+XsgIBVWkpHjdjsPly46v1acHPAVNez8bu38rUd0zlE42g6rpAc
+VR4XK8N5/iiIxCtpv4F1s8GqbYUm3nZI0j+08dfX1YuMUKPHicmEb4DQoo+qmXRJ
+dcLBRdH73QKBgQDOWnz4xvQDv8dMdDWAfx78q1WOUtJnZn2Agi+kG23urTLOm+Vf
+KMogtt0Ujy+46Ub7DqGRIrWEG1/gljptsMiq1OXC4NS7Hwg6JDxPU+BZbGNgee5V
+GBkQVSn9uIOufIjDv0mSvPEfw7pjOLnHI1SnYTY9L2vIsF3RCV5mHWRiywKBgHZX
+z9aslUjbR+/uYlIfl2JtbReWwUQmA+VxZz64Xp0ripalgSJE9+bazbQliXfxFsgp
+DZyWWO7rU7u0kV3HRC3/YRkQysFGZ4NmzmZn5pHvMwv8LZzKz+LGig8eykQ0lZA4
+iuMyah2eg8hFWtEkb0tnSzEapjVvkrDBptzyHzJlAoGBAM7yA/XnbKpaHJzAswgd
+Ks6FLHK/94e9aw3YjqR48FcFGtLuHOVSvXhT/WlwmQB6wUTDUWk+hEDTPJ4yeENd
+pgFpg2G3eDxWh3mzhOKJmyQM8OMCoohnOpBljceMADRUFum8CckJ7cy/HCU2p4do
+JQluDrECO1IkRC8UUTWpyMAA
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAKuAYVO4ksZ9MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4CPH9SubJrsaeuu6hssu/LbzOiNcF3/UehwrdkRA
-260uzpfcjPYZI7q5VQ/r8DwngJO2MsrZZUJ2V0eXHUyPOB/P1f7cDRhyv4pQZGq2
-iujBv45CBOoeg2xynI6HwoPX9F2d8L/x4aLhoz91GGxtUmaHWs3nFQBucGwYHAsr
-qgECAwEAAaNQME4wHQYDVR0OBBYEFN6xjSsmVHEEHASMbwbsmziIAK6aMB8GA1Ud
-IwQYMBaAFN6xjSsmVHEEHASMbwbsmziIAK6aMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAXmOUq0pSZAGxIMgAg4a4GfwIsyEjpDoUCyvTzKZlPQlqYc7G
-/4uBO4h2ppHORjmktR7VoD4yFSkltu8eX2dUThFMnLLP7jvMauDbR9/xEmiz6UFC
-4zetTrF9OuWbR8r9vXnhQ2UHw3GvRAsUb1/YFqoTv+M9Fqa+bsVHIaU7rnA=
+MIIDfTCCAmWgAwIBAgIUIOF6qH/s4kCSvf3GI0GN5RAJdZAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTgw
+NloYDzIwNTAwMTMwMTM1ODA2WjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1pNAwDrGOATwaYmnf
+seWdDJ/E2ubRGDNn6i7zTqjZG91RGvOHRkoL1rxZMZToalS/z0FPVosUU1OyPwyL
+R7VIaNwySd6T7zuzS7frvEWPKRasrXSXffaMQixCwEbSht7SjtkD0MrkT82a/KT2
+3Xuot4lGYBm1vNOImS6WOBYYcYyh1hfa5ozdk1F7mkZX6vUFPxMx4kK+MzESl5h8
+AfbaItAcR0UK4bhyjbbq8O/A6EcuatlBN+uPATdc08KqX2uvOTkhdkLa0AbXu7te
+HDNREY0oxIu7Vxtjy8hPAr1WNJmtfPORi7JBfWtZzp/UVipLEYBzJTnpbPN9PrJH
++S+fAgMBAAGjUzBRMB0GA1UdDgQWBBSG9kwf4KFPLjy9WUFTNiXDnsVtUzAfBgNV
+HSMEGDAWgBSG9kwf4KFPLjy9WUFTNiXDnsVtUzAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQA7jmwfbM+L0s3KerUXiye/icx1jggZnMO/v6jOW/vd
+yOicvj20w43izxo5eyWT8Mx++2yA5VNbyfFBCtY8ndl/txFYm5t3UTvwoj3OEWEF
+Lo2Bg2gb6s1x6P81j/YE4T6JZ7YoRAXDFB8LcpW830y5SugZUTGhRlAmary33RG3
+tKm+yPkFRdb9+qG3zZBloz88uI7Y4HOz4WNRaVK6EOmDV83fmiFN22bbjWY1CVV8
+j7dbHe0ZhUu26fNqAElROLo8vXeVrKa70U3hOHrOJMR6dquSVqEX5WgB5pF6iXAM
+FOReHdzmDVEIyWwBjU9r9v9cb1jbFlCpqQSoHALfYahh
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index fcc3766bfbf..de55515f5c6 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -9,7 +9,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (void)
+Client_Worker::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -32,9 +32,8 @@ Client_Worker::validate_connection (void)
 }
 
 int
-Client_Worker::svc (void)
+Client_Worker::svc ()
 {
-
   try
     {
       // Validate connections befire doing any actual work..
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index cb0856a959a..c153997ffa4 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -30,7 +30,6 @@
  */
 class Client_Worker : public ACE_Task_Base
 {
-
 public:
   /// ctor
   Client_Worker (Simple_Server_ptr server, int niterations);
@@ -40,7 +39,7 @@ public:
 
 private:
   /// Validate the connection
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The server.
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index 0d3f42a283f..1405bed4ce4 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -6,7 +6,7 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Worker::svc (void)
+Server_Worker::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
index 8094a5cc390..5aef7649ee1 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
@@ -31,7 +31,6 @@
 class Server_Worker : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Server_Worker (CORBA::ORB_ptr orb);
 
@@ -42,7 +41,6 @@ public:
 private:
   /// The ORB
   CORBA::ORB_var orb_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index d274c19202e..07bf6504936 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -16,7 +16,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
   while ((c = get_opts ()) != -1)
     switch (c)
       {
-
       case 'k':
         ior = get_opts.opt_arg ();
         break;
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 41dad39c610..d1d6d3cec23 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -11,13 +11,12 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Simple_Server_i::ping (void)
+Simple_Server_i::ping ()
 {
-  return;
 }
 
 void
-Simple_Server_i::validate_protocol (void)
+Simple_Server_i::validate_protocol ()
 {
   if (this->validated_ == NOT_VALIDATED)
     {
@@ -74,7 +73,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index ac63e1363ff..7688de68c5f 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -27,13 +27,13 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
-  void ping (void);
+  void ping ();
 
-  void validate_protocol (void);
+  void validate_protocol ();
 
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 3f01c998b92..0d613916741 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (void)
+Client_Worker::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -34,9 +34,8 @@ Client_Worker::validate_connection (void)
 }
 
 int
-Client_Worker::svc (void)
+Client_Worker::svc ()
 {
-
   try
     {
       // Validate connections befire doing any actual work..
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index af5644efc9e..b8bc8551311 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -30,7 +30,6 @@
  */
 class Client_Worker : public ACE_Task_Base
 {
-
 public:
   /// ctor
   Client_Worker (Simple_Server_ptr server,
@@ -42,7 +41,7 @@ public:
 
 private:
   /// Validate the connection
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The server.
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 0d3f42a283f..1405bed4ce4 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -6,7 +6,7 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Worker::svc (void)
+Server_Worker::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
index 8094a5cc390..5aef7649ee1 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
@@ -31,7 +31,6 @@
 class Server_Worker : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Server_Worker (CORBA::ORB_ptr orb);
 
@@ -42,7 +41,6 @@ public:
 private:
   /// The ORB
   CORBA::ORB_var orb_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index a20b3a72666..553c898e047 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -18,7 +18,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
   while ((c = get_opts ()) != -1)
     switch (c)
       {
-
       case 'k':
         ior = get_opts.opt_arg ();
         break;
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index b7fb970ade2..19cc9236609 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -16,7 +16,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index e86c3d80b96..a35a606020f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
index 55c5b3d403c..f55e54e6e20 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
@@ -8,7 +8,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,"SUCCESS: server received expected shutdown\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
index 79c342ac8aa..a3617e357de 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
@@ -18,17 +18,14 @@
 class Foo_i : public virtual POA_Foo
 {
 public:
-
   /// Constructor.
   Foo_i (CORBA::ORB_ptr);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* NULL_CIPHER_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/cacert.pem b/TAO/orbsvcs/tests/Security/Null_Cipher/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/cacert.pem
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
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/Null_Cipher/client_cert.pem b/TAO/orbsvcs/tests/Security/Null_Cipher/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client_key.pem b/TAO/orbsvcs/tests/Security/Null_Cipher/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client_key.pem
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server_cert.pem b/TAO/orbsvcs/tests/Security/Null_Cipher/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server_key.pem b/TAO/orbsvcs/tests/Security/Null_Cipher/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server_key.pem
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index 26c904715f2..53a6e121397 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -10,7 +10,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (void)
+Foo_i::baz ()
 {
   SecurityLevel3::ClientCredentials_var credentials =
     this->current_->client_credentials ();
@@ -26,7 +26,7 @@ Foo_i::baz (void)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 7048d75aa8a..954e3d9456e 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -19,24 +19,21 @@
 class Foo_i : public virtual POA_Foo::Bar
 {
 public:
-
   /// Constructor.
   Foo_i (CORBA::ORB_ptr,
          SecurityLevel3::SecurityCurrent_ptr current);
 
   /// Test method.
-  virtual void baz (void);
+  virtual void baz ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Reference to the ORB.
   CORBA::ORB_var orb_;
 
   /// Reference to the "SecurityCurrent" object.
   SecurityLevel3::SecurityCurrent_var current_;
-
 };
 
 #endif  /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
index d98dd5918cb..b134e6fce3e 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
@@ -1,16 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
-BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
-Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
-Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
-qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
-yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
-VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
-Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
-KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
-pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
-4ERB9b/3K4StZjMUkPmBolSIkPo=
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
index b86bd5de1d2..43f352ff7ae 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:34 2011 GMT
-            Not After : May 25 14:01:34 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
-                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
-                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
-                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
-                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
-                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
-                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
-                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
-                    06:4e:57:64:af:2d:b3:88:ef
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
-        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
-        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
-        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
-        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
-        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
-        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
-        b9:04
 -----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
-emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
-fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
-gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
-qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
-hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
-BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
-adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
-e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
-E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
-TZuRcTfkwgLd4bkE
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
index e761037f237..47856fe8243 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
-Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
-TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
-AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
-xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
-UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
-lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
-HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
-6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
-RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
-FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
-JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
-UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N
+SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM
+3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI
+B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9
+nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv
+l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9
+GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb
+19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6
+uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg
+BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3
+NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp
+0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX
+v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/
+UAuwPSA6NVaSx1s=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi
+rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh
+u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3
+dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud
+IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At
+P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg
+V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
index 5402ae2497a..36d5d6755d7 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
@@ -1,59 +1,15 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Tennessee, O=DOC Group
-        Validity
-            Not Before: Jun 15 14:01:15 2011 GMT
-            Not After : May 25 14:01:15 2032 GMT
-        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
-                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
-                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
-                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
-                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
-                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
-                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
-                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
-                    23:83:36:f0:15:22:22:db:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
-            X509v3 Authority Key Identifier: 
-                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
-
-    Signature Algorithm: sha1WithRSAEncryption
-        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
-        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
-        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
-        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
-        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
-        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
-        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
-        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
-EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
-NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
-dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
-oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
-e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
-c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
-PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
-wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
-mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
index be238899a9f..e5c9ad87a19 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
@@ -1,15 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
-HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
-AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
-AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
-T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
-2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
-/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
-/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
-EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
-mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
-eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
-Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
-ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7
+6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3
+dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp
+EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ
+cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw
+tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl
+tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg
+0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R
+dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h
+imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq
+YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V
+9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO
+97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k
+Cqa2a+GhAm4rRto=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
+DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw
+NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
+IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98
+MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR
+QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO
+C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud
+IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP
+E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp
+busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index 7adcf51ace6..07ae135debb 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -10,7 +10,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (void)
+Foo_i::baz ()
 {
   if (this->current_.in() == 0)
     {
@@ -49,7 +49,7 @@ Foo_i::baz (void)
 }
 
 void
-Foo_i::shutdown (void)
+Foo_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
index 64b1564a5e2..5abe3a68709 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
@@ -19,24 +19,21 @@
 class Foo_i : public virtual POA_Foo::Bar
 {
 public:
-
   /// Constructor.
   Foo_i (CORBA::ORB_ptr,
          SecurityLevel3::SecurityCurrent_ptr);
 
   /// Test method.
-  virtual void baz (void);
+  virtual void baz ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Reference to the ORB.
   CORBA::ORB_var orb_;
 
   /// Reference to the "SecurityCurrent" object.
   SecurityLevel3::SecurityCurrent_var current_;
-
 };
 
 #endif  /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index 3db89d561de..5bdb0cc1657 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -113,7 +113,7 @@ publish_ior (CORBA::ORB_ptr orb, CORBA::Object_ptr o, const ACE_TCHAR* filename)
                                      errno);
     }
 
-  ACE_OS::fprintf (output_file, "%s", ior.in() );
+  ACE_OS::fprintf (output_file, "%s", ior.in());
   ACE_OS::fclose (output_file);
 }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
index 2c3d7a968a5..633430af539 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
@@ -1,11 +1,7 @@
-/* -*- C++ -*-  */
-
 // messenger.idl
-
 interface Messenger
     {
         boolean send_message ( in    string user_name,
                                in    string subject,
-                               inout string message );
+                               inout string message);
     };
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
index 72b4e40c9e7..d4fc8e01786 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
@@ -42,24 +42,24 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ior );
+    CORBA::Object_var obj = orb->string_to_object(ior);
     if (CORBA::is_nil(obj.in())) {
       std::cerr << "Nil Messenger reference" << std::endl;
       return 1;
     }
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
+    Messenger_var messenger = Messenger::_narrow( obj.in());
     if (CORBA::is_nil(messenger.in())) {
       std::cerr << "Argument is not a Messenger reference" << std::endl;
       return 1;
     }
 
     CORBA::String_var message = CORBA::string_dup(
-      "Implementing security policy now!" );
+      "Implementing security policy now!");
     messenger->send_message( "Chief of Security",
                              "New Directive",
-                             message.inout() );
+                             message.inout());
     std::cout << "message was sent" << std::endl;
 
     orb->destroy ();
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
index d34cb1fa329..67cab2ac5f0 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
@@ -44,8 +44,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
 
     //Get reference to Root POA
-    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA" );
-    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in() );
+    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in());
 
     // Activate POA Manager
     PortableServer::POAManager_var mgr = poa->the_POAManager();
@@ -57,10 +57,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
-    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
-    CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
-    std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file) );
+      poa->activate_object( &messenger_servant);
+    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in());
+    CORBA::String_var str = orb->object_to_string( messenger_obj.in());
+    std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file));
     iorFile << str.in() << std::endl;
     iorFile.close();
     std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
index ed4ef394a2f..586ce510a09 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
@@ -10,12 +10,12 @@
 #include "Messenger_i.h"
 #include <iostream>
 // Implementation skeleton constructor
-Messenger_i::Messenger_i (void)
+Messenger_i::Messenger_i ()
   {
   }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
index 22c3e57f6aa..ba669aea224 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
@@ -14,17 +14,15 @@ class  Messenger_i : public virtual POA_Messenger
 {
 public:
   //Constructor
-  Messenger_i (void);
+  Messenger_i ();
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
-    char *& message
-    );
-
+    char *& message);
 };
 
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index 2eca75a9774..c5e27f4d2d0 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -29,15 +29,15 @@ public:
   My_Test_Object (CORBA::Short id = 0);
 
   /// Destructor.
-  ~My_Test_Object (void);
+  ~My_Test_Object () = default;
 
   // = Interface implementation accessor methods.
 
   /// Sets id.
-  void id (CORBA::Short id);
+  void id (CORBA::Short id) override;
 
   /// Gets id.
-  CORBA::Short id (void);
+  CORBA::Short id () override;
 
 private:
   short id_;
@@ -48,12 +48,8 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
-{
-}
-
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
@@ -65,8 +61,7 @@ My_Test_Object::id (CORBA::Short id)
 }
 
 // Constructor.
-
-CosNaming_Client::CosNaming_Client (void)
+CosNaming_Client::CosNaming_Client ()
   : argc_ (0),
     argv_ (0),
     test_ (0)
@@ -74,9 +69,8 @@ CosNaming_Client::CosNaming_Client (void)
 }
 
 // Parses the command line arguments and returns an error status.
-
 int
-CosNaming_Client::parse_args (void)
+CosNaming_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:"));
   int c;
@@ -177,7 +171,7 @@ CosNaming_Client::parse_args (void)
 // Execute client example code.
 
 int
-CosNaming_Client::run (void)
+CosNaming_Client::run ()
 {
   this->activate();
   int rv = test_->execute (naming_client_);
@@ -189,7 +183,7 @@ CosNaming_Client::run (void)
   return rv;
 }
 
-CosNaming_Client::~CosNaming_Client (void)
+CosNaming_Client::~CosNaming_Client ()
 {
   delete test_;
 }
@@ -248,7 +242,7 @@ MT_Test::MT_Test (CORBA::ORB_ptr orb,
 }
 
 int
-MT_Test::svc (void)
+MT_Test::svc ()
 {
   // Obtain object reference to the Naming Service (create new stub.)
 
@@ -289,11 +283,6 @@ MT_Test::svc (void)
     {
       ex._tao_print_exception (
         "Unexpected exception in MT test bind");
-      // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
-      // fails with optimize=1 debug=0; but works with any other
-      // settings for those flags).
-      ACE_DEBUG ((LM_DEBUG, "MT_Test(%t) - bind[3] %d\n",
-                  test_name_.length ()));
       return -1;
     }
 
@@ -379,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)
     {
@@ -976,7 +964,7 @@ Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_Begin::~Persistent_Test_Begin (void)
+Persistent_Test_Begin::~Persistent_Test_Begin ()
 {
 }
 
@@ -1027,7 +1015,7 @@ Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_End::~Persistent_Test_End (void)
+Persistent_Test_End::~Persistent_Test_End ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index 5d130b9aa5c..be037c1a1c5 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -30,11 +30,10 @@
  */
 class Naming_Test
 {
-
 public:
   /// Execute the test code.  <root_context> is the context to assume
   /// as the root for all tests operations.
-  virtual ~Naming_Test (void) {}
+  virtual ~Naming_Test () {}
   virtual int execute (TAO_Naming_Client &root_context) = 0;
 };
 
@@ -99,7 +98,6 @@ private:
 
   /// Holds object to be registered with the Naming Service by each thread.
   Test_Object_var test_ref_;
-
 };
 
 /**
@@ -227,13 +225,12 @@ public:
                          FILE * ior_output_file);
 
   /// Destructor.
-  virtual ~Persistent_Test_Begin (void);
+  virtual ~Persistent_Test_Begin ();
 
   /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
 
 private:
-
   /// A pointer to our ORB (needed for object/string conversion).
   CORBA::ORB_var orb_;
 
@@ -262,13 +259,12 @@ public:
                        const ACE_TCHAR * ior);
 
   /// Destructor.
-  virtual ~Persistent_Test_End (void);
+  virtual ~Persistent_Test_End ();
 
   /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
 
 private:
-
   /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
 
@@ -293,15 +289,15 @@ class CosNaming_Client : public ACE_Task_Base
 {
 public:
   /// Constructor.
-  CosNaming_Client (void);
+  CosNaming_Client ();
 
   /// Destructor.
-  ~CosNaming_Client (void);
+  ~CosNaming_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
-  int svc (void);
+  int svc ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -315,7 +311,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
index d7656c28a19..616274fb72c 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
@@ -1,9 +1,7 @@
+/// This is a simple interface that tests the Naming Service.
 interface Test_Object
 {
-  // = TITLE
-  //   This is a simple interface that tests the Naming Service.
-
+  /// This provides an easy way to differentiate objects if each
+  /// objects is served by a separate servant.
   attribute short id;
-  // This provides an easy way to differentiate objects if each
-  // objects is served by a separate servant.
 };
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 178109b8798..0b8e258dbcf 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -29,7 +29,7 @@ public:
   My_Test_Object (CORBA::Short id = 0);
 
   /// Destructor.
-  ~My_Test_Object (void);
+  ~My_Test_Object ();
 
   // = Interface implementation accessor methods.
 
@@ -37,7 +37,7 @@ public:
   void id (CORBA::Short id);
 
   /// Gets id.
-  CORBA::Short id (void);
+  CORBA::Short id ();
 
 private:
   short id_;
@@ -48,12 +48,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id)
 {
 }
 
-My_Test_Object::~My_Test_Object (void)
+My_Test_Object::~My_Test_Object ()
 {
 }
 
 CORBA::Short
-My_Test_Object::id (void)
+My_Test_Object::id ()
 {
   return id_;
 }
@@ -66,7 +66,7 @@ My_Test_Object::id (CORBA::Short id)
 
 // Constructor.
 
-CosNaming_Client::CosNaming_Client (void)
+CosNaming_Client::CosNaming_Client ()
   : argc_ (0),
     argv_ (0),
     test_ (0)
@@ -76,7 +76,7 @@ CosNaming_Client::CosNaming_Client (void)
 // Parses the command line arguments and returns an error status.
 
 int
-CosNaming_Client::parse_args (void)
+CosNaming_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:l"));
   int c;
@@ -188,12 +188,12 @@ CosNaming_Client::parse_args (void)
 // Execute client example code.
 
 int
-CosNaming_Client::run (void)
+CosNaming_Client::run ()
 {
   return test_->execute (naming_client_);
 }
 
-CosNaming_Client::~CosNaming_Client (void)
+CosNaming_Client::~CosNaming_Client ()
 {
   delete test_;
 }
@@ -233,7 +233,7 @@ Naming_Test::Naming_Test (PortableServer::POA_ptr poa)
 {
 }
 
-Naming_Test::~Naming_Test (void)
+Naming_Test::~Naming_Test ()
 {
 }
 
@@ -248,7 +248,7 @@ MT_Test::MT_Test (CORBA::ORB_ptr orb,
 }
 
 int
-MT_Test::svc (void)
+MT_Test::svc ()
 {
   // Obtain object reference to the Naming Service (create new stub.)
 
@@ -293,11 +293,6 @@ MT_Test::svc (void)
     {
       ex._tao_print_exception (
         "Unexpected exception in MT test bind");
-      // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
-      // fails with optimize=1 debug=0; but works with any other
-      // settings for those flags).
-      ACE_DEBUG ((LM_DEBUG, "MT_Test(%t) - bind[3] %d\n",
-                  test_name_.length ()));
       return -1;
     }
 
@@ -389,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)
     {
@@ -1054,7 +1048,7 @@ Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_Begin::~Persistent_Test_Begin (void)
+Persistent_Test_Begin::~Persistent_Test_Begin ()
 {
 }
 
@@ -1107,7 +1101,7 @@ Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_Test_End::~Persistent_Test_End (void)
+Persistent_Test_End::~Persistent_Test_End ()
 {
 }
 
@@ -1167,7 +1161,7 @@ Persistent_List_Test::Persistent_List_Test (CORBA::ORB_ptr orb,
 {
 }
 
-Persistent_List_Test::~Persistent_List_Test (void)
+Persistent_List_Test::~Persistent_List_Test ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 2c3189ce019..2c186d1f129 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -30,11 +30,10 @@
  */
 class Naming_Test
 {
-
 public:
   /// Execute the test code.  <root_context> is the context to assume
   /// as the root for all tests operations.
-  virtual ~Naming_Test (void);
+  virtual ~Naming_Test ();
   virtual int execute (TAO_Naming_Client &root_context) = 0;
 
 protected:
@@ -107,7 +106,6 @@ private:
 
   /// Holds object to be registered with the Naming Service by each thread.
   Test_Object_var test_ref_;
-
 };
 
 /**
@@ -240,13 +238,12 @@ public:
                          FILE * ior_output_file);
 
   /// Destructor.
-  virtual ~Persistent_Test_Begin (void);
+  virtual ~Persistent_Test_Begin ();
 
   /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
 
 private:
-
   /// A pointer to our ORB (needed for object/string conversion).
   CORBA::ORB_var orb_;
 
@@ -276,13 +273,12 @@ public:
                        const ACE_TCHAR * ior);
 
   /// Destructor.
-  virtual ~Persistent_Test_End (void);
+  virtual ~Persistent_Test_End ();
 
   /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
 
 private:
-
   /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
 
@@ -308,13 +304,12 @@ public:
                         PortableServer::POA_ptr poa);
 
   /// Destructor.
-  virtual ~Persistent_List_Test (void);
+  virtual ~Persistent_List_Test ();
 
   /// Execute the persistent test (part 3).
   virtual int execute (TAO_Naming_Client &root_context);
 
 private:
-
   /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
 };
@@ -335,13 +330,13 @@ class CosNaming_Client
 {
 public:
   /// Constructor.
-  CosNaming_Client (void);
+  CosNaming_Client ();
 
   /// Destructor.
-  ~CosNaming_Client (void);
+  ~CosNaming_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -355,7 +350,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index b6a9fc776d9..c3123193415 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -10,10 +10,9 @@
 #include "ace/os_include/os_netdb.h"
 
 
-
 // Constructor.
 
-Client_i::Client_i (void)
+Client_i::Client_i ()
   : ior_ (0),
     loop_count_ (10),
     shutdown_ (0),
@@ -26,7 +25,7 @@ Client_i::Client_i (void)
 // given server.
 
 void
-Client_i::test_for_secure_universal_time (void)
+Client_i::test_for_secure_universal_time ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
@@ -35,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)
     {
@@ -49,7 +47,7 @@ Client_i::test_for_secure_universal_time (void)
 // from the clerk_ and prints out the various attributes of the UTO.
 
 void
-Client_i::test_for_universal_time (void)
+Client_i::test_for_universal_time ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
@@ -78,7 +76,7 @@ Client_i::test_for_universal_time (void)
 }
 
 void
-Client_i::test_for_new_universal_time (void)
+Client_i::test_for_new_universal_time ()
 {
   TimeBase::TimeT time = 999999999;
   TimeBase::InaccuracyT inaccuracy = 9999;
@@ -100,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)
     {
@@ -111,7 +108,7 @@ Client_i::test_for_new_universal_time (void)
 }
 
 void
-Client_i::test_for_uto_from_utc (void)
+Client_i::test_for_uto_from_utc ()
 {
   TimeBase::UtcT utc_struct;
 
@@ -138,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)
     {
@@ -149,7 +145,7 @@ Client_i::test_for_uto_from_utc (void)
 }
 
 void
-Client_i::test_for_new_interval (void)
+Client_i::test_for_new_interval ()
 {
   TimeBase::TimeT lower = 666666666;
   TimeBase::TimeT upper = 999999999;
@@ -164,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)
     {
@@ -209,7 +204,7 @@ Client_i::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-Client_i::parse_args (void)
+Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:f:xk:"));
   int c;
@@ -261,7 +256,7 @@ Client_i::parse_args (void)
 // Execute client example code.
 
 int
-Client_i::run (void)
+Client_i::run ()
 {
   // Retrieves the current universal time.
   test_for_universal_time ();
@@ -283,15 +278,14 @@ Client_i::run (void)
   return 0;
 }
 
-Client_i::~Client_i (void)
+Client_i::~Client_i ()
 {
   ACE_OS::free (this->ior_);
 }
 
 int
-Client_i::obtain_initial_references (void)
+Client_i::obtain_initial_references ()
 {
-
   try
     {
       // Initialize the naming services.
@@ -385,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/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h
index ba1b6b252bb..8f318302101 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.h
+++ b/TAO/orbsvcs/tests/Time/Client_i.h
@@ -28,13 +28,13 @@ class Client_i
 {
 public:
   /// Constructor.
-  Client_i (void);
+  Client_i ();
 
   /// Destructor.
-  ~Client_i (void);
+  ~Client_i ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -44,29 +44,29 @@ public:
    * <secure_universal_time> has not been currently implemented in the
    * given server.
    */
-  void test_for_secure_universal_time (void);
+  void test_for_secure_universal_time ();
 
   /// Tests if the server returns a valid time.
-  void test_for_universal_time (void);
+  void test_for_universal_time ();
 
   /// Tests if the server returns a new UTO filled with the given time.
-  void test_for_new_universal_time (void);
+  void test_for_new_universal_time ();
 
   /// Tests if the returned UTO has the same value as the given UTC.
-  void test_for_uto_from_utc (void);
+  void test_for_uto_from_utc ();
 
   /// Tests if a new TIO is created according to the given bounds.
-  void test_for_new_interval (void);
+  void test_for_new_interval ();
 
 private:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// To initialize the naming service and get a clerk IOR.
-   int obtain_initial_references (void);
+   int obtain_initial_references ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -92,5 +92,4 @@ private:
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
-
 };
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index b5ba042c043..4ea33d6dda6 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -2,7 +2,6 @@
 #include "ace/Log_Msg.h"
 
 
-
 // This function runs the Time Service client test.
 
 int
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 08a54f19bf8..a708aa96047 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -15,7 +15,7 @@ TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
   this->admin_ = lookup_if->admin_if ();
 }
 
-TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
+TAO_Offer_Exporter::~TAO_Offer_Exporter ()
 {
   while (! this->clean_up_.is_empty ())
     {
@@ -26,7 +26,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 }
 
 void
-TAO_Offer_Exporter::export_offers (void)
+TAO_Offer_Exporter::export_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n"));
 
@@ -88,7 +88,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg)
 }
 
 void
-TAO_Offer_Exporter::export_offers_to_all (void)
+TAO_Offer_Exporter::export_offers_to_all ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting to all.\n"));
 
@@ -152,7 +152,7 @@ TAO_Offer_Exporter::export_offers_to_all (void)
 
 
 void
-TAO_Offer_Exporter::withdraw_offers (void)
+TAO_Offer_Exporter::withdraw_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n"));
 
@@ -179,7 +179,7 @@ TAO_Offer_Exporter::withdraw_offers (void)
 }
 
 void
-TAO_Offer_Exporter::describe_offers (void)
+TAO_Offer_Exporter::describe_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n"));
 
@@ -218,7 +218,7 @@ TAO_Offer_Exporter::describe_offers (void)
 }
 
 void
-TAO_Offer_Exporter::modify_offers (void)
+TAO_Offer_Exporter::modify_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n"));
 
@@ -257,7 +257,7 @@ TAO_Offer_Exporter::modify_offers (void)
 
 void
 TAO_Offer_Exporter::
-withdraw_offers_using_constraints (void)
+withdraw_offers_using_constraints ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing with constraint.\n"));
 
@@ -289,7 +289,7 @@ withdraw_offers_using_constraints (void)
 }
 
 CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (void)
+TAO_Offer_Exporter::grab_offerids ()
 {
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n"));
@@ -350,7 +350,7 @@ TAO_Offer_Exporter::grab_offerids (void)
 }
 
 void
-TAO_Offer_Exporter::create_offers (void)
+TAO_Offer_Exporter::create_offers ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Creating offers.\n"));
   const int QUEUE_SIZE = 4;
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 6cd1847283d..9a9e3cbfe26 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -21,36 +21,34 @@
 class TAO_TTest_Export TAO_Offer_Exporter
 {
 public:
-
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose);
 
-  ~TAO_Offer_Exporter (void);
+  ~TAO_Offer_Exporter ();
 
-  void export_offers (void);
+  void export_offers ();
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (void);
+  void export_offers_to_all ();
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (void);
+  void withdraw_offers ();
   // Withdraw all exported offers.
 
-  void describe_offers (void);
+  void describe_offers ();
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (void);
+  void modify_offers ();
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (void);
+  void withdraw_offers_using_constraints ();
   // Withdraw a number of offers based on a constraint string.
 
 private:
+  CosTrading::OfferIdSeq* grab_offerids ();
 
-  CosTrading::OfferIdSeq* grab_offerids (void);
-
-  void create_offers (void);
+  void create_offers ();
   // Fill in each of the offer structures.
 
   void export_to (CosTrading::Register_ptr reg);
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 7998cef2b78..a9c4bfc2d5d 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -8,7 +8,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Offer_Importer::perform_queries (void)
+TAO_Offer_Importer::perform_queries ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Federated Query.\n"));
 
@@ -22,7 +22,7 @@ TAO_Offer_Importer::perform_queries (void)
 }
 
 void
-TAO_Offer_Importer::perform_directed_queries (void)
+TAO_Offer_Importer::perform_directed_queries ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Directed Query.\n"));
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 65ff201dcc6..4ed8ff13c35 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -27,19 +27,17 @@
 class TAO_TTest_Export TAO_Offer_Importer
 {
 public:
-
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (void);
+  void perform_queries ();
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (void);
+  void perform_directed_queries ();
   // Direct a query to a trader two graph edges distant from the
   // bootstrapped-to trader.
 
 private:
-
   void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager);
   // Perform a query on the bootstrapped-to trader given the policies
   // pass in <policy_manager>.
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index b7d1d806e47..464f0968b60 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -16,7 +16,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
   this->create_types ();
 }
 
-TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void)
+TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter ()
 {
   try
   {
@@ -28,7 +28,7 @@ TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void)
 }
 
 void
-TAO_Service_Type_Exporter::remove_all_types (void)
+TAO_Service_Type_Exporter::remove_all_types ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all"
               " types from the Repository.\n"));
@@ -57,7 +57,7 @@ TAO_Service_Type_Exporter::remove_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types (void)
+TAO_Service_Type_Exporter::add_all_types ()
 
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
@@ -66,7 +66,7 @@ TAO_Service_Type_Exporter::add_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types_to_all (void)
+TAO_Service_Type_Exporter::add_all_types_to_all ()
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "add all types to all repositories.\n"));
@@ -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)
         {
@@ -164,7 +163,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
 }
 
 void
-TAO_Service_Type_Exporter::list_all_types (void)
+TAO_Service_Type_Exporter::list_all_types ()
 {
   try
     {
@@ -203,7 +202,7 @@ TAO_Service_Type_Exporter::list_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::describe_all_types (void)
+TAO_Service_Type_Exporter::describe_all_types ()
 {
   try
     {
@@ -230,7 +229,7 @@ TAO_Service_Type_Exporter::describe_all_types (void)
 }
 
 void
-TAO_Service_Type_Exporter::fully_describe_all_types (void)
+TAO_Service_Type_Exporter::fully_describe_all_types ()
 {
   try
     {
@@ -288,7 +287,7 @@ dump_typestruct (const char* type_name,
 }
 
 void
-TAO_Service_Type_Exporter::create_types (void)
+TAO_Service_Type_Exporter::create_types ()
 {
   TT_Info::Remote_Output ro;
   this->type_structs_[TT_Info::REMOTE_IO].props.length (6);
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index 559833192f0..bd8d235c3f7 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -20,38 +20,36 @@
 class TAO_TTest_Export TAO_Service_Type_Exporter
 {
 public:
-
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                              CORBA::Boolean verbose);
 
-  ~TAO_Service_Type_Exporter (void);
+  ~TAO_Service_Type_Exporter ();
 
-  void remove_all_types (void);
+  void remove_all_types ();
   // Remove all service types from the trading service instance.
 
-  void add_all_types (void);
+  void add_all_types ();
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (void);
+  void add_all_types_to_all ();
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (void);
+  void list_all_types ();
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (void);
+  void describe_all_types ();
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (void);
+  void fully_describe_all_types ();
   // Same as describe_all_types, but fully describe lists the
   // properties of all service types the described service type
   // inherits from.
 
 private:
-
-  void create_types (void);
+  void create_types ();
   // Generate the service type description structures.
 
   void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos);
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index fbd6b915254..92811ca9285 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -4,7 +4,6 @@
 #include "Simple_Dynamic.h"
 
 
-
 template <class T>
 TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
   : dp_ (dp)
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 47622cda295..cd921327d7a 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -29,8 +29,7 @@ public:
 
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
-                              const CORBA::Any& /* extra_info */
-                              );
+                              const CORBA::Any&); /* extra_info */
 
 private:
   T dp_;
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 329f3d8c86a..1442190a726 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -4,7 +4,6 @@
 #include "ace/OS_NS_string.h"
 
 
-
 const char* TT_Info::INTERFACE_NAMES[] =
 {
   "TAO_Trader_Test::Remote_IO",
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index eccaeed01c8..bdad759fcd0 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -12,7 +12,6 @@
 class TAO_TTest_Export TT_Info
 {
 public:
-
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
                                CORBA::Boolean print_dynamic = 1);
   // Dump the contents of this property sequence.
@@ -32,10 +31,9 @@ public:
     public POA_TAO_Trader_Test::Remote_Output
   {
   public:
+    Remote_Output () {}
 
-    Remote_Output (void) {}
-
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -45,10 +43,9 @@ public:
     public POA_TAO_Trader_Test::Printer
   {
   public:
+    Printer () {}
 
-    Printer (void) {}
-
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -58,9 +55,9 @@ public:
     public POA_TAO_Trader_Test::Plotter
   {
   public:
-    Plotter (void) {}
+    Plotter () {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -70,9 +67,9 @@ public:
     public POA_TAO_Trader_Test::File_System
   {
   public:
-    File_System (void) {}
+    File_System () {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -82,9 +79,9 @@ public:
     public POA_TAO_Trader_Test::PostScript_Printer
   {
   public:
-    PostScript_Printer (void) {}
+    PostScript_Printer () {}
 
-    virtual void confirm (void)
+    virtual void confirm ()
       {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -179,7 +176,6 @@ class TAO_TTest_Export TT_Parse_Args
   // Utility to parse the command-line arguments to the trading service tests.
 {
   public:
-
   TT_Parse_Args (int& argc, ACE_TCHAR** argv);
 
   ~TT_Parse_Args ();
@@ -195,7 +191,6 @@ class TAO_TTest_Export TT_Parse_Args
   // Not null if the test user supplied an explicit ior.
 
   private:
-
   int federated_, quiet_;
   char* ior_;
 };
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/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 759242b978f..cf1be253d99 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -15,7 +15,6 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       IOR_corbaname_Client_i client;
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 17faa76b29d..1153350b624 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -18,19 +18,18 @@
 #include "ace/SString.h"
 
 // Constructor
-IOR_corbaname_Client_i::IOR_corbaname_Client_i (void)
+IOR_corbaname_Client_i::IOR_corbaname_Client_i ()
 {
 }
 
 // Destructor
-IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void)
+IOR_corbaname_Client_i::~IOR_corbaname_Client_i ()
 {
 }
 
 int
-IOR_corbaname_Client_i::run (void)
+IOR_corbaname_Client_i::run ()
 {
-
   try
     {
       CosNaming::Name name (1);
@@ -116,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/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 58cf5b28299..59ecec46e84 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -26,20 +26,18 @@
  */
 class IOR_corbaname_Client_i
 {
-
  public:
   // = Constructor and destructor.
-  IOR_corbaname_Client_i (void);
-  ~IOR_corbaname_Client_i (void);
+  IOR_corbaname_Client_i ();
+  ~IOR_corbaname_Client_i ();
 
   /// Execute the client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR **argv);
 
  private:
-
   /// # of arguments on the command line.
   int argc_;
 
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/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 3934b8461a8..6892ef8166d 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -1,13 +1,13 @@
 
 #include "status_i.h"
 
-corbaname_Status_i::corbaname_Status_i (void)
+corbaname_Status_i::corbaname_Status_i ()
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaname_Status_i::print_status (void)
+corbaname_Status_i::print_status ()
 {
   // If the client makes a succesful request, return a true value
   // indicating that it has successfully reached the server.
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 1f709d09964..d4f54fa9f87 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -6,10 +6,9 @@
 
 class corbaname_Status_i : public POA_corbaname::Status {
 public:
-  corbaname_Status_i (void);
-
-  CORBA::Boolean print_status (void);
+  corbaname_Status_i ();
 
+  CORBA::Boolean print_status ();
 };
 
 #endif /* STATUS_I_H */
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
index 54a67ee5c7d..9fb6d6cf573 100644
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
@@ -9,7 +9,7 @@ class Literal_Visitor: public TAO_Constraint_Visitor
 {
 public:
   Literal_Visitor (Literal_Interpreter<T>* interp);
-  virtual ~Literal_Visitor (void);
+  virtual ~Literal_Visitor ();
 
   virtual int visit_constraint (TAO_Unary_Constraint*);
 
@@ -55,7 +55,7 @@ Literal_Visitor<T>::Literal_Visitor (Literal_Interpreter<T>* interp)
 }
 
 template<class T>
-Literal_Visitor<T>::~Literal_Visitor (void)
+Literal_Visitor<T>::~Literal_Visitor ()
 {
 }
 
@@ -76,8 +76,8 @@ template<class T>
 class Literal_Interpreter: public TAO_Interpreter
 {
 public:
-  Literal_Interpreter (void);
-  virtual ~Literal_Interpreter (void);
+  Literal_Interpreter ();
+  virtual ~Literal_Interpreter ();
 
   bool test (const char* str,
              T expected);
@@ -91,12 +91,12 @@ private:
 };
 
 template<class T>
-Literal_Interpreter<T>::Literal_Interpreter (void)
+Literal_Interpreter<T>::Literal_Interpreter ()
 {
 }
 
 template<class T>
-Literal_Interpreter<T>::~Literal_Interpreter (void)
+Literal_Interpreter<T>::~Literal_Interpreter ()
 {
 }
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index 10a1933687a..b751465096f 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -51,7 +51,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo obj ref.
   Foo_var foo = RefHelper<Foo>::string_to_ref(this->orb_.in(),
@@ -63,7 +63,7 @@ ClientApp::client_setup(void)
 
 
 int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
 {
   bool result = this->engine_->execute(this->num_loops_);
   return result ? 0 : -1;
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
index 75c8e5a09ee..2fbb239cde0 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
@@ -25,8 +25,8 @@ protected:
 private:
   // These are all called, in order, by the run_i() method.
   int init(int argc, ACE_TCHAR* argv[]);
-  void client_setup(void);
-  int  run_engine(void);
+  void client_setup();
+  int  run_engine();
   void cleanup();
 
   // Helper methods used by the methods above.
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 423ad03312a..489fb1d558a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -107,7 +107,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -115,7 +115,7 @@ ServerApp::poa_setup(void)
 
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -132,7 +132,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -165,7 +165,7 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -175,7 +175,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -188,7 +188,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
@@ -386,7 +386,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
 bool
 ServerApp::check_results()
 {
-
   this->stats_.init(this->num_remote_clients_ +
                     this->num_collocated_clients_,
                     this->num_loops_);
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
index 455ace71f21..075a5b5a3b4 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
@@ -28,13 +28,13 @@ protected:
 private:
   // These are all called, in order, by the run_i() method.
   int init(int argc, ACE_TCHAR* argv[]);
-  void poa_setup(void);
-  void csd_setup(void);
-  void servant_setup(void);
+  void poa_setup();
+  void csd_setup();
+  void servant_setup();
   void collocated_setup();
-  void poa_activate(void);
-  void run_collocated_clients(void);
-  void run_orb_event_loop(void);
+  void poa_activate();
+  void run_collocated_clients();
+  void run_orb_event_loop();
   bool check_results();
   void cleanup();
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index 2aa73b80583..816486a8d6c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -64,12 +64,10 @@ struct RefHelper
 
     return t_obj._retn();
   }
-
 };
 
 struct CSD_PT_TestInf_Export AppHelper
 {
-
   static void ref_to_file(CORBA::ORB_ptr    orb,
                           CORBA::Object_ptr obj,
                           const ACE_TCHAR*  filename);
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index 03e04037a86..41baeabb066 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -8,7 +8,6 @@
 class CSD_PT_TestInf_Export AppShutdown
 {
   public:
-
     AppShutdown();
     virtual ~AppShutdown();
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
index 0e2dd6c9749..5594914a6cb 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
@@ -16,7 +16,7 @@ OrbRunner::~OrbRunner()
 
 
 void
-OrbRunner::run(void)
+OrbRunner::run()
 {
   ACE_ASSERT(this->num_orb_threads_ > 0);
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
index f7f5c727648..be09dae14cd 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
@@ -11,7 +11,6 @@ template <class T>
 class ServantList
 {
   public:
-
     typedef typename T::_stub_type     T_stub;
     typedef typename T::_stub_ptr_type T_stub_ptr;
     typedef typename T::_stub_var_type T_stub_var;
@@ -38,7 +37,6 @@ class ServantList
 
 
   private:
-
     struct ServantRecord
     {
       T*                              servant_;
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
index a3e2d64be32..f92e3b8e849 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
@@ -10,7 +10,6 @@
 class CSD_PT_TestInf_Export TestAppBase
 {
   public:
-
     virtual ~TestAppBase();
 
     // Returns 0 for success, and -1 for failure.
@@ -20,7 +19,6 @@ class CSD_PT_TestInf_Export TestAppBase
 
 
   protected:
-
     TestAppBase(const char* name);
 
     // Returns -1 for failure, 0 for success
@@ -28,7 +26,6 @@ class CSD_PT_TestInf_Export TestAppBase
 
 
   private:
-
     ACE_CString name_;
 };
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
index 8dd569d1543..287fb68ab80 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
@@ -7,7 +7,6 @@
 class CSD_PT_TestServant_Export Foo_Statistics
 {
   public:
-
     Foo_Statistics();
     virtual ~Foo_Statistics();
 
@@ -22,7 +21,6 @@ class CSD_PT_TestServant_Export Foo_Statistics
 
 
   private:
-
     unsigned num_clients_;
     unsigned num_loops_;
     unsigned expected_[5];
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index 5aa94864344..5d32033e6bd 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -17,7 +17,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(void)
+Foo_i::op1()
 {
   this->op_count_[0]++;
 }
@@ -48,7 +48,7 @@ Foo_i::op4(CORBA::Long value)
 
 
 void
-Foo_i::op5(void)
+Foo_i::op5()
 {
   this->op_count_[4]++;
   throw FooException();
@@ -56,7 +56,7 @@ Foo_i::op5(void)
 
 
 void
-Foo_i::done(void)
+Foo_i::done()
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 476b9e238cb..6aac17c5a51 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -9,11 +9,10 @@
 class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
 {
   public:
-
     Foo_i();
     virtual ~Foo_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -21,16 +20,15 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
 
     void gather_stats(Foo_Statistics& stats);
 
 
   private:
-
     unsigned op_count_[5];
 };
 
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 6c8b0a5a997..2a6f4ba31e2 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_time.h"
 
 int
-Callback_i::done (void)
+Callback_i::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->remaining_samples_ == 0;
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index e646e2e3416..4b519cc5468 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -12,10 +12,10 @@ public:
   Callback_i (int expected_samples);
 
   /// Return 1 when all the samples have been received
-  int done (void);
+  int done ();
 
   /// Get access to the history
-  ACE_Sample_History &sample_history (void);
+  ACE_Sample_History &sample_history ();
 
   /// Implement the CORBA methods
   //@{
diff --git a/TAO/performance-tests/Callback/Callback_i.inl b/TAO/performance-tests/Callback/Callback_i.inl
index 18c2c0cad06..2b5f88582dd 100644
--- a/TAO/performance-tests/Callback/Callback_i.inl
+++ b/TAO/performance-tests/Callback/Callback_i.inl
@@ -6,7 +6,7 @@ Callback_i::Callback_i (int expected_samples)
 }
 
 ACE_INLINE ACE_Sample_History&
-Callback_i::sample_history (void)
+Callback_i::sample_history ()
 {
   return this->history_;
 }
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 7751da4e5b8..de5cd14c3dd 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -21,7 +21,7 @@ Server_i::request (Test::TimeStamp time_stamp,
 }
 
 void
-Server_i::shutdown (void)
+Server_i::shutdown ()
 {
   this->done_ = 1;
 }
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 06948665fc2..2c67802f8f4 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -8,10 +8,10 @@ class Server_i : public POA_Test::Server
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Return 1 when the shutdown method has been invoked.
-  int done (void);
+  int done ();
 
   /// Implement the CORBA methods
   //@{
@@ -20,7 +20,7 @@ public:
   void request (Test::TimeStamp,
                 const Test::Payload &);
 
-  void shutdown (void);
+  void shutdown ();
 
   //@}
 
diff --git a/TAO/performance-tests/Callback/Server_i.inl b/TAO/performance-tests/Callback/Server_i.inl
index e162f536d0a..d772f2523d3 100644
--- a/TAO/performance-tests/Callback/Server_i.inl
+++ b/TAO/performance-tests/Callback/Server_i.inl
@@ -1,11 +1,11 @@
 ACE_INLINE
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : done_ (0)
 {
 }
 
 ACE_INLINE int
-Server_i::done (void)
+Server_i::done ()
 {
   return this->done_;
 }
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 069c566552f..87e5d3a9e8b 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -28,10 +28,10 @@ public:
   Task (Test::Server_ptr server, int iterations);
 
   /// Return 1 when all the messages have been sent
-  int done (void);
+  int done ();
 
   /// Run the experiment
-  int svc (void);
+  int svc ();
 
 private:
   /// The consumer
@@ -232,14 +232,14 @@ Task::Task (Test::Server_ptr server,
 }
 
 int
-Task::done (void)
+Task::done ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1);
   return this->remaining_messages_ == 0;
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   Test::Payload payload(1024); payload.length(1024);
   try
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 1e1c519b9d9..cc37438aab2 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -50,23 +50,23 @@ class DII_Cubit_Client
 public:
   // = Constructor and destructor.
   /// Constructor.
-  DII_Cubit_Client (void);
+  DII_Cubit_Client ();
 
   /// Destructor.
-  ~DII_Cubit_Client (void);
+  ~DII_Cubit_Client ();
 
   /// Initialize the ORB and gets the Cubit objref.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// Gets objref through naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Function to read the cubit factory IOR from a file.
   int read_ior (ACE_TCHAR *filename);
@@ -77,25 +77,25 @@ private:
 
   // = DII versions of Cubit operations:
 
-  void cube_short_dii (void);
-  void cube_long_dii (void);
-  void cube_octet_dii (void);
-  void cube_union_dii (void);
-  void cube_struct_dii (void);
+  void cube_short_dii ();
+  void cube_long_dii ();
+  void cube_octet_dii ();
+  void cube_union_dii ();
+  void cube_struct_dii ();
   void cube_octet_seq_dii (int length);
   void cube_long_seq_dii (int length);
 
   // = Wrappers for cubing small and large sequences w/o args:
 
   /// Wrapper for the mixin call, just to be neat.
-  void cube_small_long_seq (void);
-  void cube_large_long_seq (void);
-  void cube_small_octet_seq (void);
-  void cube_large_octet_seq (void);
-  void cube_mixin (void);
+  void cube_small_long_seq ();
+  void cube_large_long_seq ();
+  void cube_small_octet_seq ();
+  void cube_large_octet_seq ();
+  void cube_mixin ();
 
   /// Array of pointers to the operation functions.
-  void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])(void);
+  void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])();
 
   /// Array of labels for passing to print_stats.
   static const char *stats_messages_[];
@@ -138,7 +138,7 @@ private:
 };
 
 // Constructor
-DII_Cubit_Client::DII_Cubit_Client (void)
+DII_Cubit_Client::DII_Cubit_Client ()
   : loop_count_ (DEFAULT_LOOP_COUNT),
     shutdown_ (0),
     orb_var_ (0),
@@ -162,7 +162,7 @@ DII_Cubit_Client::DII_Cubit_Client (void)
 }
 
 // Destructor
-DII_Cubit_Client::~DII_Cubit_Client (void)
+DII_Cubit_Client::~DII_Cubit_Client ()
 {
 }
 
@@ -243,7 +243,7 @@ DII_Cubit_Client::init (int argc, ACE_TCHAR **argv)
 // Sort out the args in the command line.
 
 int
-DII_Cubit_Client::parse_args (void)
+DII_Cubit_Client::parse_args ()
 {
   ACE_Get_Opt opts (argc_, argv_, ACE_TEXT("dn:i:f:x"));
   int c;
@@ -356,7 +356,7 @@ DII_Cubit_Client::print_stats (const char *call_name,
 }
 
 void
-DII_Cubit_Client::cube_short_dii (void)
+DII_Cubit_Client::cube_short_dii ()
 {
   try
     {
@@ -395,7 +395,7 @@ DII_Cubit_Client::cube_short_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_long_dii (void)
+DII_Cubit_Client::cube_long_dii ()
 {
   try
     {
@@ -435,7 +435,7 @@ DII_Cubit_Client::cube_long_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_octet_dii (void)
+DII_Cubit_Client::cube_octet_dii ()
 {
   try
     {
@@ -478,7 +478,7 @@ DII_Cubit_Client::cube_octet_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_union_dii (void)
+DII_Cubit_Client::cube_union_dii ()
 {
   try
     {
@@ -528,7 +528,7 @@ DII_Cubit_Client::cube_union_dii (void)
 }
 
 void
-DII_Cubit_Client::cube_struct_dii (void)
+DII_Cubit_Client::cube_struct_dii ()
 {
   try
     {
@@ -691,31 +691,31 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 // through in run ().
 
 void
-DII_Cubit_Client::cube_small_long_seq (void)
+DII_Cubit_Client::cube_small_long_seq ()
 {
   this->cube_long_seq_dii (SMALL_LONG_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_large_long_seq (void)
+DII_Cubit_Client::cube_large_long_seq ()
 {
   this->cube_long_seq_dii (LARGE_LONG_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_small_octet_seq (void)
+DII_Cubit_Client::cube_small_octet_seq ()
 {
   this->cube_octet_seq_dii (SMALL_OCTET_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_large_octet_seq (void)
+DII_Cubit_Client::cube_large_octet_seq ()
 {
   this->cube_octet_seq_dii (LARGE_OCTET_SEQ_LENGTH);
 }
 
 void
-DII_Cubit_Client::cube_mixin (void)
+DII_Cubit_Client::cube_mixin ()
 {
   this->cube_short_dii ();
   this->cube_octet_dii ();
@@ -723,7 +723,7 @@ DII_Cubit_Client::cube_mixin (void)
 }
 
 int
-DII_Cubit_Client::run (void)
+DII_Cubit_Client::run ()
 {
   // loop counter.
   CORBA::ULong i;
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..68f35ad1147 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -208,7 +208,7 @@ Cubit_Client::read_ior (const ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-Cubit_Client::parse_args (void)
+Cubit_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("b:t:z:ovdn:f:k:xsq"));
   int c = 0;
@@ -383,7 +383,7 @@ Cubit_Client::check_enabled (u_int mask) const
 // Exercise the union.  Cube a union.
 
 void
-Cubit_Client::cube_union (void)
+Cubit_Client::cube_union ()
 {
   try
     {
@@ -1513,7 +1513,6 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_any_struct (i);
-
             }
 
           timer.stop ();
@@ -1563,7 +1562,7 @@ Cubit_Client::shutdown_server (int do_shutdown)
   return 0;
 }
 
-Cubit_Client::~Cubit_Client (void)
+Cubit_Client::~Cubit_Client ()
 {
   // Free resources and close the IOR files.
   if (this->cubit_factory_ior_file_)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 2ba154c271c..54bcff3eae4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -43,7 +43,7 @@ public:
   // = Constructor and destructor.
   Cubit_Client (int shutdown = 0);
 
-  ~Cubit_Client (void);
+  ~Cubit_Client ();
 
   /// Execute client example code.
   int run ();
@@ -61,7 +61,7 @@ private:
   int read_ior (const ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Obtain the bit mask representation of the specified test
   u_int opt_to_mask (const ACE_TCHAR *opt);
@@ -80,7 +80,7 @@ private:
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
 
   /// Exercise the union.  Cube a union.
-  void cube_union (void);
+  void cube_union ();
 
   /// calculate the cube from a struct.
   void cube_struct (int i);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index b52869dc434..236066ddb28 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -3,7 +3,7 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-Cubit_Server::Cubit_Server (void)
+Cubit_Server::Cubit_Server ()
   : ior_output_file_ (0),
     orb_manager_ (),
     factory_impl_ (0),
@@ -14,7 +14,7 @@ Cubit_Server::Cubit_Server (void)
 }
 
 int
-Cubit_Server::parse_args (void)
+Cubit_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:"));
   int c;
@@ -100,7 +100,7 @@ Cubit_Server::init (int argc,
 }
 
 int
-Cubit_Server::run (void)
+Cubit_Server::run ()
 {
   if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -109,7 +109,7 @@ Cubit_Server::run (void)
   return 0;
 }
 
-Cubit_Server::~Cubit_Server (void)
+Cubit_Server::~Cubit_Server ()
 {
   delete this->factory_impl_;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 8aa6e7ec341..eabf76a991c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -39,21 +39,21 @@ class Cubit_Server
 {
 public:
   /// Default constructor
-  Cubit_Server (void);
+  Cubit_Server ();
 
   /// Destructor
-  ~Cubit_Server (void);
+  ~Cubit_Server ();
 
   /// Initialize the Cubit_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the cubit factory IOR.
   FILE* ior_output_file_;
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..84176f01398 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -115,12 +115,12 @@ Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
 
 // Destructor
 
-Cubit_Factory_i::~Cubit_Factory_i (void)
+Cubit_Factory_i::~Cubit_Factory_i ()
 {
 }
 
 Cubit_ptr
-Cubit_Factory_i::make_cubit (void)
+Cubit_Factory_i::make_cubit ()
 {
   return my_cubit_._this ();
 }
@@ -140,12 +140,12 @@ Cubit_i::Cubit_i (CORBA::ORB_ptr orb)
 
 // Destructor
 
-Cubit_i::~Cubit_i (void)
+Cubit_i::~Cubit_i ()
 {
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (void)
+Cubit_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -157,13 +157,13 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 }
 
 void
-Cubit_i::cube_oneway (void)
+Cubit_i::cube_oneway ()
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
-Cubit_i::cube_void (void)
+Cubit_i::cube_void ()
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
 }
@@ -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;
 }
@@ -408,7 +407,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any)
 
 // Shutdown.
 
-void Cubit_i::shutdown (void)
+void Cubit_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n",
@@ -419,7 +418,7 @@ void Cubit_i::shutdown (void)
 
 
 void
-Cubit_i::ping (void)
+Cubit_i::ping ()
 {
   // do nothing
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 09a3d31852d..bf400140179 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -32,16 +32,16 @@ public:
   Cubit_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~Cubit_i (void);
+  ~Cubit_i ();
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Test a oneway call.
-  virtual void cube_oneway (void);
+  virtual void cube_oneway ();
 
   /// Test a twoway call.
-  virtual void cube_void (void);
+  virtual void cube_void ();
 
   /// Cube an octet
   virtual CORBA::Octet cube_octet (CORBA::Octet o);
@@ -81,11 +81,11 @@ public:
   virtual CORBA::Any * cube_any_struct (const CORBA::Any & any);
 
   /// Shutdown routine.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 
   /// A ping. Please see the idl file for details.
-  virtual void ping (void);
+  virtual void ping ();
 
 
   /// Set default poa.
@@ -112,10 +112,10 @@ public:
   Cubit_Factory_i (CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~Cubit_Factory_i (void);
+  ~Cubit_Factory_i ();
 
   /// Make a cubit object.
-  virtual Cubit_ptr make_cubit (void);
+  virtual Cubit_ptr make_cubit ();
 
   void set_default_poa (PortableServer::POA_ptr poa);
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 6e0750d7838..b8be38daee3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -4,7 +4,7 @@
 #include "tao/TAO_Internal.h"
 #include "ace/Barrier.h"
 
-Cubit_Task::Cubit_Task (void)
+Cubit_Task::Cubit_Task ()
 {
   // No-op.
 }
@@ -26,7 +26,7 @@ Cubit_Task::Cubit_Task (const ACE_TCHAR *args,
 }
 
 int
-Cubit_Task::svc (void)
+Cubit_Task::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -97,7 +97,7 @@ Cubit_Task::svc (void)
 }
 
 int
-Cubit_Task::initialize_orb (void)
+Cubit_Task::initialize_orb ()
 {
   try
     {
@@ -154,7 +154,7 @@ Cubit_Task::get_servant_ior (u_int index)
 }
 
 int
-Cubit_Task::create_servants (void)
+Cubit_Task::create_servants ()
 {
   try
     {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 72e6a106a17..a30ac90de96 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -48,14 +48,14 @@ public:
 
 protected:
   /// No-op constructor.
-  Cubit_Task (void);
+  Cubit_Task ();
 
 private:
   /// Initialize the ORB, and POA.
-  int initialize_orb (void);
+  int initialize_orb ();
 
   /// Create the servants.
-  int create_servants (void);
+  int create_servants ();
 
   /// All cubit objects will have this as prefix to its key.
   const char *key_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 2a7be3a0ac0..9c2afdb429c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/Null_Mutex.h"
 
-Globals::Globals (void)
+Globals::Globals ()
   : thr_create_flags (0),
     default_priority (0),
     ior_file (0),
@@ -73,7 +73,7 @@ Globals::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Globals::sched_fifo_init (void)
+Globals::sched_fifo_init ()
 {
 #if defined (ACE_HAS_THREADS)
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
@@ -115,18 +115,18 @@ Globals::sched_fifo_init (void)
 #endif /* ACE_HAS_THREADS */
 }
 
-MT_Priority::MT_Priority (void)
+MT_Priority::MT_Priority ()
   : num_priorities_ (0),
     grain_ (0)
 {
 }
 
-MT_Priority::~MT_Priority (void)
+MT_Priority::~MT_Priority ()
 {
 }
 
 ACE_Sched_Priority
-MT_Priority::get_high_priority (void)
+MT_Priority::get_high_priority ()
 {
   ACE_Sched_Priority high_priority;
 
@@ -208,13 +208,13 @@ MT_Priority::get_low_priority (u_int num_low_priority,
 }
 
 u_int
-MT_Priority::number_of_priorities (void)
+MT_Priority::number_of_priorities ()
 {
   return this->num_priorities_;
 }
 
 u_int
-MT_Priority::grain (void)
+MT_Priority::grain ()
 {
   return this->grain_;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index cf92ee54115..3f116926ccd 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -104,7 +104,7 @@ class Globals
 {
 public:
   /// default constructor.
-  Globals (void);
+  Globals ();
 
   /// parse the arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
@@ -115,7 +115,7 @@ public:
    * for other failure.  As a side effect, sets thr_create_flags
    * appropriately.
    */
-  static int sched_fifo_init (void);
+  static int sched_fifo_init ();
 
   /// Thread creation flags.  Must call sched_fifo_init () before
   /// accessing.
@@ -173,16 +173,15 @@ typedef ACE_Singleton<Globals,ACE_Null_Mutex> GLOBALS;
  */
 class MT_Priority
 {
-
 public:
   /// constructor.
-  MT_Priority (void);
+  MT_Priority ();
 
   /// Destructor.
-  virtual ~MT_Priority (void);
+  virtual ~MT_Priority ();
 
   /// Sets the priority of the high priority thread.
-  virtual ACE_Sched_Priority get_high_priority (void);
+  virtual ACE_Sched_Priority get_high_priority ();
 
   /// Sets the priority to be used for the low priority thread.
   virtual ACE_Sched_Priority get_low_priority
@@ -191,10 +190,10 @@ public:
      u_int use_multiple_priority);
 
   /// Accessor for num_priorities_.
-  u_int number_of_priorities (void);
+  u_int number_of_priorities ();
 
   /// Accessor for grain_.
-  u_int grain (void);
+  u_int grain ();
 
 protected:
   /// Number of priorities used.
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..27bf5ed9d23 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -17,7 +17,7 @@ ACE_round (ACE_timer_t t)
   return static_cast<ACE_UINT32> (t);
 }
 
-Task_State::Task_State (void)
+Task_State::Task_State ()
   : barrier_ (0),
     key_ ("Cubit"),
     loop_count_ (1000),
@@ -230,7 +230,7 @@ Task_State::parse_args (int argc,ACE_TCHAR *argv[])
   return 0;
 }
 
-Task_State::~Task_State (void)
+Task_State::~Task_State ()
 {
   int i;
 
@@ -274,7 +274,7 @@ Client::Client (ACE_Thread_Manager *thread_manager,
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   delete this->my_jitter_array_;
   delete this->timer_;
@@ -305,14 +305,14 @@ Client::put_latency (JITTER_ARRAY *jitter,
 
 // Returns the latency in usecs.
 ACE_timer_t
-Client::get_high_priority_latency (void)
+Client::get_high_priority_latency ()
 {
   return (ACE_timer_t) this->ts_->latency_ [0];
 }
 
 // Returns the latency in usecs.
 ACE_timer_t
-Client::get_low_priority_latency (void)
+Client::get_low_priority_latency ()
 {
   if (this->ts_->thread_count_ == 1)
     return 0;
@@ -336,7 +336,7 @@ Client::get_latency (u_int thread_id)
 
 // Returns the jitter in usecs.
 ACE_timer_t
-Client::get_high_priority_jitter (void)
+Client::get_high_priority_jitter ()
 {
   ACE_timer_t jitter = 0.0;
   ACE_timer_t average = get_high_priority_latency ();
@@ -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
@@ -385,7 +384,7 @@ Client::get_high_priority_jitter (void)
 // Returns the jitter in usecs.
 
 ACE_timer_t
-Client::get_low_priority_jitter (void)
+Client::get_low_priority_jitter ()
 {
   if (this->ts_->thread_count_ == 1)
     return 0;
@@ -485,7 +484,7 @@ Client::get_jitter (u_int id)
 }
 
 void
-Client::find_frequency (void)
+Client::find_frequency ()
 {
     if (this->ts_->thread_per_rate_ == 0)
       {
@@ -547,7 +546,7 @@ Client::find_frequency (void)
 }
 
 CORBA::ORB_ptr
-Client::init_orb (void)
+Client::init_orb ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "I'm thread %t\n"));
@@ -654,7 +653,7 @@ Client::get_cubit (CORBA::ORB_ptr orb)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
@@ -724,7 +723,7 @@ Client::svc (void)
 }
 
 int
-Client::cube_octet (void)
+Client::cube_octet ()
 {
   try
     {
@@ -765,7 +764,7 @@ Client::cube_octet (void)
 }
 
 int
-Client::cube_short (void)
+Client::cube_short ()
 {
   try
     {
@@ -798,7 +797,7 @@ Client::cube_short (void)
 }
 
 int
-Client::cube_long (void)
+Client::cube_long ()
 {
   try
     {
@@ -831,7 +830,7 @@ Client::cube_long (void)
 }
 
 int
-Client::cube_struct (void)
+Client::cube_struct ()
 {
   try
     {
@@ -870,7 +869,7 @@ Client::cube_struct (void)
 }
 
 int
-Client::make_request (void)
+Client::make_request ()
 {
   int result;
 
@@ -921,7 +920,7 @@ Client::make_request (void)
 }
 
 void
-Client::print_stats (void)
+Client::print_stats ()
 {
   // Perform latency stats only if we are not running the utilization
   // tests.
@@ -979,7 +978,7 @@ Client::calc_delta (ACE_timer_t real_time,
 }
 
 int
-Client::do_test (void)
+Client::do_test ()
 {
   ACE_timer_t delta = 0;
   u_int low_priority_client_count = this->ts_->thread_count_ - 1;
@@ -1066,7 +1065,7 @@ Client::do_test (void)
 }
 
 int
-Client::run_tests (void)
+Client::run_tests ()
 {
   int result;
   ACE_NEW_RETURN (this->my_jitter_array_,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 17f2d06f537..76e13e676d6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -99,13 +99,13 @@ class Task_State
 {
 public:
   /// Constructor.
-  Task_State (void);
+  Task_State ();
 
   /// parses the arguments with the provided argc and argv.
   int parse_args (int argc,ACE_TCHAR **argv);
 
   /// Destructor
-  ~Task_State (void);
+  ~Task_State ();
 
   /// Barrier for the multiple clients to synchronize after binding to
   /// the servants.
@@ -249,24 +249,24 @@ public:
           u_int id);
 
   /// destructor.
-  ~Client (void);
+  ~Client ();
 
   /// The thread function.
   virtual int svc ();
 
   /// Returns the latency of the high priority thread in usecs.
-  ACE_timer_t get_high_priority_latency (void);
+  ACE_timer_t get_high_priority_latency ();
 
   /// Returns the average latency found for the low
   /// priority threads in usecs.
-  ACE_timer_t get_low_priority_latency (void);
+  ACE_timer_t get_low_priority_latency ();
 
   /// Returns the high priority jitter in usecs.
-  ACE_timer_t get_high_priority_jitter (void);
+  ACE_timer_t get_high_priority_jitter ();
 
   /// Returns the jitter for all the low priority
   /// thread request in usecs.
-  ACE_timer_t get_low_priority_jitter (void);
+  ACE_timer_t get_low_priority_jitter ();
 
   /// gets the average latency for that thread.
   ACE_timer_t get_latency (u_int thread_id);
@@ -280,37 +280,37 @@ public:
 
 private:
   /// initialize the ORB.
-  CORBA::ORB_ptr init_orb (void);
+  CORBA::ORB_ptr init_orb ();
 
   /// reads the cubit ior from a file.
-  void read_ior (void);
+  void read_ior ();
 
   /// gets the cubit object.
   int get_cubit (CORBA::ORB_ptr orb);
 
   /// Run the various tests.
-  int run_tests (void);
+  int run_tests ();
 
   /// make a CORBA request depending on the datatype.
-  int make_request (void);
+  int make_request ();
 
   /// makes the corba requests.
-  int do_test (void);
+  int do_test ();
 
   /// call cube_octet method on the cubit object.
-  int cube_octet (void);
+  int cube_octet ();
 
   /// call cube short on the cubit object.
-  int cube_short (void);
+  int cube_short ();
 
   /// call cube long on the cubit object.
-  int cube_long (void);
+  int cube_long ();
 
   /// call cube struct on the cubit object.
-  int cube_struct (void);
+  int cube_struct ();
 
   /// prints the latency stats.
-  void print_stats (void);
+  void print_stats ();
 
   /// Records the latencies in the <Task_State>.
   void put_latency (JITTER_ARRAY *jitter,
@@ -323,7 +323,7 @@ private:
 
   /// determines the frequency at which to make calls depending on the
   /// id of the thread.
-  void find_frequency (void);
+  void find_frequency ();
 
   /// calculate the delta value.
   ACE_timer_t calc_delta (ACE_timer_t real_time,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index cbe8462a77f..2cfd6cb1774 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -7,20 +7,20 @@ MT_Cubit_Timer::MT_Cubit_Timer (u_int granularity)
 }
 
 void
-MT_Cubit_Timer::start (void)
+MT_Cubit_Timer::start ()
 {
   this->timer_.start ();
 }
 
 void
-MT_Cubit_Timer::stop (void)
+MT_Cubit_Timer::stop ()
 {
   this->timer_.stop ();
   this->timer_.elapsed_time (this->delta_);
 }
 
 ACE_timer_t
-MT_Cubit_Timer::get_elapsed (void)
+MT_Cubit_Timer::get_elapsed ()
 {
   ACE_timer_t real_time;
   // Store the time in usecs.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index f84b7499f28..c467380dd64 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -32,10 +32,10 @@ class MT_Cubit_Timer
 public:
   MT_Cubit_Timer (u_int granularity);
 
-  void start (void);
-  void stop (void);
+  void start ();
+  void stop ();
 
-  ACE_timer_t get_elapsed (void);
+  ACE_timer_t get_elapsed ();
 
 private:
   /// timer.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
index f7e1ae4fc4c..237040b451e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
@@ -12,7 +12,7 @@ Util_Thread::Util_Thread (Task_State *ts,
 }
 
 int
-Util_Thread::svc (void)
+Util_Thread::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
@@ -47,7 +47,7 @@ Util_Thread::svc (void)
 }
 
 u_long
-Util_Thread::get_number_of_computations (void)
+Util_Thread::get_number_of_computations ()
 {
   return this->number_of_computations_;
 }
@@ -56,7 +56,7 @@ Util_Thread::get_number_of_computations (void)
 // separate function to get it's execution time.
 
 void
-Util_Thread::computation (void)
+Util_Thread::computation ()
 {
   // This is the number that the Util_Thread uses to check for
   // primality.
@@ -74,7 +74,7 @@ Util_Thread::computation (void)
 // And you thought your life was boring... :-)
 
 int
-Util_Thread::run_computations (void)
+Util_Thread::run_computations ()
 {
   while (this->done_ == 0)
     {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
index e71393dd7a8..83d50f26cb8 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -32,17 +32,17 @@ public:
   virtual int svc ();
 
   /// Gets the number of computations the thread was able to perform.
-  u_long get_number_of_computations (void);
+  u_long get_number_of_computations ();
 
   /// this is the actual "computation" being performed.
-  void computation (void);
+  void computation ();
 
   /// Indicates whether we're done.
   int done_;
 
 private:
   /// Run the computations.
-  int run_computations (void);
+  int run_computations ();
 
   /// This stores the number of computations performed
   /// by the Util_Thread so far
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 3438baa7d6c..9beeba0cbbc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -62,7 +62,7 @@ switchHook (WIND_TCB *pOldTcb,    // pointer to old task's WIND_TCB.
 
 // Constructor.
 
-Client_i::Client_i (void)
+Client_i::Client_i ()
   : high_priority_client_ (0),
     low_priority_client_ (0),
     util_thread_ (0),
@@ -80,7 +80,7 @@ Client_i::Client_i (void)
 
 // Destructor.
 
-Client_i::~Client_i (void)
+Client_i::~Client_i ()
 {
   delete this->high_priority_client_;
   if (this->low_priority_client_ != 0)
@@ -130,7 +130,7 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Client_i::run (void)
+Client_i::run ()
 {
   if (this->ts_->thread_per_rate_ == 0)
     {
@@ -148,7 +148,7 @@ Client_i::run (void)
 
 #if defined (ACE_HAS_VXTHREADS)
 void
-Client_i::output_taskinfo (void)
+Client_i::output_taskinfo ()
 {
   FILE *file_handle = ACE_OS::fopen ("taskinfo.txt", "w");
 
@@ -175,7 +175,7 @@ Client_i::output_taskinfo (void)
 #endif /* ACE_HAS_VXTHREADS */
 
 void
-Client_i::get_context_switches (void)
+Client_i::get_context_switches ()
 {
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
@@ -202,7 +202,7 @@ Client_i::get_context_switches (void)
 }
 
 void
-Client_i::output_latency (void)
+Client_i::output_latency ()
 {
   FILE *latency_file_handle = 0;
   char latency_file[BUFSIZ];
@@ -260,7 +260,7 @@ Client_i::output_latency (void)
 // when there are not enough different priorities for all threads.
 
 void
-Client_i::init_low_priority (void)
+Client_i::init_low_priority ()
 {
   ACE_Sched_Priority prev_priority = this->high_priority_;
   if (this->ts_->use_multiple_priority_ == 1)
@@ -280,7 +280,7 @@ Client_i::init_low_priority (void)
 }
 
 void
-Client_i::calc_util_time (void)
+Client_i::calc_util_time ()
 {
   MT_Cubit_Timer timer (ACE_ONE_SECOND_IN_MSECS);
   // Time the utilization thread' "computation" to get % IdleCPU at the
@@ -298,7 +298,7 @@ Client_i::calc_util_time (void)
 }
 
 int
-Client_i::activate_high_client (void)
+Client_i::activate_high_client ()
 {
   ACE_NEW_RETURN (this->high_priority_client_,
                   Client (&this->client_thread_manager_,
@@ -345,7 +345,7 @@ Client_i::activate_high_client (void)
 }
 
 int
-Client_i::activate_low_client (void)
+Client_i::activate_low_client ()
 {
   ACE_NEW_RETURN (this->low_priority_client_,
                   Client *[this->ts_->thread_count_],
@@ -431,7 +431,7 @@ Client_i::activate_low_client (void)
 }
 
 int
-Client_i::activate_util_thread (void)
+Client_i::activate_util_thread ()
 {
   ACE_NEW_RETURN (this->util_thread_,
                   Util_Thread (this->ts_,
@@ -467,7 +467,7 @@ Client_i::activate_util_thread (void)
 }
 
 void
-Client_i:: print_context_stats (void)
+Client_i:: print_context_stats ()
 {
   if (this->ts_->context_switch_test_ == 1)
     {
@@ -503,7 +503,7 @@ Client_i:: print_context_stats (void)
 }
 
 void
-Client_i::print_latency_stats (void)
+Client_i::print_latency_stats ()
 {
   // If running the utilization test, don't report latency nor jitter.
   if (this->ts_->use_utilization_test_ == 0)
@@ -535,7 +535,7 @@ Client_i::print_latency_stats (void)
 }
 
 void
-Client_i::print_util_stats (void)
+Client_i::print_util_stats ()
 {
  if (this->ts_->use_utilization_test_ == 1)
     {
@@ -555,7 +555,7 @@ Client_i::print_util_stats (void)
 }
 
 void
-Client_i::print_priority_inversion_stats (void)
+Client_i::print_priority_inversion_stats ()
 {
   this->print_context_stats ();
   this->print_latency_stats ();
@@ -563,7 +563,7 @@ Client_i::print_priority_inversion_stats (void)
 }
 
 int
-Client_i::start_servant (void)
+Client_i::start_servant ()
 {
   ACE_TCHAR high_thread_args[BUFSIZ];
 
@@ -614,7 +614,7 @@ Client_i::start_servant (void)
 }
 
 int
-Client_i::do_priority_inversion_test (void)
+Client_i::do_priority_inversion_test ()
 {
   this->timer_.start ();
 #if defined (ACE_HAS_VXTHREADS)
@@ -695,7 +695,7 @@ Client_i::do_priority_inversion_test (void)
 }
 
 int
-Client_i::do_thread_per_rate_test (void)
+Client_i::do_thread_per_rate_test ()
 {
   Client CB_20Hz_client (&this->client_thread_manager_,
                          this->ts_,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 803bf32ee8c..2f98eb697ee 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -29,7 +29,7 @@
 
 #if defined (VME_DRIVER)
 #include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
+extern "C" STATUS vmeDrv ();
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* defined (VME_DRIVER) */
 
@@ -42,65 +42,65 @@ class Client_i : public virtual MT_Priority
 {
 public:
   ///constructor.
-  Client_i (void);
+  Client_i ();
 
   /// destructor.
-  virtual ~Client_i (void);
+  virtual ~Client_i ();
 
   /// Initialize the state of <Client_i>.
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the tests.
-  void run (void);
+  void run ();
 
   /// Performs the priority inversion test.
-  int do_priority_inversion_test (void);
+  int do_priority_inversion_test ();
 
   /// Performs the test with 4 threads each sending requests at rates
   /// of 20, 10, 5, and 1Hz.
-  int do_thread_per_rate_test (void);
+  int do_thread_per_rate_test ();
 
   /// Starts the client utilization thread.
-  int start_servant (void);
+  int start_servant ();
 
   /// output the latency results for the requests.
-  void output_latency (void);
+  void output_latency ();
 
 #if defined (VXWORKS)
   /// Outputs the details of this task to a file taskinfo.txt.
-  void output_taskinfo (void);
+  void output_taskinfo ();
 #endif /* VXWORKS */
 
 private:
   /// Sets the priority to be used for the low priority clients.
-  void init_low_priority (void);
+  void init_low_priority ();
 
   /// Calculate the time for one util computation.
-  void calc_util_time (void);
+  void calc_util_time ();
 
   /// Activates the high priority client.
-  int activate_high_client (void);
+  int activate_high_client ();
 
   /// Activates the low priority client.
-  int activate_low_client (void);
+  int activate_low_client ();
 
   /// Activates the utilization thread.
-  int activate_util_thread (void);
+  int activate_util_thread ();
 
   /// Prints the results of the tests.
-  void print_priority_inversion_stats (void);
+  void print_priority_inversion_stats ();
 
   /// Prints the context switch results.
-  void print_context_stats (void);
+  void print_context_stats ();
 
   /// Prints the utilization test results.
-  void print_util_stats (void);
+  void print_util_stats ();
 
   /// Prints the latency and jitter results.
-  void print_latency_stats (void);
+  void print_latency_stats ();
 
   /// gets the number of context switches.
-  void get_context_switches (void);
+  void get_context_switches ();
 
   /// Pointer to the high priority client object.
   Client *high_priority_client_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 1359acd6f0b..058233d853a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -9,7 +9,7 @@ Cubit_i::Cubit_i (CORBA::ORB_ptr orb,
 {
 }
 
-Cubit_i::~Cubit_i (void)
+Cubit_i::~Cubit_i ()
 {
 }
 
@@ -44,12 +44,12 @@ Cubit_i::cube_struct (const Cubit::Many &values)
 }
 
 void
-Cubit_i::noop (void)
+Cubit_i::noop ()
 {
   // does nothing.
 }
 
-void Cubit_i::shutdown (void)
+void Cubit_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) Calling orb ()->shutdown ()\n"));
@@ -57,7 +57,7 @@ void Cubit_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (void)
+Cubit_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 7aa2c1ca806..561d3fcbefd 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -26,7 +26,7 @@ class Cubit_i : public POA_Cubit
 public:
   Cubit_i (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa);
-  ~Cubit_i (void);
+  ~Cubit_i ();
 
   virtual CORBA::Octet cube_octet (CORBA::Octet o);
 
@@ -36,13 +36,13 @@ public:
 
   virtual Cubit::Many cube_struct (const Cubit::Many &values);
 
-  virtual void noop (void);
+  virtual void noop ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// The default POA
   virtual PortableServer::POA_ptr
-      _default_POA (void);
+      _default_POA ();
 
 protected:
   /// Keep a pointer to the ORB so we can shut it down.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 5651bbfe937..8d4dbe3b5aa 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -32,7 +32,7 @@
 # include "quantify.h"
 #endif /* ACE_HAS_QUANTIFY */
 
-Server::Server (void)
+Server::Server ()
   :argc_ (0),
    argv_ (0),
    cubits_ (0),
@@ -64,7 +64,7 @@ Server::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Server::run (void)
+Server::run ()
 {
   STOP_QUANTIFY;
   CLEAR_QUANTIFY;
@@ -83,7 +83,7 @@ Server::run (void)
 }
 
 void
-Server::prelim_args_process (void)
+Server::prelim_args_process ()
 {
   int i;
 
@@ -97,7 +97,7 @@ Server::prelim_args_process (void)
 }
 
 void
-Server::init_low_priority (void)
+Server::init_low_priority ()
 {
   ACE_Sched_Priority prev_priority = this->high_priority_;
 
@@ -122,7 +122,7 @@ Server::init_low_priority (void)
 // Write the ior's to a file so the client can read them.
 
 int
-Server::write_iors (void)
+Server::write_iors ()
 {
   u_int j;
 
@@ -168,7 +168,7 @@ Server::write_iors (void)
 }
 
 int
-Server::activate_high_servant (void)
+Server::activate_high_servant ()
 {
   ACE_TCHAR orbendpoint[BUFSIZ];
 
@@ -220,7 +220,7 @@ Server::activate_high_servant (void)
 }
 
 int
-Server::activate_low_servants (void)
+Server::activate_low_servants ()
 {
   if (static_cast<int> (this->num_low_priority_) > 0)
     {
@@ -323,7 +323,7 @@ Server::activate_low_servants (void)
 }
 
 int
-Server::start_servants (void)
+Server::start_servants ()
 {
   // Do the preliminary argument processing for options -p and -h.
   this->prelim_args_process ();
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index 7effcbdfd9e..5ec5040b098 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -43,7 +43,7 @@
 
 #if defined (VME_DRIVER)
 #include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
+extern "C" STATUS vmeDrv ();
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* VME_DRIVER */
 
@@ -60,32 +60,32 @@ class Server
 {
 public:
   /// Default constructor.
-  Server (void);
+  Server ();
 
   /// Initialize the server state.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run method.
-  int run (void);
+  int run ();
 
 private:
   /// Start the high and low priority servants.
-  int start_servants (void);
+  int start_servants ();
 
   /// Preliminary argument processing code.
-  void prelim_args_process (void);
+  void prelim_args_process ();
 
   /// sets the priority to be used for the low priority servants.
-  void init_low_priority (void);
+  void init_low_priority ();
 
   /// Writes the iors of the servants to a file
-  int write_iors (void);
+  int write_iors ();
 
   /// Activates the high priority servant.
-  int activate_high_servant (void);
+  int activate_high_servant ();
 
   /// Activates the low priority servants.
-  int activate_low_servants (void);
+  int activate_low_servants ();
 
   /// Number of arguments for the servant.
   int argc_;
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index a7b12e089c8..b09c855071e 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -43,7 +43,7 @@ Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder)
 }
 
 void
-Roundtrip_Handler::shutdown (void)
+Roundtrip_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index b7f3332e45a..40891eaa46e 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -24,7 +24,7 @@ public:
   virtual void test_method (Test::Timestamp send_time);
   virtual void test_method_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
index 2431feb42a7..51288cdde31 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
@@ -6,7 +6,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
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/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index 0667989e650..c1a307c708d 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -17,7 +17,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr reference,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -77,5 +77,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.h b/TAO/performance-tests/Latency/Collocation/Client_Task.h
index ab015903554..23e9d4cbe33 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.h
@@ -15,20 +15,17 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (Test::Roundtrip_ptr reference,
                int iterations,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   const int niterations;
   Test::Roundtrip_var remote_ref_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
index 6382128d071..73c68ef3284 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
@@ -13,7 +13,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
index 4ab05dd7b3b..2f40fe495b7 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
@@ -18,7 +18,7 @@ Server_Task::get_reference ()
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.h b/TAO/performance-tests/Latency/Collocation/Server_Task.h
index 0fa23d8b529..86c8428ce3b 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.h
@@ -29,7 +29,6 @@ public:
   Test::Roundtrip * get_reference ();
 
 private:
-
   ACE_Manual_Event &cond_;
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
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/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index b3168d869ec..9c766855f4c 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -43,7 +43,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 5848a4a8771..5ffe18e12ac 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -26,7 +26,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index b3168d869ec..9c766855f4c 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -43,7 +43,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 5848a4a8771..5ffe18e12ac 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -26,7 +26,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -21,7 +21,7 @@ public:
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index 38ef68443e6..1aa09af027f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -6,7 +6,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index cefeecab98f..2b15d910c2f 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -23,7 +23,7 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/
 }
 
 void
-Memory_Growth::shutdown (void)
+Memory_Growth::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index 4c2f7924601..5a91cbc158d 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -20,7 +20,7 @@ public:
   // = The skeleton methods
   virtual void send_objref (const Test::PayLoad &p);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index a3658526edd..4ddc0c94992 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -6,13 +6,13 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
 }
 
 void
-Memory_Growth::ping (void)
+Memory_Growth::ping ()
 {
   return;
 }
 
 void
-Memory_Growth::shutdown (void)
+Memory_Growth::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index 5da0a251fe1..3753dfbcaf1 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -19,9 +19,9 @@ public:
   Memory_Growth (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 954962e5c3a..2914991822a 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-set_rt_scheduling (void)
+set_rt_scheduling ()
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index afb4acfe869..b9279fe1b51 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -14,7 +14,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   // Set TAO_debug_level to 0 to ensure silent running unless
   // debugging is explicitly invoked
   TAO_debug_level = 0;
@@ -41,5 +40,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
   return 0;
-
 }
diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp
index 2cea585ce4c..9df67df4938 100644
--- a/TAO/performance-tests/POA/Demux/demux_stats.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp
@@ -14,13 +14,11 @@
 
 class Demux_Stats
 {
-
 public:
-
   /// Calculates the average latency and Standard deviation.
   /// Expects the input data in my_results.dat.
   int
-  calculate_avg_latency (void);
+  calculate_avg_latency ();
 
   /// parses args.
   int
@@ -39,7 +37,6 @@ private :
 int
 Demux_Stats::parse_args (int argc_, char * argv_ [])
 {
-
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("i:"));
   int c;
 
@@ -59,7 +56,6 @@ Demux_Stats::parse_args (int argc_, char * argv_ [])
 int
 Demux_Stats::calculate_avg_latency ()
 {
-
   CORBA::ULong i, time;
   char str1[50], str2[50], str3[50];
 
@@ -98,7 +94,6 @@ Demux_Stats::calculate_avg_latency ()
 
   while (fscanf (this->result_fp_, "%s %s %s %ld %ld", &str1, &str2, &str3, &i, &time) != EOF)
     {
-
       if(ACE_OS::strcmp (str1,"POA::locate_poa_i")==0 && (ACE_OS::strcmp (str3,"end") == 0))
         {
           if (items < 1) { items = items + 1; counter++; }
@@ -317,7 +312,6 @@ Demux_Stats::calculate_avg_latency ()
 
   if (iterations == 0)
     {
-
       ACE_OS::printf("Average response times = POA = %lf SERVANT = %lf DISPATCH = %lf PERFECT = %lf DYNAMIC = %lf BINARY = %lf LINEAR = %lf PARSE = %lf microsec\n", mean_poa, mean_servant,
                      mean_dispatch,
                      mean_perfect,
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 5d4a632fc5a..f76ede02eed 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -14,7 +14,7 @@
 #include "ace/OS_NS_string.h"
 
 // Constructor
-Demux_Test_Client::Demux_Test_Client (void)
+Demux_Test_Client::Demux_Test_Client ()
   : argc_ (0),
     argv_ (0),
     is_ (Demux_Test_Client::LINEAR),
@@ -31,7 +31,7 @@ Demux_Test_Client::Demux_Test_Client (void)
 }
 
 // destructor
-Demux_Test_Client::~Demux_Test_Client (void)
+Demux_Test_Client::~Demux_Test_Client ()
 {
 }
 
@@ -118,14 +118,12 @@ Demux_Test_Client::init (int argc, ACE_TCHAR *argv [])
 
   // success
   return 0;
-
 }
 
 // parse command line arguments (if any).
 int
-Demux_Test_Client::parse_args (void)
+Demux_Test_Client::parse_args ()
 {
-
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:m:n:o:p:i:s:"));
   int c;
 
@@ -236,7 +234,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (void)
+Demux_Test_Client::run ()
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -303,7 +301,7 @@ Demux_Test_Client::run (void)
 }
 
 int
-Demux_Test_Client::run_linear_test (void)
+Demux_Test_Client::run_linear_test ()
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -329,7 +327,7 @@ Demux_Test_Client::run_linear_test (void)
 }
 
 int
-Demux_Test_Client::run_random_test (void)
+Demux_Test_Client::run_random_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -337,7 +335,7 @@ Demux_Test_Client::run_random_test (void)
 }
 
 int
-Demux_Test_Client::run_best_test (void)
+Demux_Test_Client::run_best_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -345,7 +343,7 @@ Demux_Test_Client::run_best_test (void)
 }
 
 int
-Demux_Test_Client::run_worst_test (void)
+Demux_Test_Client::run_worst_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
@@ -353,7 +351,7 @@ Demux_Test_Client::run_worst_test (void)
 }
 
 int
-Demux_Test_Client::print_results (void)
+Demux_Test_Client::print_results ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "******** "));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 8612a173f20..17ec654b5df 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -23,7 +23,6 @@
 class Demux_Test_Client
 {
 public:
-
   // Request invocation strategies
   enum INVOKE_STRATEGY
   {
@@ -41,39 +40,38 @@ public:
   };
 
   /// CTOR
-  Demux_Test_Client (void);
+  Demux_Test_Client ();
 
   /// DTOR
-  ~Demux_Test_Client (void);
+  ~Demux_Test_Client ();
 
   /// initialize the client test bed
   int init (int argc, ACE_TCHAR *argv []);
 
   /// run the tests
-  int run (void);
+  int run ();
 
 private:
-
   /// parse command line arguments
-  int parse_args (void);
+  int parse_args ();
 
   /// initialize the operation database
-  int init_operation_db (void);
+  int init_operation_db ();
 
   /// run linear strategy
-  int run_linear_test (void);
+  int run_linear_test ();
 
   /// run random strategy
-  int run_random_test (void);
+  int run_random_test ();
 
   /// run best strategy (w.r.t to linear)
-  int run_best_test (void);
+  int run_best_test ();
 
   /// run worst strategy (w.r.t to linear)
-  int run_worst_test (void);
+  int run_worst_test ();
 
   /// print results
-  int print_results (void);
+  int print_results ();
 
   /// number of command line arguments
   int argc_;
@@ -119,7 +117,6 @@ private:
 
   /// database of operations
   Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS];
-
 };
 
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl
index 9b2d1111852..184cba77413 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.inl
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl
@@ -10,7 +10,7 @@ static void shutdown (Demux_Test_ptr objref)
 }
 //FUZZ: enable check_for_lack_ACE_OS
 
-int Demux_Test_Client::init_operation_db (void)
+int Demux_Test_Client::init_operation_db ()
 {
    this->op_db_[0].op_ = M302;
    this->op_db_[1].op_ = shutdown;
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index eb44ad3b68a..114c236a6bf 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -4,18 +4,18 @@
 #include "tao/ORB_Core.h"
 
 // ctor
-Demux_Test_i::Demux_Test_i (void)
+Demux_Test_i::Demux_Test_i ()
 {}
 
 // dtor
-Demux_Test_i::~Demux_Test_i (void)
+Demux_Test_i::~Demux_Test_i ()
 {}
 
-void Demux_Test_i::M302 (void)
+void Demux_Test_i::M302 ()
 {
 }
 
-void Demux_Test_i::shutdown (void)
+void Demux_Test_i::shutdown ()
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index 505e86ef220..d2f80bb455f 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -8,8 +8,7 @@
 class Demux_Test_i : public POA_Demux_Test
 {
 public:
-
-  Demux_Test_i (void);
+  Demux_Test_i ();
   //ctor.
 
   Demux_Test_i (PortableServer::POA_ptr poa)
@@ -18,7 +17,7 @@ public:
     };
   // ctor
 
-  ~Demux_Test_i (void);
+  ~Demux_Test_i ();
   // dtor
 
   // Return the Default POA of this Servant
@@ -27,14 +26,13 @@ public:
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (void);
+  virtual void M302 ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   PortableServer::POA_var poa_;
   // Implement a different _default_POA()
-
 };
 
 #endif /* TAO_DEMUX_TEST_I_H */
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 7f8ee4a8c99..b05872f9bb6 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -13,7 +13,7 @@
 #include "ace/OS_NS_string.h"
 
 // Constructor
-Demux_Test_Server::Demux_Test_Server (void)
+Demux_Test_Server::Demux_Test_Server ()
   : argc_ (0),
     argv_ (0),
     num_POAs_ (1),
@@ -27,7 +27,7 @@ Demux_Test_Server::Demux_Test_Server (void)
 }
 
 // destructor
-Demux_Test_Server::~Demux_Test_Server (void)
+Demux_Test_Server::~Demux_Test_Server ()
 {
   ACE_OS::fclose (this->poa_fp_);
 }
@@ -84,7 +84,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
   // grab the POA Manager
   try
     {
-
       this->poa_mgr_ =
         this->root_poa_->the_POAManager ();
     }
@@ -285,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)
                 {
@@ -298,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_);
@@ -310,7 +307,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
   try
     {
       this->poa_mgr_->activate ();
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -320,14 +316,12 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
 
   // success
   return 0;
-
 }
 
 // parse command line arguments (if any).
 int
-Demux_Test_Server::parse_args (void)
+Demux_Test_Server::parse_args ()
 {
-
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:o:p:ut"));
   int c;
 
@@ -399,7 +393,7 @@ Demux_Test_Server::parse_args (void)
 
 // grab a reference to the naming service so that we can register with it.
 int
-Demux_Test_Server::init_naming_service (void)
+Demux_Test_Server::init_naming_service ()
 {
   // Initialize the naming services
   if (this->my_name_client_.init (this->orb_.in ()) == -1)
@@ -414,7 +408,7 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (void)
+Demux_Test_Server::run ()
 {
   try
     {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index 8fbf653f604..b27a3e87a2b 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -28,27 +28,26 @@ class Demux_Test_Server
 {
 public:
   /// ctor
-  Demux_Test_Server (void);
+  Demux_Test_Server ();
 
   /// dtor
-  ~Demux_Test_Server (void);
+  ~Demux_Test_Server ();
 
   /// Execute client code.
-  int run (void);
+  int run ();
 
   /// Initialize the communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
 
   /// Calculates the statistics by reading different data values from results.dat.
-  int calculate_avg_latency (void);
+  int calculate_avg_latency ();
 
 private:
-
   /// parse command line arguments (if any)
-  int parse_args (void);
+  int parse_args ();
 
   /// initialize the naming service
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -97,7 +96,6 @@ private:
   /// Use the Transient POAs for servant activation as opposed
   /// to persistent POAs.
   int use_transient_poas_;
-
 };
 
 
diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp
index 73002c74770..dd00816e9f8 100644
--- a/TAO/performance-tests/POA/Demux/write_names.cpp
+++ b/TAO/performance-tests/POA/Demux/write_names.cpp
@@ -3,7 +3,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   for(int i=0; i<1000; i++)
     ACE_OS::printf ("%09d\n",i);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 3158372ce64..e6a1f4ab3b4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -7,7 +7,7 @@ Factory::Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Simple_ptr
-Factory::create_simple_object (void)
+Factory::create_simple_object ()
 {
   Simple *simple_impl;
   ACE_NEW_THROW_EX (simple_impl,
@@ -20,7 +20,7 @@ Factory::create_simple_object (void)
 }
 
 void
-Factory::shutdown (void)
+Factory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 73624c14b7e..9e50fbf7d93 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -20,9 +20,9 @@ public:
 
   // = The skeleton methods
 
-  virtual Test::Simple_ptr create_simple_object (void);
+  virtual Test::Simple_ptr create_simple_object ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a reference to the ORB
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index e3b8caf8e37..8bcaab684a2 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -1,11 +1,11 @@
 #include "Simple.h"
 
-Simple::Simple (void)
+Simple::Simple ()
 {
 }
 
 void
-Simple::destroy (void)
+Simple::destroy ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index 3279cb2ae10..5a234c4b6e9 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -16,11 +16,11 @@ class Simple
 {
 public:
   /// Constructor
-  Simple (void);
+  Simple ();
 
   // = The skeleton methods
 
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index b59b62d15c8..135955a3138 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -207,7 +207,7 @@ public:
       }
   }
 
-  ~stats (void)
+  ~stats ()
   {
     if (this->quantify_)
       {
@@ -327,7 +327,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 4cf2427b933..784745f6ab9 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -103,7 +103,7 @@ PP_Test_Client::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-PP_Test_Client::parse_args (void)
+PP_Test_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("ovdn:f:k:x"));
   int c;
@@ -164,9 +164,8 @@ PP_Test_Client::parse_args (void)
 // Oneway test.
 
 void
-PP_Test_Client::send_oneway (void)
+PP_Test_Client::send_oneway ()
 {
-
   try
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
@@ -184,9 +183,8 @@ PP_Test_Client::send_oneway (void)
 // Twoway test.
 
 void
-PP_Test_Client::send_void (void)
+PP_Test_Client::send_void ()
 {
-
   try
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
@@ -250,7 +248,6 @@ PP_Test_Client::run ()
 int
 PP_Test_Client::shutdown_server (int do_shutdown)
 {
-
   try
     {
       if (do_shutdown)
@@ -275,9 +272,8 @@ PP_Test_Client::shutdown_server (int do_shutdown)
 }
 
 int
-PP_Test_Client::run_oneway (void)
+PP_Test_Client::run_oneway ()
 {
-
   try
     {
       CORBA::ULong i;
@@ -314,9 +310,8 @@ PP_Test_Client::run_oneway (void)
 }
 
 int
-PP_Test_Client::run_void (void)
+PP_Test_Client::run_void ()
 {
-
   try
     {
       CORBA::ULong i;
@@ -352,7 +347,7 @@ PP_Test_Client::run_void (void)
   return this->error_count_ == 0 ? 0 : 1;
 }
 
-PP_Test_Client::~PP_Test_Client (void)
+PP_Test_Client::~PP_Test_Client ()
 {
   // Free resources and close the IOR files.
   if (this->factory_ior_file_)
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.h b/TAO/performance-tests/Pluggable/PP_Test_Client.h
index 8689a013061..44fbce0e4af 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.h
@@ -40,10 +40,10 @@ public:
   /// Use <testing_collocation> to control some client's behaviors.
   PP_Test_Client (int shutdown = 0);
 
-  ~PP_Test_Client (void);
+  ~PP_Test_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   /// <collocation_test_ior> is used to pass in the ior file name.
@@ -54,19 +54,19 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Oneway operation test.
-  void send_oneway (void);
+  void send_oneway ();
 
   /// Twoway operation test.
-  void send_void (void);
+  void send_void ();
 
   /// This method runs only the send_void() test.
-  int run_void (void);
+  int run_void ();
 
   /// This method runs only the send_oneway() test.
-  int run_oneway (void);
+  int run_oneway ();
 
   /// Invoke the method with <do_shutdown> != 0 to shutdown the server.
   int shutdown_server (int do_shutdown);
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index a8121b86a85..0fc81a5e56b 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -3,13 +3,13 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-PP_Test_Server::PP_Test_Server (void)
+PP_Test_Server::PP_Test_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-PP_Test_Server::parse_args (void)
+PP_Test_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
   int c;
@@ -103,7 +103,7 @@ PP_Test_Server::run ()
   return 0;
 }
 
-PP_Test_Server::~PP_Test_Server (void)
+PP_Test_Server::~PP_Test_Server ()
 {
   if (this->factory_id_.in ())
     this->orb_manager_.deactivate_under_child_poa (this->factory_id_.in ());
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index f837ce4ece9..4853aa6c304 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -37,21 +37,21 @@ class PP_Test_Server
 {
 public:
   /// Default constructor
-  PP_Test_Server (void);
+  PP_Test_Server ();
 
   /// Destructor
-  ~PP_Test_Server (void);
+  ~PP_Test_Server ();
 
   /// Initialize the server state - parsing arguments, etc.
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the cubit factory IOR.
   FILE* ior_output_file_;
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index 71d7968e128..62c2cae11f3 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -60,12 +60,12 @@ Pluggable_Test_Factory_i::Pluggable_Test_Factory_i (CORBA::ORB_ptr orb)
 
 // Factory Destructor
 
-Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
+Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i ()
 {
 }
 
 Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (void)
+Pluggable_Test_Factory_i::make_pluggable_test ()
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
   return my_pluggable_test_._this ();
@@ -80,14 +80,14 @@ PP_Test_i::PP_Test_i (CORBA::ORB_ptr orb)
 
 // Destructor
 
-PP_Test_i::~PP_Test_i (void)
+PP_Test_i::~PP_Test_i ()
 {
 }
 
 // Oneway send
 
 void
-PP_Test_i::send_oneway (void)
+PP_Test_i::send_oneway ()
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
 }
@@ -95,14 +95,14 @@ PP_Test_i::send_oneway (void)
 // Twoway send
 
 void
-PP_Test_i::send_void (void)
+PP_Test_i::send_void ()
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
 }
 
 // Shutdown.
 
-void PP_Test_i::shutdown (void)
+void PP_Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index f6d78fcca71..df6bc300f8d 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -29,16 +29,16 @@ public:
   PP_Test_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~PP_Test_i (void);
+  ~PP_Test_i ();
 
   /// Test a oneway call.
-  virtual void send_oneway (void);
+  virtual void send_oneway ();
 
   /// Test a twoway call.
-  virtual void send_void (void);
+  virtual void send_void ();
 
   /// Shutdown routine.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   /// Keep a pointer to the ORB so we can shut it down.
@@ -59,10 +59,10 @@ public:
   Pluggable_Test_Factory_i (CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~Pluggable_Test_Factory_i (void);
+  ~Pluggable_Test_Factory_i ();
 
   /// Make a Pluggable Test object.
-  virtual Pluggable_Test_ptr make_pluggable_test (void);
+  virtual Pluggable_Test_ptr make_pluggable_test ();
 
 private:
   PP_Test_i my_pluggable_test_;
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index a6b2caf5a2b..839d4f82d4d 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -54,7 +54,7 @@ public:
           CORBA::PolicyManager_ptr policy_manager,
           test_ptr receiver);
 
-  ~test_i (void);
+  ~test_i ();
 
   void start_test (CORBA::Long session_id,
                    const char *protocol,
@@ -62,11 +62,11 @@ public:
                    CORBA::ULong message_size,
                    CORBA::ULong iterations);
 
-  void end_test (void);
+  void end_test ();
 
-  void oneway_sync (void);
+  void oneway_sync ();
 
-  void twoway_sync (void);
+  void twoway_sync ();
 
   void oneway_method (CORBA::Long session_id,
                       CORBA::ULong iteration,
@@ -77,10 +77,10 @@ public:
                       ::test::octets &payload);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -125,7 +125,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
     this->rtorb_->create_client_protocol_policy (protocols);
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
@@ -171,7 +171,6 @@ test_i::start_test (CORBA::Long session_id,
   // for a few times before giving up.
   for (int j = 0;;)
     {
-
     test_protocol_setup:
 
       try
@@ -209,7 +208,6 @@ test_i::start_test (CORBA::Long session_id,
   // for a few times before giving up.
   for (int k = 0;;)
     {
-
     base_protocol_setup:
 
       try
@@ -248,7 +246,7 @@ test_i::start_test (CORBA::Long session_id,
 }
 
 void
-test_i::end_test (void)
+test_i::end_test ()
 {
   // Use IIOP to indicate end of test to server.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
@@ -258,13 +256,13 @@ test_i::end_test (void)
 }
 
 void
-test_i::oneway_sync (void)
+test_i::oneway_sync ()
 {
   this->receiver_->oneway_sync ();
 }
 
 void
-test_i::twoway_sync (void)
+test_i::twoway_sync ()
 {
   this->receiver_->twoway_sync ();
 }
@@ -290,13 +288,13 @@ test_i::twoway_method (CORBA::Long &session_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->receiver_->shutdown ();
 
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 524adf15166..d8fc1790cd1 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -59,7 +59,7 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  ~test_i (void);
+  ~test_i ();
 
   void start_test (CORBA::Long session_id,
                    const char *protocol,
@@ -67,11 +67,11 @@ public:
                    CORBA::ULong message_size,
                    CORBA::ULong iterations);
 
-  void end_test (void);
+  void end_test ();
 
-  void oneway_sync (void);
+  void oneway_sync ();
 
-  void twoway_sync (void);
+  void twoway_sync ();
 
   void oneway_method (CORBA::Long session_id,
                       CORBA::ULong iteration,
@@ -82,10 +82,10 @@ public:
                       ::test::octets &payload);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -112,7 +112,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
@@ -162,7 +162,7 @@ test_i::start_test (CORBA::Long session_id,
 }
 
 void
-test_i::end_test (void)
+test_i::end_test ()
 {
   // Record end time.
   this->test_end_ =
@@ -226,12 +226,12 @@ test_i::end_test (void)
 }
 
 void
-test_i::oneway_sync (void)
+test_i::oneway_sync ()
 {
 }
 
 void
-test_i::twoway_sync (void)
+test_i::twoway_sync ()
 {
 }
 
@@ -308,13 +308,13 @@ test_i::twoway_method (CORBA::Long &session_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index e10826b6e00..a39c1ad51bb 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -183,14 +183,13 @@ public:
           CORBA::PolicyManager_ptr policy_manager,
           test_ptr test);
 
-  void run (void);
+  void run ();
 
-  void print_stats (void);
+  void print_stats ();
 
-  void setup (void);
+  void setup ();
 
 private:
-
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
@@ -317,7 +316,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
 }
 
 void
-Worker::print_stats (void)
+Worker::print_stats ()
 {
   CORBA::ULong missed_total_deadlines =
     this->missed_start_deadlines_ + this->missed_end_deadlines_;
@@ -454,7 +453,7 @@ Worker::missed_end_deadline (CORBA::ULong invocation)
 }
 
 void
-Worker::setup (void)
+Worker::setup ()
 {
   // Make sure we have a connection to the server using the test
   // protocol.
@@ -465,7 +464,6 @@ Worker::setup (void)
   // for a few times before giving up.
   for (int j = 0;;)
     {
-
     test_protocol_setup:
 
       try
@@ -503,7 +501,6 @@ Worker::setup (void)
   // for a few times before giving up.
   for (int k = 0;;)
     {
-
     base_protocol_setup:
 
       try
@@ -540,7 +537,7 @@ Worker::setup (void)
 }
 
 void
-Worker::run (void)
+Worker::run ()
 {
   // Select the test protocol for these invocation.
   this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index 0b86c5ac4fe..b136baa8df0 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -24,7 +24,7 @@ class RTCORBA_COMMON_Export Test_i : public POA_Test
 {
 public:
   /// ctor
-  Test_i (void);
+  Test_i ();
 
   // = The Test methods.
   void test_method (CORBA::Long id);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
index 60fa6e3774b..730a0be162e 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
@@ -1,4 +1,4 @@
 ACE_INLINE
-Test_i::Test_i (void)
+Test_i::Test_i ()
 {
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 2dab4dd836c..5940f002126 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -21,7 +21,7 @@ class Client : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run the client threads.
   //
 public:
-  Client (void);
+  Client ();
   // ctor
 
   void set (int niterations,
@@ -213,7 +213,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Client::Client (void)
+Client::Client ()
 {
 }
 
@@ -232,7 +232,7 @@ Client::set (int niterations,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
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..d1e5690f65f 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
@@ -17,7 +17,7 @@ class Server : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run the server threads.
   //
 public:
-  Server (void);
+  Server ();
   // ctor
 
   void set (Test_i *server, int priority, int argc, ACE_TCHAR *argv[]);
@@ -168,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Server::Server (void)
+Server::Server ()
 {
 }
 
@@ -186,7 +186,7 @@ Server::set (Test_i *server,
 }
 
 int
-Server::svc (void)
+Server::svc ()
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -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..0e1c3d78eed 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -20,7 +20,7 @@ class Client : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run the client threads.
   //
 public:
-  Client (void);
+  Client ();
   // ctor
 
   void set (Test_ptr server,
@@ -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)
     {
@@ -231,7 +230,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 // ****************************************************************
 
-Client::Client (void)
+Client::Client ()
 {
 }
 
@@ -252,7 +251,7 @@ Client::set (Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 01fcc474949..7c0184fc5d9 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -81,7 +81,7 @@ static Messaging::SyncScope sync_scope = Messaging::SYNC_WITH_TRANSPORT;
 static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
 
 static void
-print_params (void)
+print_params ()
 {
   if (test_twoway)
     {
@@ -359,7 +359,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-set_rt_mode (void)
+set_rt_mode ()
 {
   int policy = ACE_SCHED_FIFO;
   int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index bd393f055bf..b450e05b3d5 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-set_rt_mode (void)
+set_rt_mode ()
 {
   int policy = ACE_SCHED_FIFO;
   int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 5a5bd2564f1..617e1951d63 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -33,7 +33,7 @@ public:
 
   void twoway_work_test (CORBA::ULong work);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 9e835b90b7f..d49019b3a7a 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -44,7 +44,7 @@ static int count_missed_end_deadlines = 0;
 
 struct Synchronizers
 {
-  Synchronizers (void)
+  Synchronizers ()
     : worker_lock_ (),
       workers_ (1),
       workers_ready_ (0),
@@ -406,11 +406,11 @@ public:
                 RTCORBA::PriorityMapping &priority_mapping,
                 Synchronizers &synchronizers);
 
-  int svc (void);
+  int svc ();
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
-  void reset_priority (void);
+  void reset_priority ();
   void print_stats (ACE_hrtime_t test_end);
-  int setup (void);
+  int setup ();
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
 
@@ -461,7 +461,7 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Paced_Worker::reset_priority (void)
+Paced_Worker::reset_priority ()
 {
   if (set_priority)
     {
@@ -574,7 +574,7 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
 }
 
 int
-Paced_Worker::setup (void)
+Paced_Worker::setup ()
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
@@ -614,7 +614,7 @@ Paced_Worker::missed_end_deadline (CORBA::ULong invocation)
 }
 
 int
-Paced_Worker::svc (void)
+Paced_Worker::svc ()
 {
   try
     {
@@ -689,11 +689,11 @@ public:
                      RTCORBA::PriorityMapping &priority_mapping,
                      Synchronizers &synchronizers);
 
-  int svc (void);
+  int svc ();
   void print_stats (ACE_Sample_History &history,
                     ACE_hrtime_t test_end);
-  int setup (void);
-  void print_collective_stats (void);
+  int setup ();
+  void print_collective_stats ();
 
   test_var test_;
   CORBA::ULong iterations_;
@@ -764,7 +764,7 @@ Continuous_Worker::print_stats (ACE_Sample_History &history,
 }
 
 void
-Continuous_Worker::print_collective_stats (void)
+Continuous_Worker::print_collective_stats ()
 {
   if (continuous_workers > 0)
     {
@@ -794,7 +794,7 @@ Continuous_Worker::print_collective_stats (void)
 }
 
 int
-Continuous_Worker::setup (void)
+Continuous_Worker::setup ()
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
@@ -819,7 +819,7 @@ Continuous_Worker::setup (void)
 }
 
 int
-Continuous_Worker::svc (void)
+Continuous_Worker::svc ()
 {
   try
     {
@@ -863,14 +863,12 @@ Continuous_Worker::svc (void)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -881,7 +879,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   Synchronizers synchronizers;
 
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index 31ef0cbc69b..25860a549bf 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -20,10 +20,10 @@ public:
                CORBA::ULong prime_number);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   CORBA::ORB_var orb_;
@@ -53,13 +53,13 @@ test_i::method (CORBA::ULong work,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -186,14 +186,12 @@ write_ior_to_file (const ACE_TCHAR *ior_file,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -204,7 +202,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
index e2b64b3ddc1..e2f09f0b197 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
@@ -47,7 +47,6 @@ public:
                            Test::Timestamp send_time);
 
 
-
   void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index 7af03422198..64c44e0d706 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -335,7 +335,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
 }
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
   : public virtual POA_Test::Roundtrip
 {
 public:
-
   /// Constructor
   Roundtrip (CORBA::ORB_ptr orb);
 
@@ -38,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 63acb1c980c..764786b08e3 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -173,7 +173,7 @@ Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *hol
 // = Other methods
 
 void
-Roundtrip_Handler::shutdown (void)
+Roundtrip_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 15644ab0415..c914102c56c 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -47,7 +47,7 @@ public:
 
   // = Other methods
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
index 2431feb42a7..51288cdde31 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
@@ -6,7 +6,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
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/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
   : public virtual POA_Test::Roundtrip
 {
 public:
-
   /// Constructor
   Roundtrip (CORBA::ORB_ptr orb);
 
@@ -38,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index a399d56df78..54ec9a64dde 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -337,7 +337,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
 }
 
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
   : public virtual POA_Test::Roundtrip
 {
 public:
-
   /// Constructor
   Roundtrip (CORBA::ORB_ptr orb);
 
@@ -38,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 098776142d6..b159411c7d5 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -89,7 +89,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 
-
 int
 test_octet_seq (Test::Roundtrip_ptr roundtrip)
 {
@@ -510,7 +509,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
 }
 
 
-
 // The main() function starts here
 
 int
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 1163c7866f3..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
 
@@ -187,7 +186,6 @@ void big_time_test (CORBA::ULong num_list_loops,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   if (argc > 1 && ACE_OS::strcasecmp (argv[1],ACE_TEXT("-csv")) == 0)
     use_csv = true;
 
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
   : public virtual POA_Test::Roundtrip
 {
 public:
-
   /// Constructor
   Roundtrip (CORBA::ORB_ptr orb);
 
@@ -38,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
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..6d1d3fde83d 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
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *data_type,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -62,7 +62,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
@@ -78,7 +78,7 @@ Client_Task::validate_connection (void)
 }
 
 void
-Client_Task::test_octet_seq (void)
+Client_Task::test_octet_seq ()
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -91,12 +91,11 @@ Client_Task::test_octet_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_long_seq (void)
+Client_Task::test_long_seq ()
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -109,13 +108,12 @@ Client_Task::test_long_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 
 void
-Client_Task::test_short_seq (void)
+Client_Task::test_short_seq ()
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -128,12 +126,11 @@ Client_Task::test_short_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_char_seq (void)
+Client_Task::test_char_seq ()
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -146,12 +143,11 @@ Client_Task::test_char_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_longlong_seq (void)
+Client_Task::test_longlong_seq ()
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -164,12 +160,11 @@ Client_Task::test_longlong_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_double_seq (void)
+Client_Task::test_double_seq ()
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
@@ -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_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index 0bd8f60bd15..531173d8acd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -28,15 +28,15 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
   /// Some performance test methods
-  void test_octet_seq (void);
-  void test_long_seq (void);
-  void test_short_seq (void);
-  void test_char_seq (void);
-  void test_longlong_seq (void);
-  void test_double_seq (void);
+  void test_octet_seq ();
+  void test_long_seq ();
+  void test_short_seq ();
+  void test_char_seq ();
+  void test_longlong_seq ();
+  void test_double_seq ();
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index e6dcf32173c..8ac6981955a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -48,7 +48,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
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..27962ee6200 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *data_type,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -62,7 +62,7 @@ Client_Task::accumulate_and_dump (
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
@@ -78,7 +78,7 @@ Client_Task::validate_connection (void)
 }
 
 void
-Client_Task::test_octet_seq (void)
+Client_Task::test_octet_seq ()
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -91,12 +91,11 @@ Client_Task::test_octet_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_long_seq (void)
+Client_Task::test_long_seq ()
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -109,13 +108,12 @@ Client_Task::test_long_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 
 void
-Client_Task::test_short_seq (void)
+Client_Task::test_short_seq ()
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -128,12 +126,11 @@ Client_Task::test_short_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_char_seq (void)
+Client_Task::test_char_seq ()
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -146,12 +143,11 @@ Client_Task::test_char_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_longlong_seq (void)
+Client_Task::test_longlong_seq ()
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -164,12 +160,11 @@ Client_Task::test_longlong_seq (void)
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
-
     }
 }
 
 void
-Client_Task::test_double_seq (void)
+Client_Task::test_double_seq ()
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
@@ -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.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index 0bd8f60bd15..531173d8acd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -28,15 +28,15 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (void);
+  void validate_connection ();
 
   /// Some performance test methods
-  void test_octet_seq (void);
-  void test_long_seq (void);
-  void test_short_seq (void);
-  void test_char_seq (void);
-  void test_longlong_seq (void);
-  void test_double_seq (void);
+  void test_octet_seq ();
+  void test_long_seq ();
+  void test_short_seq ();
+  void test_char_seq ();
+  void test_longlong_seq ();
+  void test_double_seq ();
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index e6dcf32173c..8ac6981955a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -48,7 +48,7 @@ Roundtrip::test_short_method (const Test::short_load &,
 }
 
 void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -37,7 +37,7 @@ public:
   Test::Timestamp test_double_method (const Test::double_load& ol,
                                       Test::Timestamp send_time);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
index 38ef68443e6..1aa09af027f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
@@ -6,7 +6,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 3398bfef863..065ca312c58 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -2,7 +2,7 @@
 #include "Receiver.h"
 #include "ace/High_Res_Timer.h"
 
-Receiver::Receiver (void)
+Receiver::Receiver ()
   : start_time_ (0)
   , message_count_ (0)
   , byte_count_ (0)
@@ -38,7 +38,7 @@ Receiver::receive_data (const Test::Message &the_message)
 }
 
 void
-Receiver::done (void)
+Receiver::done ()
 {
   if (this->message_count_ == 0)
     {
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index d7159953a82..f2697134c85 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -17,12 +17,12 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (void);
+  Receiver ();
 
   // = The skeleton methods
   virtual void receive_data (const Test::Message &message);
 
-  virtual void done (void);
+  virtual void done ();
 
 private:
   /// The timestamp for the first message
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index dbff14c5c48..b67eb3418a8 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -7,7 +7,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Receiver_ptr
-Receiver_Factory::create_receiver (void)
+Receiver_Factory::create_receiver ()
 {
   Receiver *receiver_impl = 0;
   ACE_NEW_THROW_EX (receiver_impl,
@@ -30,7 +30,7 @@ Receiver_Factory::create_receiver (void)
 }
 
 void
-Receiver_Factory::shutdown (void)
+Receiver_Factory::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 44a023b49e0..b16cb45b13e 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -14,9 +14,9 @@ public:
   Receiver_Factory (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Receiver_ptr create_receiver (void);
+  virtual Test::Receiver_ptr create_receiver ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a reference to the ORB in order to shutdown the app
diff --git a/TAO/tao/Abstract_Servant_Base.inl b/TAO/tao/Abstract_Servant_Base.inl
index 022fac0a234..2d6b259a3b8 100644
--- a/TAO/tao/Abstract_Servant_Base.inl
+++ b/TAO/tao/Abstract_Servant_Base.inl
@@ -1,7 +1,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void)
+TAO_Abstract_ServantBase::TAO_Abstract_ServantBase ()
 {
   // No-Op.
 }
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index 2027ef75cd3..00cdf060c87 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -79,7 +79,6 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 class TAO_Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
 {
 public:
-
   /// Constructor.
   TAO_Accept_Strategy (TAO_ORB_Core *orb_core);
 
diff --git a/TAO/tao/Acceptor_Registry.inl b/TAO/tao/Acceptor_Registry.inl
index 00ea19bb559..ce6ebba429a 100644
--- a/TAO/tao/Acceptor_Registry.inl
+++ b/TAO/tao/Acceptor_Registry.inl
@@ -2,13 +2,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_AcceptorSetIterator
-TAO_Acceptor_Registry::begin (void)
+TAO_Acceptor_Registry::begin ()
 {
   return this->acceptors_;
 }
 
 ACE_INLINE TAO_AcceptorSetIterator
-TAO_Acceptor_Registry::end (void)
+TAO_Acceptor_Registry::end ()
 {
   return this->acceptors_ + this->size_;
 }
diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h
index 6209d77710e..c4d7436e2d9 100644
--- a/TAO/tao/Allocator.h
+++ b/TAO/tao/Allocator.h
@@ -34,7 +34,6 @@ namespace TAO
   class TAO_Allocator
   {
   public:
-
     virtual ~TAO_Allocator () {}
 
     virtual handler_type *allocate () = 0;
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
index 19499e7aa93..979061cfb62 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -62,7 +62,7 @@ template<typename StringType,
 void
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::tao_duplicate (void)
+                     RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -73,7 +73,7 @@ template<typename StringType,
 void
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::tao_release (void)
+                     RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index 4b525902eb6..43156baa098 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -48,7 +48,6 @@ namespace TAO
         private RefCountPolicy
     {
     public:
-
       /// Constructor.
       Alias (CORBA::TCKind kind,
              char const * id,
@@ -105,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 96c9bac0238..ce692d0f5e8 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -52,7 +52,6 @@ namespace TAO
         private TAO::Null_RefCount_Policy
     {
     public:
-
       /// Constructor.
       Alias (CORBA::TCKind kind,
              char const * id,
@@ -108,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/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 49d5bb77d6f..2af5807cb64 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -24,15 +24,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 using namespace TAO;
 
-CORBA::Any::Any ()
-  : impl_ (0)
-{
-}
-
 CORBA::Any::Any (const CORBA::Any &rhs)
   : impl_ (rhs.impl_)
 {
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       this->impl_->_add_ref ();
     }
@@ -40,7 +35,7 @@ CORBA::Any::Any (const CORBA::Any &rhs)
 
 CORBA::Any::~Any ()
 {
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       this->impl_->_remove_ref ();
     }
@@ -51,14 +46,14 @@ CORBA::Any::operator= (const CORBA::Any &rhs)
 {
   if (this->impl_ != rhs.impl_)
     {
-      if (this->impl_ != 0)
+      if (this->impl_)
         {
           this->impl_->_remove_ref ();
         }
 
       this->impl_ = rhs.impl_;
 
-      if (this->impl_ != 0)
+      if (this->impl_)
         {
           this->impl_->_add_ref ();
         }
@@ -72,7 +67,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl)
 {
   ACE_ASSERT (new_impl != 0);
 
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       this->impl_->_remove_ref ();
     }
@@ -83,7 +78,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl)
 CORBA::TypeCode_ptr
 CORBA::Any::type () const
 {
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       return this->impl_->type ();
     }
@@ -94,7 +89,7 @@ CORBA::Any::type () const
 CORBA::TypeCode_ptr
 CORBA::Any::_tao_get_typecode () const
 {
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       return this->impl_->_tao_get_typecode ();
     }
@@ -105,7 +100,7 @@ CORBA::Any::_tao_get_typecode () const
 void
 CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
 {
-  if (this->impl_ == 0)
+  if (!this->impl_)
     {
       ACE_NEW (this->impl_,
                TAO::Unknown_IDL_Type (tc));
@@ -119,7 +114,7 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
 int
 CORBA::Any::_tao_byte_order () const
 {
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       return this->impl_->_tao_byte_order ();
     }
@@ -132,7 +127,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc)
 {
   CORBA::Boolean equiv = false;
 
-  if (this->impl_ != 0)
+  if (this->impl_)
     {
       equiv = this->impl_->_tao_get_typecode ()->equivalent (tc);
     }
@@ -172,9 +167,9 @@ CORBA::Any::to_value::to_value (CORBA::ValueBase *& obj)
 CORBA::Boolean
 CORBA::Any::checked_to_object (CORBA::Object_ptr &_tao_elem) const
 {
-  if (this->impl_ == 0)
+  if (!this->impl_)
     {
-      return 0;
+      return false;
     }
 
   return this->impl_->to_object (_tao_elem);
@@ -183,7 +178,7 @@ CORBA::Any::checked_to_object (CORBA::Object_ptr &_tao_elem) const
 CORBA::Boolean
 CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
 {
-  if (this->impl_ == 0)
+  if (!this->impl_)
     {
       return false;
     }
@@ -194,7 +189,7 @@ CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
 CORBA::Boolean
 CORBA::Any::checked_to_abstract_base (CORBA::AbstractBase_ptr &_tao_elem) const
 {
-  if (this->impl_ == 0)
+  if (!this->impl_)
     {
       return false;
     }
@@ -205,9 +200,8 @@ CORBA::Any::checked_to_abstract_base (CORBA::AbstractBase_ptr &_tao_elem) const
 // ****************************************************************
 
 CORBA::Any_var::Any_var (const CORBA::Any_var &r)
-  : ptr_ (0)
 {
-  if (r.ptr_ != 0)
+  if (r.ptr_)
     {
       ACE_NEW (this->ptr_,
                CORBA::Any (*r.ptr_));
@@ -230,9 +224,9 @@ CORBA::Any_var &
 CORBA::Any_var::operator= (const CORBA::Any_var &r)
 {
   delete this->ptr_;
-  this->ptr_ = 0;
+  this->ptr_ = nullptr;
 
-  if (r.ptr_ != 0)
+  if (r.ptr_)
     {
       ACE_NEW_RETURN (this->ptr_,
                       CORBA::Any (*r.ptr_),
@@ -249,7 +243,7 @@ operator<< (TAO_OutputCDR &cdr, const CORBA::Any &any)
 {
   TAO::Any_Impl *impl = any.impl ();
 
-  if (impl != 0)
+  if (impl)
     {
       return impl->marshal (cdr);
     }
@@ -262,14 +256,14 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
 {
   CORBA::TypeCode_var tc;
 
-  if ((cdr >> tc.out ()) == 0)
+  if (!(cdr >> tc.out ()))
     {
       return false;
     }
 
   try
     {
-      TAO::Unknown_IDL_Type *impl = 0;
+      TAO::Unknown_IDL_Type *impl = nullptr;
       ACE_NEW_RETURN (impl,
                       TAO::Unknown_IDL_Type (tc.in ()),
                       false);
@@ -363,11 +357,8 @@ CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
 
 // Insertion of the other basic types.
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
-
 void
 operator<<= (CORBA::Any &any, CORBA::Short s)
 {
@@ -620,74 +611,55 @@ CORBA::Any::operator>>= (CORBA::Any::to_value obj) const
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::Short &s)
 {
-  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_short, &s);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_short, std::addressof(s));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::UShort &us)
 {
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ushort,
-                                       &us);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_ushort, std::addressof(us));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::Long &l)
 {
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_long,
-                                       &l);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_long, std::addressof(l));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::ULong &ul)
 {
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ulong,
-                                       &ul);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_ulong, std::addressof(ul));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
 {
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longlong,
-                                  &ll);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_longlong, std::addressof(ll));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::ULongLong &ull)
 {
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_ulonglong,
-                                  &ull);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_ulonglong, std::addressof(ull));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::Float &f)
 {
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_float,
-                                       &f);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_float, std::addressof(f));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::Double &d)
 {
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_double,
-                                       &d);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_double, std::addressof(d));
 }
 
 CORBA::Boolean
 operator>>= (const CORBA::Any &any, CORBA::LongDouble &ld)
 {
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longdouble,
-                                  &ld);
+  return TAO::Any_Basic_Impl::extract (any, CORBA::_tc_longdouble, std::addressof(ld));
 }
 
 CORBA::Boolean
@@ -743,10 +715,10 @@ operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc)
 CORBA::Boolean
 operator >>= (const CORBA::Any &any, std::string &str)
 {
-  const char *buf = 0;
-  CORBA::Boolean flag = any >>= buf;
+  const char *buf = nullptr;
+  CORBA::Boolean const flag = any >>= buf;
 
-  if (buf != 0)
+  if (buf)
     {
       str.assign (buf);
     }
@@ -758,10 +730,10 @@ operator >>= (const CORBA::Any &any, std::string &str)
 CORBA::Boolean
 operator >>= (const CORBA::Any &any, std::wstring &str)
 {
-  const wchar_t *buf = 0;
-  CORBA::Boolean flag = any >>= buf;
+  const wchar_t *buf = nullptr;
+  CORBA::Boolean const flag = any >>= buf;
 
-  if (buf != 0)
+  if (buf)
     {
       str.assign (buf);
     }
@@ -770,9 +742,7 @@ operator >>= (const CORBA::Any &any, std::wstring &str)
 }
 #endif
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 // ================================================================
 // Any_Impl_T template specializations.
diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index 9f879820950..769132bf0a5 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -66,7 +66,7 @@ namespace CORBA
     typedef Any_var _var_type;
     typedef Any_out _out_type;
 
-    Any ();
+    Any () = default;
     Any (const Any &);
 
     ~Any ();
@@ -170,7 +170,7 @@ namespace CORBA
     CORBA::Boolean operator>>= (unsigned char&) const;
 
   private:
-    TAO::Any_Impl *impl_;
+    TAO::Any_Impl *impl_ {};
 
     friend class TAO_Marshal_Any;
   };
@@ -224,7 +224,7 @@ namespace CORBA
     Any *ptr () const;
   private:
     /// Holds the Any.
-    Any *ptr_;
+    Any *ptr_ {};
   };
 
   /**
@@ -280,11 +280,8 @@ operator<< (std::ostream &, const CORBA::Any &);
 
 #endif /* GEN_OSTREAM_OPS */
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
-
 /// Typesafe insertion.
 
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Short);
@@ -346,9 +343,7 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &,
                                        std::wstring &);
 #endif
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
@@ -358,11 +353,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
-
 /// Copying versions of insertion operators for basic types
 /// must also be defined for CORBA::Any_var.
 
@@ -426,10 +418,7 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_wstring);
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_object);
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl
index ff717738628..a7a0d0001b5 100644
--- a/TAO/tao/AnyTypeCode/Any.inl
+++ b/TAO/tao/AnyTypeCode/Any.inl
@@ -85,10 +85,8 @@ CORBA::Any_var::ptr () const
 // CORBA::Any_var insertion operators
 // *************************************************************
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
 
 ACE_INLINE void
 operator <<= (CORBA::Any_var &lhs, CORBA::Short rhs)
@@ -316,9 +314,7 @@ operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_object rhs)
   return lhs.in () >>= rhs;
 }
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 // *************************************************************
 // Inline operations for class CORBA::Any_out
@@ -364,13 +360,13 @@ CORBA::Any_out::operator CORBA::Any *&()
 }
 
 ACE_INLINE CORBA::Any *&
-CORBA::Any_out::ptr (void)
+CORBA::Any_out::ptr ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::Any *
-CORBA::Any_out::operator-> (void)
+CORBA::Any_out::operator-> ()
 {
   return this->ptr_;
 }
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index e4336d70a3a..e5f4e1faba8 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -30,7 +30,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
 }
 
 template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
+TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index 5acf9822453..75d1d23a1c3 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -38,7 +38,7 @@ namespace TAO
     Any_Array_Impl_T (_tao_destructor destructor,
                       CORBA::TypeCode_ptr,
                       T_slice * const);
-    virtual ~Any_Array_Impl_T (void);
+    virtual ~Any_Array_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor destructor,
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 8273695fffd..aac5767ffc2 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -244,7 +244,7 @@ namespace TAO
   void
   Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr)
   {
-    if (! this->demarshal_value (cdr))
+    if (!this->demarshal_value (cdr))
       {
         throw ::CORBA::MARSHAL ();
       }
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index 8176c26aef0..80af1e45323 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -27,7 +27,7 @@ TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
 }
 
 template<typename T>
-TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
+TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 39136dec62d..4cf81560d31 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -54,7 +54,7 @@ TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
 }
 
 template<typename T>
-TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
+TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T ()
 {
 }
 
@@ -200,7 +200,7 @@ TAO::Any_Dual_Impl_T<T>::value () const
 
 template<typename T>
 void
-TAO::Any_Dual_Impl_T<T>::free_value (void)
+TAO::Any_Dual_Impl_T<T>::free_value ()
 {
   if (this->value_destructor_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index 990a1881246..abf5d0c2ff8 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -30,7 +30,7 @@ TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
 }
 
 template<typename T>
-TAO::Any_Impl_T<T>::~Any_Impl_T (void)
+TAO::Any_Impl_T<T>::~Any_Impl_T ()
 {
 }
 
@@ -163,7 +163,7 @@ TAO::Any_Impl_T<T>::value () const
 
 template<typename T>
 void
-TAO::Any_Impl_T<T>::free_value (void)
+TAO::Any_Impl_T<T>::free_value ()
 {
   if (this->value_destructor_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index a2cd7984afd..34e437d7961 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -28,7 +28,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
 }
 
 template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
+TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index ba194eff926..807aea527bb 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Empty_Param
      *
@@ -78,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.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 104275c6bf4..3813f753f3b 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -61,7 +61,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 void
 TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
-                    RefCountPolicy>::tao_duplicate (void)
+                    RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -70,7 +70,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 void
 TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
-                    RefCountPolicy>::tao_release (void)
+                    RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index 245bb43c630..66946b70841 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -46,7 +46,6 @@ namespace TAO
         private RefCountPolicy
     {
     public:
-
       /// Constructor.
       Enum (char const * id,
             char const * name,
@@ -97,7 +96,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// structure type.
       Base_Attributes<StringType> base_attributes_;
@@ -108,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 4e35dc18586..ffdd07fbd74 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -51,7 +51,6 @@ namespace TAO
         private TAO::Null_RefCount_Policy
     {
     public:
-
       /// Constructor.
       Enum (char const * id,
             char const * name,
@@ -103,7 +102,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// structure type.
       Base_Attributes<char const *> base_attributes_;
@@ -114,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/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index 301d70b5f49..280f70e4bea 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -77,12 +77,8 @@ namespace TAO
 
 // =======================================================================
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
-
-
 // Insertion of CORBA::Exception - copying.
 void
 operator<<= (CORBA::Any &any, const CORBA::Exception &exception)
@@ -105,9 +101,7 @@ operator<<= (CORBA::Any &any, CORBA::Exception *exception)
       exception);
 }
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h
index 7cb37d60f87..91ffbc797db 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.h
+++ b/TAO/tao/AnyTypeCode/ExceptionA.h
@@ -32,19 +32,10 @@ namespace CORBA
 {
   class Any;
   typedef Any *Any_ptr;
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-namespace CORBA
-{
-#endif
 
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &);
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
index f3310d13465..1740b7b9208 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -26,14 +26,14 @@ TAO::TypeCode::Fixed<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
+TAO::TypeCode::Fixed<RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index e84730b2469..f655c3353b5 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Fixed
      *
@@ -43,7 +42,6 @@ namespace TAO
       , private RefCountPolicy
     {
     public:
-
       /// Constructor.
       Fixed (CORBA::UShort digits, CORBA::UShort scale);
 
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
index 4d810a4150a..7f6f51c1be7 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Indirected_Type
      *
@@ -45,7 +44,6 @@ namespace TAO
       : public CORBA::TypeCode
     {
     public:
-
       /// Constructor.
       Indirected_Type (CORBA::TCKind kind,
                        char const * id);
@@ -121,7 +119,6 @@ namespace TAO
 
     private:
       //@{
-
       /// Typecode id
       CORBA::String_var id_;
 
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 7c0571e618f..557b80f1582 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -145,7 +145,6 @@ CORBA::NVList::add_value (const char *name,
 CORBA::NamedValue_ptr
 CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags)
 {
-
   // call the helper to allocate a NamedValue element
   CORBA::NamedValue_ptr nv = this->add_element (flags);
 
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index 989df82cd99..5afbb1f776e 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -155,7 +155,6 @@ namespace CORBA
     friend class Request;
 
   public:
-
     /// return the current number of elements in the list
     ULong count () const;
 
diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl
index 0ecd203dcc1..05749bc6fba 100644
--- a/TAO/tao/AnyTypeCode/NVList.inl
+++ b/TAO/tao/AnyTypeCode/NVList.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-CORBA::NamedValue::NamedValue (void)
+CORBA::NamedValue::NamedValue ()
   : refcount_ (1),
     flags_ (0),
     name_ (0)
@@ -52,7 +52,7 @@ CORBA::NamedValue::_nil ()
 // *************************************************************
 
 ACE_INLINE
-CORBA::NVList::NVList (void)
+CORBA::NVList::NVList ()
   : max_ (0),
     refcount_ (1),
     incoming_ (0),
diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
index 6dd3b5e1fa0..0effbfd29c1 100644
--- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
@@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class Null_RefCount_Policy
    *
@@ -43,8 +42,8 @@ namespace TAO
    *   class MyHostClass : private RefCountPolicy
    *   {
    *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
+   *     void my_add_ref () { this->RefCountPolicy::add_ref (); }
+   *     void my_remove_ref () { this->RefCountPolicy::remove_ref (); }
    *   };
    * @endcode
    *
@@ -64,7 +63,6 @@ namespace TAO
   class TAO_AnyTypeCode_Export Null_RefCount_Policy
   {
   public:
-
     /// No-op reference increment.
     void add_ref ()  { }
 
@@ -72,7 +70,6 @@ namespace TAO
     void remove_ref () { }
 
   };
-
 }  // End namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index 2b803184a4c..1f56532f106 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -39,14 +39,14 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_marshal (
 
 template <typename StringType, class RefCountPolicy>
 void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <typename StringType, class RefCountPolicy>
 void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
@@ -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 8166b24edbe..cc967a1251a 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -56,7 +56,6 @@ namespace TAO
         private TAO::Null_RefCount_Policy
     {
     public:
-
       /// Constructor.
       Objref (CORBA::TCKind kind,
               char const * id,
@@ -97,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 c28969137c4..42eda17ed6a 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Recursive_Type
      *
@@ -161,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/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
index 8af341e0ea8..e30afb8cc5f 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
@@ -49,14 +49,14 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_marshal (
 
 template <typename TypeCodeType, class RefCountPolicy>
 void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <typename TypeCodeType, class RefCountPolicy>
 void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release (void)
+TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 154a4d41742..8f0172be861 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Sequence
      *
@@ -44,7 +43,6 @@ namespace TAO
       , private RefCountPolicy
     {
     public:
-
       /// Constructor.
       Sequence (CORBA::TCKind kind,
                 TypeCodeType const & content_type,
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
index 1760d8d49f4..06451b2081f 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
@@ -48,7 +48,6 @@ namespace TAO
       , private TAO::Null_RefCount_Policy
     {
     public:
-
       /// Constructor.
       Sequence (CORBA::TCKind kind,
                 CORBA::TypeCode_ptr const * content_type,
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
index f1a3399c936..185c384994a 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
@@ -26,14 +26,14 @@ TAO::TypeCode::String<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::String<RefCountPolicy>::tao_duplicate (void)
+TAO::TypeCode::String<RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
 
 template <class RefCountPolicy>
 void
-TAO::TypeCode::String<RefCountPolicy>::tao_release (void)
+TAO::TypeCode::String<RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 8ca53f95e6e..4f7385135da 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class String
      *
@@ -44,7 +43,6 @@ namespace TAO
         private RefCountPolicy
     {
     public:
-
       /// Constructor.
       String (CORBA::TCKind kind, CORBA::ULong length);
 
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
index 388644be81b..7097666d3fb 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
@@ -47,7 +47,6 @@ namespace TAO
         private TAO::Null_RefCount_Policy
     {
     public:
-
       /// Constructor.
       String (CORBA::TCKind kind, CORBA::ULong length);
 
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.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index 797b5469fd9..7bb02a44b62 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -87,7 +87,7 @@ void
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::tao_duplicate (void)
+                      RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -100,7 +100,7 @@ void
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::tao_release (void)
+                      RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 4e5fb375edf..a8911809dfc 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -51,7 +51,6 @@ namespace TAO
         private RefCountPolicy
     {
     public:
-
       /// Constructor.
       Struct (CORBA::TCKind kind,
               char const * id,
@@ -111,7 +110,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// structure type.
       Base_Attributes<StringType> base_attributes_;
@@ -126,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 e07b1e54e43..f335deba01d 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -112,7 +112,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// structure type.
       Base_Attributes<char const *> const base_attributes_;
@@ -126,7 +125,6 @@ namespace TAO
                    CORBA::TypeCode_ptr const *> const * const fields_;
       //@}
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
index 257032630fc..1fe416b2c16 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
@@ -46,8 +46,8 @@ namespace TAO
    *   class MyHostClass : private RefCountPolicy
    *   {
    *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
+   *     void my_add_ref () { this->RefCountPolicy::add_ref (); }
+   *     void my_remove_ref () { this->RefCountPolicy::remove_ref (); }
    *   };
    * @endcode
    *
@@ -69,7 +69,6 @@ namespace TAO
   class TAO_AnyTypeCode_Export True_RefCount_Policy
   {
   public:
-
     /// Increase the reference count on this object.
     void add_ref ();
 
@@ -102,7 +101,6 @@ namespace TAO
     /// Reference counter.
     std::atomic<uint32_t> refcount_;
   };
-
 }  // End namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index 9a21085a314..284ce5c576f 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -55,7 +55,6 @@ namespace CORBA
   class TAO_AnyTypeCode_Export TypeCode
   {
   public:
-
     /**
      * @class Bounds
      *
@@ -68,7 +67,6 @@ namespace CORBA
     class TAO_AnyTypeCode_Export Bounds : public UserException
     {
     public:
-
       /// Constructor.
       Bounds ();
 
@@ -95,7 +93,6 @@ namespace CORBA
     class TAO_AnyTypeCode_Export BadKind : public CORBA::UserException
     {
     public:
-
       BadKind ();
 
       static BadKind * _downcast (CORBA::Exception * ex);
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
index 193de495ea3..3ff1801cffd 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Base_Attributes
      *
@@ -42,7 +41,6 @@ namespace TAO
     class Base_Attributes
     {
     public:
-
       /// Constructor.
       Base_Attributes (char const * id,
                        char const * name);
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.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 76bd27168bb..2524650e16e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -12,7 +12,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
+TAO::TypeCode::Case<StringType, TypeCodeType>::~Case ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index ccf178f9ed6..87de72be46e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-
     /**
      * @class Case
      *
@@ -146,7 +145,6 @@ namespace TAO
     };
 
     typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
@@ -169,7 +167,6 @@ namespace ACE
       return p->clone ();
     }
   };
-
 } // End namespace ACE.
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
index 0370bd091a4..c9cc3862c88 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
@@ -17,7 +17,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::Case (
 
 template <typename StringType, typename TypeCodeType>
 ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (void)
+TAO::TypeCode::Case<StringType, TypeCodeType>::Case ()
   : name_ ()
   , type_ ()
 {
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
index b44435db95f..d23aaa6b247 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -47,7 +47,6 @@ namespace TAO
     class Case_Enum_T : public Case<StringType, TypeCodeType>
     {
     public:
-
       /// Constructor.
       Case_Enum_T (CORBA::TypeCode_ptr discriminator_tc,
                    CORBA::ULong member_label,
@@ -85,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_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index 973edcffb32..f859e06ff04 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -86,7 +86,6 @@ namespace TAO
     class Case_T : public Case<StringType, TypeCodeType>
     {
     public:
-
       /// Constructor.
       Case_T (DiscriminatorType member_label,
               char const * member_name,
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
index da113fb0934..ae503abbf8c 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
@@ -101,7 +101,6 @@ namespace CORBA
   TypeCode_ptr const _tc_Object     = &TAO::TypeCode::tc_Object;
   TypeCode_ptr const _tc_Component  = &TAO::TypeCode::tc_Component;
   TypeCode_ptr const _tc_Home       = &TAO::TypeCode::tc_Home;
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/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 803fbc1e472..09ff1a79480 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h
@@ -29,7 +29,6 @@ namespace TAO
 
   namespace TypeCode
   {
-
 //     enum Storage { STATIC_TYPECODE, DYNAMIC_TYPECODE };
 
 //     template<Storage S> struct Traits;
@@ -113,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.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index 0942b2988ac..7e72eb0e33f 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -83,7 +83,7 @@ void
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
+                     RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -96,7 +96,7 @@ void
 TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
-                     RefCountPolicy>::tao_release (void)
+                     RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 99cc7cf771a..83077b06840 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -49,7 +49,6 @@ namespace TAO
         private RefCountPolicy
     {
     public:
-
       /// @typedef Type of individual case array element, not the
       ///          array itself.
       typedef TAO::TypeCode::Case<StringType, TypeCodeType> case_type;
@@ -117,7 +116,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// union type.
       Base_Attributes<StringType> base_attributes_;
@@ -143,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 e624fcbece0..998cbd61959 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -54,7 +54,6 @@ namespace TAO
         private TAO::Null_RefCount_Policy
     {
     public:
-
       /// @typedef Type of individual case array element, not the
       ///          array itself.
       typedef TAO::TypeCode::Case<char const *,
@@ -118,7 +117,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// union type.
       Base_Attributes<char const *> const base_attributes_;
@@ -144,7 +142,6 @@ namespace TAO
 
       //@}
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 5d5fa5dbc72..559370ecb42 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -92,7 +92,7 @@ void
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
+                     RefCountPolicy>::tao_duplicate ()
 {
   this->RefCountPolicy::add_ref ();
 }
@@ -105,7 +105,7 @@ void
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::tao_release (void)
+                     RefCountPolicy>::tao_release ()
 {
   this->RefCountPolicy::remove_ref ();
 }
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index 836403fd08d..ebbfa261946 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -52,7 +52,6 @@ namespace TAO
         private RefCountPolicy
     {
     public:
-
       /// Constructor.
       Value (CORBA::TCKind kind,
              char const * id,
@@ -121,7 +120,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// @c valuetype.
       Base_Attributes<StringType> base_attributes_;
@@ -144,7 +142,6 @@ namespace TAO
       //@}
 
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 8745c4ffb63..5e3ac2855de 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -144,7 +144,7 @@ TAO::TypeCode::Value<char const *,
         return false;
 
       char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);;
+        Traits<char const *>::get_string (lhs_field.name);
       char const * const rhs_name = tc->member_name (i);
 
       if (std::strcmp (lhs_name, rhs_name) != 0)
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
index e269498b648..06a7d9f77d5 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -58,7 +58,6 @@ namespace TAO
         private TAO::Null_RefCount_Policy
     {
     public:
-
       /// Constructor.
       Value (CORBA::TCKind kind,
              char const * id,
@@ -118,7 +117,6 @@ namespace TAO
        *       increase cache hits by improving spatial locality.
        */
       //@{
-
       /// Base attributes containing repository ID and name of
       /// @c valuetype.
       Base_Attributes<char const *> const base_attributes_;
@@ -142,7 +140,6 @@ namespace TAO
       //@}
 
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
index ebe9d4aba4b..ffe6064f675 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
@@ -56,7 +56,6 @@ namespace CORBA
 }
 
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
@@ -87,11 +86,8 @@ namespace TAO
   }
 }
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -141,8 +137,6 @@ CORBA::Boolean operator>>= (
         _tao_elem);
 }
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h
index c7497e18426..1bd6a30371f 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.h
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h
@@ -53,7 +53,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
 
@@ -75,19 +74,13 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_ch.cpp:52
 
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 namespace CORBA
 {
-#endif
-
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
 }
-#endif
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
@@ -100,5 +93,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h
index a4c47d3f137..8fb65948311 100644
--- a/TAO/tao/Any_Insert_Policy_T.h
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -36,7 +36,6 @@ namespace TAO
   class Any_Insert_Policy_Stream
   {
   public:
-
     static inline void any_insert (CORBA::Any* p, S const & x)
       {
         (*p) <<= x;
@@ -47,7 +46,6 @@ namespace TAO
   class Any_Insert_Policy_AnyTypeCode_Adapter
   {
   public:
-
     static inline void any_insert (CORBA::Any* p, S const & x)
       {
         TAO_AnyTypeCode_Adapter *adapter =
@@ -71,7 +69,6 @@ namespace TAO
   class Any_Insert_Policy_IFR_Client_Adapter
   {
   public:
-
     static inline void any_insert (CORBA::Any* p, S const & x)
       {
         TAO_IFR_Client_Adapter *adapter =
@@ -95,7 +92,6 @@ namespace TAO
   class Any_Insert_Policy_CORBA_Object
   {
   public:
-
     static inline void any_insert (CORBA::Any* , S const &)
       {
         if (TAO_debug_level > 2)
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index f47baa2a74f..39740bb5230 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -49,7 +49,6 @@ namespace TAO
   class TAO_Export Argument
   {
   public:
-
     /// Destructor.
     virtual ~Argument ();
 
@@ -90,7 +89,6 @@ namespace TAO
     //@}
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-
   };
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h
index 33a79646a44..ba30cd90856 100644
--- a/TAO/tao/Array_Traits_T.h
+++ b/TAO/tao/Array_Traits_T.h
@@ -18,7 +18,6 @@ namespace TAO
 {
 namespace details
 {
-
 template <typename T_forany>
 struct array_traits
 {
@@ -87,7 +86,6 @@ struct array_traits
     copy_range(begin, end, dst);
   }
 };
-
 } // namespace details
 } // namespace CORBA
 
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/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index b782fb89cea..a5f97700172 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -58,7 +58,7 @@ public:
 
 
   /// Destructor
-  virtual ~TAO_Asynch_Queued_Message (void);
+  virtual ~TAO_Asynch_Queued_Message ();
 
   /**
    * @name Implement the Template Methods from TAO_Queued_Message
@@ -71,7 +71,7 @@ public:
   /// @note No reason to believe why this would be called. But have
   /// it here for the sake of uniformity.
   virtual TAO_Queued_Message *clone (ACE_Allocator *alloc);
-  virtual void destroy (void);
+  virtual void destroy ();
   virtual bool is_expired (const ACE_Time_Value &now) const;
   virtual void copy_if_necessary (const ACE_Message_Block* chain);
   //@}
@@ -120,7 +120,6 @@ private:
 
   // Expiration time
   ACE_Time_Value abs_timeout_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index ada4e29eacb..5d2c3fd03fa 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -134,7 +134,6 @@ namespace TAO
   public:
     void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ();
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index 8d57acb6148..364ad980a68 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -44,7 +44,7 @@ TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value (
 template<typename S_var,
          size_t BOUND,
          template <typename> class Insert_Policy>
-TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::~In_BD_String_Clonable_Argument_T (void)
+TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::~In_BD_String_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -58,7 +58,7 @@ template<typename S_var,
          size_t BOUND,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::clone (void)
+TAO::In_BD_String_Clonable_Argument_T<S_var,BOUND,Insert_Policy>::clone ()
 {
   typename S_var::s_traits::char_type * clone_x =
              new typename S_var::s_traits::char_type [BOUND];
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index b7031f3623a..ac11e0957b1 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -67,9 +67,9 @@ namespace TAO
   {
   public:
     In_BD_String_Clonable_Argument_T (const typename S_var::s_traits::char_type * x);
-    virtual ~In_BD_String_Clonable_Argument_T (void);
+    virtual ~In_BD_String_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
   private:
     bool is_clone_;
   };
@@ -93,7 +93,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     typename S_var::s_traits::char_type *& x_;
@@ -117,7 +117,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     typename S_var::s_traits::char_type *& x_;
@@ -135,16 +135,16 @@ namespace TAO
   class Ret_BD_String_Argument_T : public RetArgument
   {
   public:
-    Ret_BD_String_Argument_T (void);
+    Ret_BD_String_Argument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
-    typename S_var::s_traits::char_type * excp (void);
-    typename S_var::s_traits::char_type * retn (void);
+    typename S_var::s_traits::char_type * excp ();
+    typename S_var::s_traits::char_type * retn ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl
index cc4e6c2b853..ad9da0d3585 100644
--- a/TAO/tao/BD_String_Argument_T.inl
+++ b/TAO/tao/BD_String_Argument_T.inl
@@ -48,7 +48,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *&
-TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void)
+TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -69,7 +69,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *&
-TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void)
+TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -81,7 +81,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::
-Ret_BD_String_Argument_T (void)
+Ret_BD_String_Argument_T ()
 {
 }
 
@@ -90,7 +90,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *
-TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp (void)
+TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp ()
 {
   return this->x_.ptr ();
 }
@@ -100,7 +100,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *
-TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn (void)
+TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn ()
 {
   return this->x_._retn ();
 }
@@ -110,7 +110,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *&
-TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void)
+TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index b499969a3df..54836a0817a 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -35,23 +35,22 @@ class TAO_Export TAO_Base_Transport_Property
   : public TAO_Transport_Descriptor_Interface
 {
 public:
-
   /// Default constructor
-  TAO_Base_Transport_Property (void);
+  TAO_Base_Transport_Property ();
 
   /// Constructor
   TAO_Base_Transport_Property (TAO_Endpoint *endpoint,
                                CORBA::Boolean flag = false);
 
   /// Destructor
-  virtual ~TAO_Base_Transport_Property (void);
+  virtual ~TAO_Base_Transport_Property ();
 
   /// The copy constructor.
   TAO_Base_Transport_Property (const TAO_Base_Transport_Property &rhs);
 
   /// This call allocates and copies the contents of this class and
   /// returns the pointer
-  virtual  TAO_Transport_Descriptor_Interface *duplicate (void);
+  virtual  TAO_Transport_Descriptor_Interface *duplicate ();
 
   /// Try to determine if this object is same as the @a other_prop.
   virtual CORBA::Boolean is_equivalent (
diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl
index a99880c12f8..4f7ce5ebd51 100644
--- a/TAO/tao/Base_Transport_Property.inl
+++ b/TAO/tao/Base_Transport_Property.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Base_Transport_Property::TAO_Base_Transport_Property (void)
+TAO_Base_Transport_Property::TAO_Base_Transport_Property ()
 {
 }
 
diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl
index c0cd04fa721..f3fb2f2bd83 100644
--- a/TAO/tao/Basic_Argument_T.inl
+++ b/TAO/tao/Basic_Argument_T.inl
@@ -38,7 +38,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -56,7 +56,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -66,7 +66,7 @@ TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T ()
 {
 }
 
@@ -74,7 +74,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -83,7 +83,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp ()
 {
   return this->x_;
 }
@@ -92,7 +92,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index 9566337d585..fad6fe1a0c9 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -35,9 +35,8 @@ class TAO_Policy_Validator;
 class TAO_Export TAO_BiDir_Adapter : public ACE_Service_Object
 {
 public:
-
   /// The virtual destructor
-  virtual ~TAO_BiDir_Adapter (void);
+  virtual ~TAO_BiDir_Adapter ();
 
   virtual void load_policy_validators (TAO_Policy_Validator &validator) = 0;
 };
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index bb568888c76..70c09aa62ae 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -9,15 +9,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void)
-  : initialized_ (false)
-{
-}
-
-TAO_BiDirGIOP_Loader::~TAO_BiDirGIOP_Loader (void)
-{
-}
-
 int
 TAO_BiDirGIOP_Loader::init (int, ACE_TCHAR* [])
 {
@@ -81,7 +72,7 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
   if (TAO_DEF_GIOP_MINOR < 2)
     return;
 
-  TAO_BiDirPolicy_Validator *validator = 0;
+  TAO_BiDirPolicy_Validator *validator = nullptr;
   ACE_NEW_THROW_EX (validator,
                     TAO_BiDirPolicy_Validator (val.orb_core ()),
                     CORBA::NO_MEMORY (
@@ -102,12 +93,11 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
 }
 
 int
-TAO_BiDirGIOP_Loader::Initializer (void)
+TAO_BiDirGIOP_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader);
 }
 
-
 ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader,
                        ACE_TEXT ("BiDirGIOP_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index d5765aa4618..55949398547 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -39,24 +39,24 @@ class TAO_BIDIRGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter
 {
 public:
   /// Constructor
-  TAO_BiDirGIOP_Loader (void);
+  TAO_BiDirGIOP_Loader () = default;
 
   /// Destructor
-  virtual ~TAO_BiDirGIOP_Loader (void);
+  ~TAO_BiDirGIOP_Loader () override = default;
 
   /// Initialize the BiDIR loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
+  int init (int argc,
+            ACE_TCHAR* []) override;
 
-  virtual void load_policy_validators (TAO_Policy_Validator &validator);
+  void load_policy_validators (TAO_Policy_Validator &validator) override;
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 
 private:
   /// Flag to indicate whether the BiDirGIOP library has been
   /// activated.
-  bool initialized_;
+  bool initialized_ {false};
 };
 
 static bool
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
index 3fcbb186aae..f913455c335 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -38,11 +38,11 @@ class TAO_BIDIRGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validat
 public:
   TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core);
 
-  virtual void validate_impl (TAO_Policy_Set &policies);
+  void validate_impl (TAO_Policy_Set &policies) override;
 
-  virtual void merge_policies_impl (TAO_Policy_Set &policies);
+  void merge_policies_impl (TAO_Policy_Set &policies) override;
 
-  virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
+  CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 51fcc54db14..66581bacfd7 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -31,7 +31,7 @@ TAO_BiDir_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     }
 
   // Bind the service context handler for BiDIR GIOP
-  TAO_BiDIR_Service_Context_Handler* h = 0;
+  TAO_BiDIR_Service_Context_Handler* h = nullptr;
   ACE_NEW (h,
            TAO_BiDIR_Service_Context_Handler());
   tao_info->orb_core ()->service_context_registry ().bind (IOP::BI_DIR_IIOP, h);
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index 0fce1e5f866..b4079d10de2 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -30,15 +30,15 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/// Messaging ORB initializer.
+/// BiDIR ORB initializer.
 class TAO_BiDir_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info) override;
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info) override;
 
 private:
   /// Register BiDir policy factories.
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index de613cd3cff..86768b42efe 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -18,7 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
 
@@ -37,8 +36,8 @@ class TAO_BiDir_PolicyFactory
   , public ::CORBA::LocalObject
 {
 public:
-  virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value);
+  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
+                                   const CORBA::Any & value) override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index 28530309a67..aa0fe3a97cc 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -28,7 +28,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy
 }
 
 CORBA::PolicyType
-TAO_BidirectionalPolicy::policy_type (void)
+TAO_BidirectionalPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -39,19 +39,19 @@ TAO_BidirectionalPolicy::policy_type (void)
 TAO_BidirectionalPolicy *
 TAO_BidirectionalPolicy::clone () const
 {
-  TAO_BidirectionalPolicy *copy = 0;
+  TAO_BidirectionalPolicy *copy = nullptr;
   ACE_NEW_RETURN (copy,
                   TAO_BidirectionalPolicy (*this),
-                  0);
+                  nullptr);
   return copy;
 }
 
 CORBA::Policy_ptr
-TAO_BidirectionalPolicy::copy (void)
+TAO_BidirectionalPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
-  TAO_BidirectionalPolicy* tmp = 0;
+  TAO_BidirectionalPolicy* tmp = nullptr;
   ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
@@ -60,12 +60,12 @@ TAO_BidirectionalPolicy::copy (void)
 }
 
 void
-TAO_BidirectionalPolicy::destroy (void)
+TAO_BidirectionalPolicy::destroy ()
 {
 }
 
 BiDirPolicy::BidirectionalPolicyValue
-TAO_BidirectionalPolicy::value (void)
+TAO_BidirectionalPolicy::value ()
 {
   return this->value_;
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
index d75c47d80ff..24e47b059c8 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -48,19 +48,19 @@ public:
   /// Copy constructor.
   TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs);
 
-  /// Returns a copy of <this>.
+  /// Returns a copy of this.
   virtual TAO_BidirectionalPolicy *clone () const;
 
   /// = The BiDir::BidirectionalPolicy methods
-  virtual BiDirPolicy::BidirectionalPolicyValue value (void);
+  BiDirPolicy::BidirectionalPolicyValue value () override;
 
-  virtual CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type () override;
 
-  virtual CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy () override;
 
-  virtual void destroy (void);
+  void destroy () override;
 
-  virtual TAO_Cached_Policy_Type _tao_cached_type () const;
+  TAO_Cached_Policy_Type _tao_cached_type () const override;
 
 private:
   /// The attribute
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.h b/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.h
index f15186ae028..1963b179524 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.h
@@ -27,15 +27,15 @@ class TAO_BiDIR_Service_Context_Handler :
   public TAO_Service_Context_Handler
 {
 public:
-  virtual int process_service_context (TAO_Transport& transport,
-                                       const IOP::ServiceContext& context,
-                                       TAO_ServerRequest *request);
-  virtual int generate_service_context (
+  int process_service_context (TAO_Transport& transport,
+                               const IOP::ServiceContext& context,
+                               TAO_ServerRequest *request) override;
+  int generate_service_context (
     TAO_Stub* stub,
     TAO_Transport &transport,
     TAO_Operation_Details &opdetails,
     TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg);
+    TAO_OutputCDR &msg) override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bounded_Array_Allocation_Traits_T.h b/TAO/tao/Bounded_Array_Allocation_Traits_T.h
index 67c7178021c..55ee5250321 100644
--- a/TAO/tao/Bounded_Array_Allocation_Traits_T.h
+++ b/TAO/tao/Bounded_Array_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, CORBA::ULong MAX, bool dummy>
 struct bounded_array_allocation_traits
 {
@@ -48,7 +47,6 @@ struct bounded_array_allocation_traits
     delete[] buffer;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Bounded_Array_Sequence_T.h b/TAO/tao/Bounded_Array_Sequence_T.h
index 8a9b6230a04..d52a4db56cc 100644
--- a/TAO/tao/Bounded_Array_Sequence_T.h
+++ b/TAO/tao/Bounded_Array_Sequence_T.h
@@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<typename T_array, typename T_slice, typename T_tag, CORBA::ULong MAX>
 class bounded_array_sequence
 {
diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
index 1f3c7d0d577..d86427db8b2 100644
--- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<typename object_t, typename object_t_var, CORBA::ULong MAX>
 class bounded_object_reference_sequence
 {
@@ -111,7 +110,6 @@ public:
 private:
   implementation_type impl_;
 };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h
index 444258197ac..4306e009ee1 100644
--- a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h
+++ b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, class ref_traits, CORBA::ULong MAX, bool dummy>
 struct bounded_reference_allocation_traits
 {
@@ -63,7 +62,6 @@ struct bounded_reference_allocation_traits
     return MAX;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Bounded_Value_Allocation_Traits_T.h b/TAO/tao/Bounded_Value_Allocation_Traits_T.h
index 05ac63153a0..cb2e8168bdd 100644
--- a/TAO/tao/Bounded_Value_Allocation_Traits_T.h
+++ b/TAO/tao/Bounded_Value_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, CORBA::ULong MAX, bool dummy>
 struct bounded_value_allocation_traits
 {
@@ -54,7 +53,6 @@ struct bounded_value_allocation_traits
   }
   /* static CORBA::ULong const MAXIMUM = MAX; */
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h
index a9e620aa42a..3579c6cd2b3 100644
--- a/TAO/tao/Bounded_Value_Sequence_T.h
+++ b/TAO/tao/Bounded_Value_Sequence_T.h
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<class T, CORBA::ULong MAX, class Tag=int>
 class bounded_value_sequence
 {
@@ -102,7 +101,6 @@ public:
 private:
   implementation_type impl_;
 };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp
index cab52477446..afe698ff1ff 100644
--- a/TAO/tao/Buffer_Allocator_T.cpp
+++ b/TAO/tao/Buffer_Allocator_T.cpp
@@ -17,7 +17,7 @@ namespace TAO
 
   template <typename handler_type, typename alloc_type>
   handler_type*
-  TAO_Buffer_Allocator<handler_type, alloc_type>::allocate (void)
+  TAO_Buffer_Allocator<handler_type, alloc_type>::allocate ()
   {
     handler_type* myvalue = 0;
     ACE_NEW_MALLOC_RETURN (myvalue,
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 79835eacf2c..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);
-
     }
 }
 
@@ -245,7 +244,6 @@ TAO_OutputCDR::fragment_stream (ACE_CDR::ULong pending_alignment,
 }
 
 
-
 int
 TAO_OutputCDR::offset (char* pos)
 {
@@ -346,7 +344,6 @@ TAO_InputCDR::throw_skel_exception (int error_num )
 
     default :
       throw ::CORBA::MARSHAL();
-
     }
 }
 
diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl
index 89958d671dd..2180ec07e88 100644
--- a/TAO/tao/CDR.inl
+++ b/TAO/tao/CDR.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_OutputCDR::~TAO_OutputCDR (void)
+TAO_OutputCDR::~TAO_OutputCDR ()
 {
 }
 
@@ -262,7 +262,7 @@ TAO_InputCDR::TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs,
 
 
 ACE_INLINE
-TAO_InputCDR::~TAO_InputCDR (void)
+TAO_InputCDR::~TAO_InputCDR ()
 {
 }
 
diff --git a/TAO/tao/CORBALOC_Parser.inl b/TAO/tao/CORBALOC_Parser.inl
index 399a02a53bb..7545b3b3e2b 100644
--- a/TAO/tao/CORBALOC_Parser.inl
+++ b/TAO/tao/CORBALOC_Parser.inl
@@ -4,7 +4,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void)
+TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint ()
 {
   if (this->profile_ != 0)
     this->profile_->_decr_refcnt();
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 2b934e81b41..db7a72d3511 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -55,7 +55,6 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 CORBA::Object_ptr
 TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
 {
-
   // Skip the prefix, we know it is there because this method in only
   // called if <match_prefix> returns 1.
   const char *corbaname =
@@ -112,7 +111,6 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
 
       if (key_string.length () != 0)
         {
-
           // Make a dynamic request for resolve_str in this naming context
           obj = this->parse_string_dynamic_request_helper (name_context.in (),
                                                            key_string);
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index aaa20da44ec..a0fe07ad895 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -31,9 +31,10 @@ istream &
 operator>> (istream &is, CORBA::String_var &sv)
 {
   is.seekg (0, ios::end);
-  sv = CORBA::string_alloc (static_cast<CORBA::ULong> (is.tellg ()));
+  std::streamsize const n = is.tellg ();
+  sv = CORBA::string_alloc (static_cast<CORBA::ULong> (n));
   is.seekg (0, ios::beg);
-  is >> sv.inout ();
+  is.read (sv.inout (), n);
   return is;
 }
 
@@ -48,12 +49,15 @@ istream &
 operator>> (istream &is, CORBA::String_out &so)
 {
   is.seekg (0, ios::end);
-  so = CORBA::string_alloc (static_cast<CORBA::ULong> (is.tellg ()));
+  std::streamsize const n = is.tellg ();
+  so = CORBA::string_alloc (static_cast<CORBA::ULong> (n));
   is.seekg (0, ios::beg);
-  is >> so.ptr ();
+  is.read (so.ptr (), n);
   return is;
 }
 
+#ifndef ACE_HAS_CPP20
+
 // Until we implement WString support for platforms with a
 // 4-byte wchar_t, we just define the following to emit
 // the CORBA::WChars one by one.
@@ -136,6 +140,8 @@ operator>> (istream &is, CORBA::WString_out &wso)
   return is;
 }
 
+#endif /* ACE_HAS_CPP20 */
+
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
index 5e308bc9ad2..2338c9a03a4 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -273,6 +273,8 @@ TAO_Export ostream &
 operator<< (ostream &, CORBA::String_out &);
 TAO_Export istream &
 operator>> (istream &, CORBA::String_out &);
+
+#  ifndef ACE_HAS_CPP20
 TAO_Export ostream &
 operator<< (ostream &, const CORBA::WString_var &);
 TAO_Export istream &
@@ -281,6 +283,7 @@ TAO_Export ostream &
 operator<< (ostream &, CORBA::WString_out &);
 TAO_Export istream &
 operator>> (istream &, CORBA::WString_out &);
+#  endif /* ACE_HAS_CPP20 */
 
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 84741bf7299..d1239cf0555 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
+TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher ()
 {
 }
 
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index e195e7fd42c..c3bd63fb687 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -31,7 +31,7 @@ class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher
   : public virtual TAO_Default_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_CSD_Default_Servant_Dispatcher (void);
+  virtual ~TAO_CSD_Default_Servant_Dispatcher ();
 
   /// Factory method for creating new CSD Root POA.
   virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
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 055654f0c90..a61ad5f52a3 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
@@ -29,7 +29,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     /**
      * @class FW_Server_Request_Wrapper
      *
@@ -58,7 +57,6 @@ namespace TAO
     class TAO_CSD_FW_Export FW_Server_Request_Wrapper
     {
     public:
-
       /// Constructor.
       FW_Server_Request_Wrapper(TAO_ServerRequest& server_request);
 
@@ -111,7 +109,6 @@ namespace TAO
       /// Pointer to the underlying TAO_ServerRequest object.
       TAO_ServerRequest* request_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
index 7aabd46fdb9..3090791d1b4 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
@@ -5,18 +5,18 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CSD_Framework_Loader::TAO_CSD_Framework_Loader (void)
+TAO_CSD_Framework_Loader::TAO_CSD_Framework_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_CSD_Framework_Loader::~TAO_CSD_Framework_Loader (void)
+TAO_CSD_Framework_Loader::~TAO_CSD_Framework_Loader ()
 {
 }
 
 
 int
-TAO_CSD_Framework_Loader::static_init (void)
+TAO_CSD_Framework_Loader::static_init ()
 {
   ACE_Service_Config::process_directive (
       ace_svc_desc_TAO_CSD_Object_Adapter_Factory);
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
index 4acf7146b96..9109d576ac9 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
@@ -38,13 +38,13 @@ class TAO_CSD_FW_Export TAO_CSD_Framework_Loader : public ACE_Service_Object
 {
  public:
   /// Constructor.
-  TAO_CSD_Framework_Loader (void);
+  TAO_CSD_Framework_Loader ();
 
   /// Destructor.
-  virtual ~TAO_CSD_Framework_Loader (void);
+  virtual ~TAO_CSD_Framework_Loader ();
 
   /// Used to force the initialization of the ORB code.
-  static int static_init (void);
+  static int static_init ();
 
   /// Initialize the PI_Server loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index 79a36821536..b94de8c38e7 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -10,7 +10,6 @@ TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter (
   TAO_ORB_Core &orb_core)
   :  TAO_Object_Adapter (creation_parameters, orb_core)
 {
-
 }
 
 TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter ()
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
index 7d42cea101e..a792d9698a7 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
@@ -34,13 +34,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_CSD_FW_Export TAO_CSD_Object_Adapter : public TAO_Object_Adapter
 {
 public:
-
   /// Constructor
   TAO_CSD_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
                           TAO_ORB_Core &orb_core);
 
   /// Destructor
-  virtual ~TAO_CSD_Object_Adapter (void);
+  virtual ~TAO_CSD_Object_Adapter ();
 
   /// Hand the request to the Service_Dispatching_Strategy_Proxy for
   /// dispatching.
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index 973a03d0b66..440758c11c3 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void)
+TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
index c9ce0b518b6..094bdb498d6 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
@@ -29,7 +29,7 @@ class TAO_CSD_FW_Export TAO_CSD_Object_Adapter_Factory : public TAO_Adapter_Fact
 {
 public:
   /// Constructor
-  TAO_CSD_Object_Adapter_Factory (void);
+  TAO_CSD_Object_Adapter_Factory ();
 
   // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   // details.
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index 9729e0950ac..b5556b4441e 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -36,7 +36,7 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name,
 
 
 // Implementation skeleton destructor
-TAO_CSD_POA::~TAO_CSD_POA (void)
+TAO_CSD_POA::~TAO_CSD_POA ()
 {
   delete this->sds_proxy_;
 }
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index 08f821911df..042aa2ab8d7 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -47,7 +47,7 @@ public:
                TAO_Object_Adapter *object_adapter);
 
   /// Destructor
-  virtual ~TAO_CSD_POA (void);
+  virtual ~TAO_CSD_POA ();
 
   /// Pass the Strategy object reference to the CSD poa.
   virtual
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index 879f86b08cd..be497e17970 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -56,7 +56,6 @@ namespace TAO
         public ::CORBA::LocalObject
     {
     public:
-
       /// Result Type for dispatching method(s).
       enum DispatchResult
       {
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
index 2a96f39256d..37a56cbd633 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
@@ -44,7 +44,6 @@ namespace TAO
     class TAO_CSD_FW_Export Strategy_Proxy
     {
     public:
-
       /// Default Constructor.
       Strategy_Proxy();
 
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
index 556c4504762..d45afff0876 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
@@ -18,7 +18,6 @@ TAO_CSD_Strategy_Repository::~TAO_CSD_Strategy_Repository()
 int
 TAO_CSD_Strategy_Repository::init(int, ACE_TCHAR **)
 {
-
   static int initialized = 0;
 
   // Only allow initialization once.
@@ -33,7 +32,6 @@ TAO_CSD_Strategy_Repository::init(int, ACE_TCHAR **)
 CSD_Framework::Strategy_ptr
 TAO_CSD_Strategy_Repository::find (const ACE_CString& name)
 {
-
   if (this->strategy_list_head_ != 0)
     {
       Strategy_Node *node = this->strategy_list_head_->find(name);
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
index ac5643bb538..ed993fb8c17 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
@@ -36,7 +36,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_CSD_FW_Export TAO_CSD_Strategy_Repository : public ACE_Service_Object
 {
 public:
-
   /// Constructor.
   TAO_CSD_Strategy_Repository();
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
index 3fd5f1d7be0..7bd8aa02349 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
@@ -47,7 +47,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Cancel_Visitor : public TP_Queue_Visitor
     {
     public:
-
       /// Default Constructor - cancel *all* requests.
       TP_Cancel_Visitor();
 
@@ -69,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 3acc7476b5e..6cfd276f2ea 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Collocated_Asynch_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Asynch_Request>
                                         TP_Collocated_Asynch_Request_Handle;
@@ -71,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 cf23ffa4d26..d43751740c3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
@@ -29,7 +29,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Collocated_Synch_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Synch_Request>
                                           TP_Collocated_Synch_Request_Handle;
@@ -49,7 +48,6 @@ namespace TAO
                                                   : public TP_Corba_Request
     {
     public:
-
       /// Constructor.
       TP_Collocated_Synch_Request
                            (TAO_ServerRequest&              server_request,
@@ -66,7 +64,7 @@ namespace TAO
       /// until it has been cancelled.
       /// Returns true if the request has been dispatched, and returns
       /// false if the request has been cancelled.
-      bool wait(void);
+      bool wait();
 
     protected:
       /// Note that we do not override our base class implementation of
@@ -88,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_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
index 0dc311aa3c6..89f5e6db715 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
@@ -24,7 +24,7 @@ TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request
 
 ACE_INLINE
 bool
-TAO::CSD::TP_Collocated_Synch_Request::wait(void)
+TAO::CSD::TP_Collocated_Synch_Request::wait()
 {
   bool dispatched = this->synch_helper_.wait_while_pending();
 
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 06dde1e04af..8caab710608 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
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Collocated_Synch_With_Server_Request;
     typedef TAO_Intrusive_Ref_Count_Handle
             <TP_Collocated_Synch_With_Server_Request>
@@ -50,7 +49,6 @@ namespace TAO
                                                   : public TP_Corba_Request
     {
     public:
-
       /// Constructor.
       TP_Collocated_Synch_With_Server_Request
                            (TAO_ServerRequest&              server_request,
@@ -70,7 +68,7 @@ namespace TAO
       /// just *after* the request is dispatched by a worker thread.
       /// Returns true if the request has been dispatched, and returns
       /// false if the request has been cancelled.
-      bool wait(void);
+      bool wait();
 
     protected:
       /// Prepare this TP_Collocated_Synch_With_Server_Request object to be
@@ -89,7 +87,6 @@ namespace TAO
       /// wait() method.
       TP_Synch_Helper synch_helper_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
index 51599163276..3cbc3791ae0 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
@@ -21,7 +21,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Serv
 
 ACE_INLINE
 bool
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(void)
+TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait()
 {
   return this->synch_helper_.wait_while_pending();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
index 6162d4cf682..cac4e8d0741 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
@@ -31,7 +31,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Corba_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Corba_Request>
                                              TP_Corba_Request_Handle;
@@ -47,7 +46,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Corba_Request : public TP_Request
     {
     public:
-
       /// Virtual Destructor.
       virtual ~TP_Corba_Request();
 
@@ -64,7 +62,7 @@ namespace TAO
       void do_clone();
 
       /// Delegate to the FW_Server_Request_Wrapper dispatch() method.
-      void do_dispatch(void);
+      void do_dispatch();
 
       /// Delegate to the FW_Server_Request_Wrapper cancel() method.
       void do_cancel();
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
index b6ed1be9bcd..c89c9dc6128 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
@@ -26,7 +26,7 @@ TAO::CSD::TP_Corba_Request::do_clone()
 
 ACE_INLINE
 void
-TAO::CSD::TP_Corba_Request::do_dispatch(void)
+TAO::CSD::TP_Corba_Request::do_dispatch()
 {
   // Pass 0 for the upcall wrapper. If we have it here, we can change the
   // upcall wrapper to a reference in the full TAO Core
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 b0ef729fe2b..1711dca3987 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Custom_Asynch_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Asynch_Request>
                                              TP_Custom_Asynch_Request_Handle;
@@ -59,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 beaf7decfa3..ec4d201178b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
@@ -29,7 +29,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Custom_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request>
                                              TP_Custom_Request_Handle;
@@ -59,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 cc25a814a2e..d3a644e3c24 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Custom_Request_Operation;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request_Operation>
                                           TP_Custom_Request_Operation_Handle;
@@ -52,7 +51,6 @@ namespace TAO
                       : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
-
       /// Virtual Destructor.
       virtual ~TP_Custom_Request_Operation();
 
@@ -78,7 +76,6 @@ namespace TAO
     private:
       PortableServer::ServantBase_var servant_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
index 385ea47cd30..45af5315cbe 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
@@ -12,7 +12,7 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation
 
 ACE_INLINE
 void
-TAO::CSD::TP_Custom_Request_Operation::execute (void)
+TAO::CSD::TP_Custom_Request_Operation::execute ()
 {
   this->execute_i();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
index f6bffc898eb..a68cb9804d1 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Custom_Synch_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Synch_Request>
                                              TP_Custom_Synch_Request_Handle;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
index 76a6b97669a..8a4b3a48667 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     /**
      * @class TP_Dispatchable_Visitor
      *
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
index 9066d0a0d77..b4b72e6635a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Request;
     class TP_Queue_Visitor;
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
index 27019971165..81847c58d25 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Request;
 
 
@@ -59,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 ee275c8dfd4..29079cf5ff3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
@@ -27,7 +27,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Remote_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Remote_Request>
                                              TP_Remote_Request_Handle;
@@ -83,7 +82,6 @@ namespace TAO
       /// Cancel the request.
       virtual void cancel_i();
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
index 70d51f26fc9..c6801b7272c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Request;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Request> TP_Request_Handle;
 
@@ -50,7 +49,6 @@ namespace TAO
       : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
-
       /// Virtual Destructor.
       virtual ~TP_Request();
 
@@ -116,7 +114,6 @@ namespace TAO
       /// Reference to the servant "state" object (contains the busy flag).
       TP_Servant_State::HandleType servant_state_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
index 0b16cea7c4c..f1db7dc6309 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     /**
      * @class TP_Servant_State
      *
@@ -74,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 d78e196d0db..c36802cd071 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
@@ -30,7 +30,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     /**
      * @class TP_Servant_State_Map
      *
@@ -72,7 +71,6 @@ namespace TAO
       /// The underlying map of servant state objects.
       MapType map_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
index 84627c4375f..c91f7ef99b3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
@@ -19,7 +19,6 @@ TAO::CSD::TP_Strategy::~TP_Strategy()
 }
 
 
-
 TAO::CSD::TP_Strategy::CustomRequestOutcome
 TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op)
 {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
index 703d074893a..857d4da528e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
@@ -32,7 +32,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     class TP_Strategy;
     typedef TAO_Intrusive_Ref_Count_Handle<TP_Strategy> TP_Strategy_Handle;
 
@@ -56,7 +55,6 @@ namespace TAO
       : public Strategy_Base
     {
     public:
-
       /// Constructor.
       TP_Strategy(Thread_Counter  num_threads = 1,
                   bool     serialize_servants = true);
@@ -182,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_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h
index 8773ce30f15..10a1144cb76 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h
@@ -29,7 +29,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     /**
      * @class TP_Strategy_Factory
      *
@@ -41,7 +40,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Strategy_Factory : public ACE_Service_Object
     {
       public:
-
         /// Constructor.
         TP_Strategy_Factory();
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
index d4664257a1c..78e65828367 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace CSD
   {
-
     /**
      * @class TP_Synch_Helper
      *
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
index 9e714f9e4b9..378ea9e05af 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
@@ -278,7 +278,6 @@ TAO::CSD::TP_Task::close(u_long flag)
 }
 
 
-
 void
 TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant)
 {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
index 1365350c168..c80121e2641 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
@@ -75,7 +75,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Task : public ACE_Task_Base
     {
     public:
-
       /// Default Constructor.
       TP_Task();
 
@@ -149,7 +148,6 @@ namespace TAO
 
       enum { MAX_THREADPOOL_TASK_WORKER_THREADS = 50 };
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
index 304d2af1198..27f2459cf3d 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
@@ -13,7 +13,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_CSD_ThreadPool::init (void)
+TAO_CSD_ThreadPool::init ()
 {
   static int initialized = 0;
   if (initialized == 1)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
index a389c9fb37c..ed1f42dd674 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
@@ -36,7 +36,7 @@ class TAO_CSD_TP_Export TAO_CSD_ThreadPool
 {
  public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index 0d7e481202f..b9ce64774f7 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -40,7 +40,7 @@ class TAO_Export TAO_Cleanup_Func_Registry
 
 public:
   /// Constructor.
-  TAO_Cleanup_Func_Registry ();
+  TAO_Cleanup_Func_Registry () = default;
 
   /// Return the number of registered cleanup functions.
   size_t size () const;
diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl
index 3fd2e46a546..87f7ab43d12 100644
--- a/TAO/tao/Cleanup_Func_Registry.inl
+++ b/TAO/tao/Cleanup_Func_Registry.inl
@@ -1,12 +1,6 @@
 // -*- C++ -*-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE
-TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
-  : cleanup_funcs_ ()
-{
-}
-
 ACE_INLINE size_t
 TAO_Cleanup_Func_Registry::size () const
 {
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index e59d0ee66ee..f651b4fc465 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -56,7 +56,6 @@ namespace Messaging
 class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
 {
 public:
-
   /// Destructor
   virtual ~TAO_Client_Strategy_Factory ();
 
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index d81d2c728bb..24a528eda8a 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -32,7 +32,7 @@ TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (
 {
 }
 
-TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
+TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec ()
 {
 }
 
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 38e0722bc1c..5fb55923d43 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -76,7 +76,7 @@ protected:
    * Only allow this class to be instantiated on the heap since it is
    * reference counted.
    */
-  virtual ~TAO_CDR_Encaps_Codec (void);
+  virtual ~TAO_CDR_Encaps_Codec ();
 
   /// Verify that it is possible to encode the given data using this
   /// Codec.
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index d58fcd8d6be..6491cca8fd3 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -25,7 +25,7 @@ TAO_CodecFactory_Loader::create_object (CORBA::ORB_ptr orb,  int, ACE_TCHAR *[])
 }
 
 int
-TAO_CodecFactory_Loader::Initializer (void)
+TAO_CodecFactory_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader);
 }
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index 70af066d3d2..b4c843e436b 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -85,7 +85,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
 
   switch (encoding_format)
     {
-
       // @@ MSVC 6 gets confused and thinks that
       //    IOP::ENCODING_CDR_ENCAPS is not a constant, so its actual
       //    value (0) is used instead.
@@ -115,7 +114,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
 
     default:
       throw IOP::CodecFactory::UnknownEncoding ();
-
     }
 
   return codec;
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 120478f0b2e..03e7a88fcbe 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -70,7 +70,6 @@ private:
    * which they are associated.
    */
   TAO_ORB_Core * const orb_core_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp
index b61f88dba2c..d1dc744d38d 100644
--- a/TAO/tao/Codeset/Codeset.cpp
+++ b/TAO/tao/Codeset/Codeset.cpp
@@ -18,15 +18,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Codeset_Initializer::init (void)
+TAO_Codeset_Initializer::init ()
 {
   int result = 0;
 
-  result += ACE_Service_Config::process_directive
-    (ace_svc_desc_TAO_UTF8_Latin1_Factory);
+  result += ACE_Service_Config::process_directive (ace_svc_desc_TAO_UTF8_Latin1_Factory);
 
-  result += ACE_Service_Config::process_directive
-    (ace_svc_desc_TAO_UTF16_BOM_Factory);
+  result += ACE_Service_Config::process_directive (ace_svc_desc_TAO_UTF16_BOM_Factory);
 
   TAO_Codeset_Manager_Factory *cmf = ACE_Dynamic_Service<TAO_Codeset_Manager_Factory>::instance("TAO_Codeset");
 
@@ -35,8 +33,7 @@ TAO_Codeset_Initializer::init (void)
       return result;
     }
 
-  result += ACE_Service_Config::process_directive
-    (ace_svc_desc_TAO_Codeset_Manager_Factory,1); // force replacement
+  result += ACE_Service_Config::process_directive (ace_svc_desc_TAO_Codeset_Manager_Factory,1); // force replacement
 
   return result;
 }
diff --git a/TAO/tao/Codeset/Codeset.h b/TAO/tao/Codeset/Codeset.h
index ea111869e0e..56482316a6d 100644
--- a/TAO/tao/Codeset/Codeset.h
+++ b/TAO/tao/Codeset/Codeset.h
@@ -28,7 +28,7 @@ class TAO_Codeset_Export TAO_Codeset_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp
index 75aac37a839..4ebf2cc0c4a 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -117,7 +117,7 @@ TAO_Codeset_Descriptor::add_translator (const ACE_TCHAR *name)
 }
 
 TAO_Codeset_Descriptor::Translator_Node *
-TAO_Codeset_Descriptor::translators (void)
+TAO_Codeset_Descriptor::translators ()
 {
   return this->trans_base_;
 }
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h
index ef859f98830..8b747700f3f 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.h
+++ b/TAO/tao/Codeset/Codeset_Descriptor.h
@@ -47,7 +47,7 @@ public:
   int num_translators () const;
 
   void add_translator (const ACE_TCHAR *name);
-  Translator_Node *translators (void);
+  Translator_Node *translators ();
 
 private:
   ACE_CDR::ULong ncs_;
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
index f3da5f2a337..a85ef8f4670 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void)
+TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory ()
 {
 }
 
@@ -26,7 +26,7 @@ TAO_Codeset_Manager_Factory::is_default () const
 
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory::create (void)
+TAO_Codeset_Manager_Factory::create ()
 {
   TAO_Codeset_Manager_i *csm = 0;
   ACE_NEW_RETURN (csm, TAO_Codeset_Manager_i, 0);
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h
index 46df928a484..5cc7d6ae962 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.h
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h
@@ -40,9 +40,8 @@ class TAO_Codeset_Export TAO_Codeset_Manager_Factory :
 {
 public:
   virtual ~TAO_Codeset_Manager_Factory ();
-  virtual TAO_Codeset_Manager *create(void);
+  virtual TAO_Codeset_Manager *create();
   virtual bool is_default() const;
-
 };
 
 
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 019486489e7..b1841d9da19 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -57,7 +57,7 @@ TAO_Codeset_Manager_i::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID;
 CONV_FRAME::CodeSetId
 TAO_Codeset_Manager_i::default_wchar_codeset = TAO_DEFAULT_WCHAR_CODESET_ID;
 
-TAO_Codeset_Manager_i::TAO_Codeset_Manager_i (void)
+TAO_Codeset_Manager_i::TAO_Codeset_Manager_i ()
   : codeset_info_ (),
     char_descriptor_ (),
     wchar_descriptor_ ()
@@ -67,21 +67,16 @@ TAO_Codeset_Manager_i::TAO_Codeset_Manager_i (void)
 
   wchar_descriptor_.ncs(TAO_Codeset_Manager_i::default_wchar_codeset);
   wchar_descriptor_.add_translator (ACE_TEXT ("UTF16_BOM_Factory"));
-
-}
-
-TAO_Codeset_Manager_i::~TAO_Codeset_Manager_i (void)
-{
 }
 
 TAO_Codeset_Descriptor_Base *
-TAO_Codeset_Manager_i::char_codeset_descriptor (void)
+TAO_Codeset_Manager_i::char_codeset_descriptor ()
 {
   return &this->char_descriptor_;
 }
 
 TAO_Codeset_Descriptor_Base *
-TAO_Codeset_Manager_i::wchar_codeset_descriptor (void)
+TAO_Codeset_Manager_i::wchar_codeset_descriptor ()
 {
   return &this->wchar_descriptor_;
 }
@@ -194,8 +189,7 @@ TAO_Codeset_Manager_i::process_service_context (TAO_ServerRequest &request)
         TAOLIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT("TAO (%P|%t) - ")
                     ACE_TEXT("Codeset_Manager_i::process_service_context, ")
-                    ACE_TEXT("no codeset context in request, using defaults\n")
-                    ));
+                    ACE_TEXT("no codeset context in request, using defaults\n")));
       tcs_c = TAO_Codeset_Manager_i::default_char_codeset;
       tcs_w = TAO_Codeset_Manager_i::default_wchar_codeset;
     }
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h
index 1daa14d8fab..4a8bf88670a 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.h
+++ b/TAO/tao/Codeset/Codeset_Manager_i.h
@@ -56,7 +56,6 @@ class TAO_Codeset_Descriptor;
 class TAO_Codeset_Export TAO_Codeset_Manager_i :
   public TAO_Codeset_Manager
 {
-
 public:
   /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet
   /// No. 1
@@ -65,8 +64,8 @@ public:
   /// to provide a non-compliant default wchar codeset may do so.
   static CONV_FRAME::CodeSetId default_wchar_codeset;
 
-  TAO_Codeset_Manager_i (void);
-  ~TAO_Codeset_Manager_i (void);
+  TAO_Codeset_Manager_i ();
+  ~TAO_Codeset_Manager_i () = default;
 
   /// Called by an object of TAO_Acceptor to set NCS and CCS values
   /// for Char/Wchar in to the Object Reference.
@@ -91,8 +90,8 @@ public:
   /// codeset id matching the manager's native codeset id.
   void open(TAO_ORB_Core& core);
 
-  virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void);
-  virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void);
+  virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor ();
+  virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor ();
 
 private:
   // Compute the TCS for Char/WChar asper the CORBA Specification
diff --git a/TAO/tao/Codeset/Codeset_Service_Context_Handler.h b/TAO/tao/Codeset/Codeset_Service_Context_Handler.h
index 05d55d8d12b..9382fb70e26 100644
--- a/TAO/tao/Codeset/Codeset_Service_Context_Handler.h
+++ b/TAO/tao/Codeset/Codeset_Service_Context_Handler.h
@@ -27,15 +27,15 @@ class TAO_Codeset_Service_Context_Handler :
   public TAO_Service_Context_Handler
 {
 public:
-  virtual int process_service_context (TAO_Transport& transport,
-                                       const IOP::ServiceContext& context,
-                                       TAO_ServerRequest *request);
-  virtual int generate_service_context (
+  int process_service_context (TAO_Transport& transport,
+                               const IOP::ServiceContext& context,
+                               TAO_ServerRequest *request) override;
+  int generate_service_context (
     TAO_Stub* stub,
     TAO_Transport &transport,
     TAO_Operation_Details &opdetails,
     TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg);
+    TAO_OutputCDR &msg) override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
index 7a18e518a89..8f1c005055c 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
@@ -16,16 +16,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory ()
-{
-
-}
-
-TAO_Codeset_Translator_Factory::~TAO_Codeset_Translator_Factory ()
-{
-
-}
-
 int
 TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 {
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h
index 422d6bfe10f..6f4c513a141 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h
@@ -54,8 +54,8 @@ class TAO_Codeset_Export TAO_Codeset_Translator_Factory :
   public ACE_Service_Object
 {
 public:
-  TAO_Codeset_Translator_Factory ();
-  virtual ~TAO_Codeset_Translator_Factory ();
+  TAO_Codeset_Translator_Factory () = default;
+  virtual ~TAO_Codeset_Translator_Factory () = default;
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
 protected:
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
index 08768c5d497..62bd93a7821 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
@@ -20,12 +20,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class NCS_TO_TCS>
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::TAO_Codeset_Translator_Factory_T () :
-  translator_(0)
-{
-}
-
-template<class NCS_TO_TCS>
 TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::~TAO_Codeset_Translator_Factory_T ()
 {
   delete translator_;
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
index 3e470285c63..6819b1b7027 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
@@ -38,8 +38,7 @@ class TAO_Codeset_Translator_Factory_T
 : public TAO_Codeset_Translator_Factory
 {
 public:
-
-  TAO_Codeset_Translator_Factory_T ();
+  TAO_Codeset_Translator_Factory_T () = default;
   virtual ~TAO_Codeset_Translator_Factory_T ();
 
   /// initialize the factory service object. Instantiates the translator.
@@ -62,7 +61,7 @@ public:
   virtual void assign (TAO_OutputCDR *) const;
 
 private:
-  NCS_TO_TCS *translator_;
+  NCS_TO_TCS *translator_ {};
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
index e28f77b164f..207fc0ab467 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
@@ -27,12 +27,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory,
                        0)
 ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF16_BOM_Factory)
 
-TAO_UTF16_BOM_Factory::TAO_UTF16_BOM_Factory ()
-  : translator_ (0)
-  , forceBE_ (false)
-{
-}
-
 TAO_UTF16_BOM_Factory::~TAO_UTF16_BOM_Factory ()
 {
   delete this->translator_;
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h
index 3d9e6e550a9..56a711b3602 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h
@@ -27,7 +27,7 @@ class TAO_Codeset_Export TAO_UTF16_BOM_Factory
   : public  TAO_Codeset_Translator_Factory
 {
 public:
-  TAO_UTF16_BOM_Factory ();
+  TAO_UTF16_BOM_Factory () = default;
   virtual ~TAO_UTF16_BOM_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -52,9 +52,9 @@ private:
   int parse_one_arg (int argc, ACE_TCHAR *argv[]);
 
 private:
-  TAO_UTF16_BOM_Translator *translator_;
+  TAO_UTF16_BOM_Translator *translator_ {};
   /// Force big endian wchar, warray, & wstring
-  bool forceBE_;
+  bool forceBE_ {false};
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF16_BOM_Factory)
diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
index db3df08c895..4f47a615460 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
@@ -39,10 +39,6 @@ TAO_UTF16_BOM_Translator::TAO_UTF16_BOM_Translator (bool forceBE)
                ACE_TEXT("forceBE %d\n"), this->forceBE_ ? 1:0 ));
 }
 
-TAO_UTF16_BOM_Translator::~TAO_UTF16_BOM_Translator (void)
-{
-}
-
 // = Documented in $ACE_ROOT/ace/CDR_Stream.h
 ACE_CDR::Boolean
 TAO_UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x)
@@ -474,7 +470,6 @@ TAO_UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr,
       sb[i] = static_cast<ACE_UTF16_T> (x[i]);
     }
   return 1;
-
 }
 
 ACE_CDR::Boolean
diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h
index 19c3b8eb159..9bb00292032 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h
@@ -21,10 +21,6 @@
 #include "tao/Codeset/codeset_export.h"
 #include "tao/Versioned_Namespace.h"
 #include "ace/CDR_Stream.h"
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -45,7 +41,7 @@ public:
   TAO_UTF16_BOM_Translator (bool forceBE);
 
   /// Virtual destruction
-  virtual ~TAO_UTF16_BOM_Translator (void);
+  virtual ~TAO_UTF16_BOM_Translator () = default;
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
@@ -92,7 +88,6 @@ private:
 private:
   /// if this flag is true, force wchar's to big endian order
   bool forceBE_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
index 825790771c4..bc4070431a3 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
@@ -15,11 +15,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory,
 ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 
 
-TAO_UTF8_Latin1_Factory::TAO_UTF8_Latin1_Factory()
-  : translator_ (0)
-{
-}
-
 TAO_UTF8_Latin1_Factory::~TAO_UTF8_Latin1_Factory ()
 {
   delete this->translator_;
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
index 4ccd8ff75b8..a2a781f2ba1 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
@@ -15,7 +15,7 @@ class TAO_Codeset_Export TAO_UTF8_Latin1_Factory
   : public TAO_Codeset_Translator_Factory
 {
 public:
-  TAO_UTF8_Latin1_Factory ();
+  TAO_UTF8_Latin1_Factory () = default;
   virtual ~TAO_UTF8_Latin1_Factory ();
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -39,11 +39,9 @@ private:
   void create_translator () const;
 
 private:
-  TAO_UTF8_Latin1_Translator *translator_;
+  TAO_UTF8_Latin1_Translator *translator_ {};
 };
 
-
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
index 44f03eb740c..4ae488e3df1 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
@@ -15,21 +15,8 @@
 #include "tao/debug.h"
 #include "ace/OS_Memory.h"
 
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/////////////////////////////
-// UTF8_Latin1_Translator implementation
-
-TAO_UTF8_Latin1_Translator::TAO_UTF8_Latin1_Translator ()
-{
-}
-
-TAO_UTF8_Latin1_Translator::~TAO_UTF8_Latin1_Translator (void)
-{
-}
-
 // = Documented in $ACE_ROOT/ace/CDR_Stream.h
 ACE_CDR::Boolean
 TAO_UTF8_Latin1_Translator::read_char (ACE_InputCDR &cdr, ACE_CDR::Char &x)
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h
index 6bccd0bee8c..8198f6f8145 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h
@@ -46,10 +46,10 @@ class TAO_Codeset_Export TAO_UTF8_Latin1_Translator
 {
 public:
   /// constructor
-  TAO_UTF8_Latin1_Translator ();
+  TAO_UTF8_Latin1_Translator () = default;
 
   /// Virtual destruction
-  virtual ~TAO_UTF8_Latin1_Translator (void);
+  virtual ~TAO_UTF8_Latin1_Translator () = default;
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_char (ACE_InputCDR &,
@@ -73,12 +73,9 @@ public:
   virtual ACE_CDR::ULong tcs () {return 0x05010001U;}
 
 private:
-  ACE_CDR::ULong read_char_i (ACE_InputCDR &,
-                                ACE_CDR::Char &);
-
-  ACE_CDR::Boolean write_char_i (ACE_OutputCDR &,
-                                 ACE_CDR::Char);
+  ACE_CDR::ULong read_char_i (ACE_InputCDR &, ACE_CDR::Char &);
 
+  ACE_CDR::Boolean write_char_i (ACE_OutputCDR &, ACE_CDR::Char);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset_Descriptor_Base.h b/TAO/tao/Codeset_Descriptor_Base.h
index 7f26ec50c7f..4d2e4eda074 100644
--- a/TAO/tao/Codeset_Descriptor_Base.h
+++ b/TAO/tao/Codeset_Descriptor_Base.h
@@ -34,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_Codeset_Descriptor_Base
 {
 public:
-  virtual ~TAO_Codeset_Descriptor_Base (void);
+  virtual ~TAO_Codeset_Descriptor_Base ();
 
   virtual void ncs (const ACE_TCHAR *name) = 0;
   virtual void add_translator (const ACE_TCHAR *name) = 0;
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 318904620d3..afd2e1c61dd 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -4,13 +4,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager::~TAO_Codeset_Manager ()
-{
-}
-
 // Add the destructor for the codeset_descriptor_base here, because
 // it is only ever used in conjunction with the codeset manager.
-
 TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base ()
 {
 }
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index dc1f2cda99a..adf4e4d0720 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -58,11 +58,9 @@ class TAO_Codeset_Descriptor_Base;
  */
 class TAO_Export TAO_Codeset_Manager
 {
-
 public:
-
   /// Destructor.
-  virtual ~TAO_Codeset_Manager (void);
+  virtual ~TAO_Codeset_Manager () = default;
 
   /// Called by an object of TAO_Acceptor to set NCS and CCS values for
   /// Char/Wchar in to the Object Reference.
@@ -86,8 +84,8 @@ public:
 
   virtual void open (TAO_ORB_Core& core) = 0;
 
-  virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void) = 0;
-  virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void) = 0;
+  virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor () = 0;
+  virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor () = 0;
 
   virtual void get_ncs (CONV_FRAME::CodeSetId &ncsc,
                         CONV_FRAME::CodeSetId &ncsw) = 0;
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index 94aef786b28..f616c6bb4cf 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -5,10 +5,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base ()
-{
-}
-
 bool
 TAO_Codeset_Manager_Factory_Base::is_default () const
 {
@@ -19,7 +15,6 @@ TAO_Codeset_Manager *
 TAO_Codeset_Manager_Factory_Base::create ()
 {
   return nullptr;
-
 }
 
 int
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h
index 59c25927905..7a099960216 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.h
+++ b/TAO/tao/Codeset_Manager_Factory_Base.h
@@ -43,12 +43,12 @@ class TAO_Codeset_Manager;
 class TAO_Export TAO_Codeset_Manager_Factory_Base : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Codeset_Manager_Factory_Base ();
+  virtual ~TAO_Codeset_Manager_Factory_Base () = default;
 
   /// Create makes a new instance of the codeset manager for every
   /// call. This allows multiple ORBs to have their own (or none).
   /// This default implementation returns a null pointer only.
-  virtual TAO_Codeset_Manager *create(void);
+  virtual TAO_Codeset_Manager *create();
 
   /// Is_default is called by the ORB Core to determine if it needs
   /// to reload the factory with a dynamically linked libTAO_Codeset.
@@ -57,7 +57,7 @@ public:
   virtual bool is_default () const;
 
   /// Static initializer ensures the factory is loaded
-  static int initialize (void);
+  static int initialize ();
 };
 
 static int
diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp
index d5b69e09f35..7d059efcb6a 100644
--- a/TAO/tao/Codeset_Translator_Base.cpp
+++ b/TAO/tao/Codeset_Translator_Base.cpp
@@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base ()
 {
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp
index 92abdd8937d..bc2c1528d24 100644
--- a/TAO/tao/Compression/Base_Compressor.cpp
+++ b/TAO/tao/Compression/Base_Compressor.cpp
@@ -15,20 +15,20 @@ namespace TAO
   }
 
   ::Compression::CompressorFactory_ptr
-  BaseCompressor::compressor_factory (void)
+  BaseCompressor::compressor_factory ()
   {
     return ::Compression::CompressorFactory::_duplicate (
       compressor_factory_);
   }
 
   ::Compression::CompressionLevel
-  BaseCompressor::compression_level (void)
+  BaseCompressor::compression_level ()
   {
     return compression_level_;
   }
 
   ::CORBA::ULongLong
-  BaseCompressor::compressed_bytes (void)
+  BaseCompressor::compressed_bytes ()
   {
     ::CORBA::ULongLong return_value = 0;
     {
@@ -39,7 +39,7 @@ namespace TAO
   }
 
   ::CORBA::ULongLong
-  BaseCompressor::uncompressed_bytes (void)
+  BaseCompressor::uncompressed_bytes ()
   {
     ::CORBA::ULongLong return_value = 0;
     {
@@ -50,14 +50,13 @@ namespace TAO
   }
 
   ::Compression::CompressionRatio
-  BaseCompressor::compression_ratio (void)
+  BaseCompressor::compression_ratio ()
   {
     ::Compression::CompressionRatio return_value = 0;
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
       if (this->uncompressed_bytes_ > 0)
         {
-
           return_value =
             static_cast< ::Compression::CompressionRatio>
               ((::Compression::CompressionRatio) this->compressed_bytes_ / this->uncompressed_bytes_);
diff --git a/TAO/tao/Compression/Base_Compressor.h b/TAO/tao/Compression/Base_Compressor.h
index c2a00e9eaf3..9a5b1498f75 100644
--- a/TAO/tao/Compression/Base_Compressor.h
+++ b/TAO/tao/Compression/Base_Compressor.h
@@ -43,15 +43,15 @@ namespace TAO
     virtual void decompress (const ::Compression::Buffer &source,
                              ::Compression::Buffer &target) = 0;
 
-    virtual ::Compression::CompressorFactory_ptr compressor_factory (void);
+    virtual ::Compression::CompressorFactory_ptr compressor_factory ();
 
-    virtual ::Compression::CompressionLevel compression_level (void);
+    virtual ::Compression::CompressionLevel compression_level ();
 
-    virtual ::CORBA::ULongLong compressed_bytes (void);
+    virtual ::CORBA::ULongLong compressed_bytes ();
 
-    virtual ::CORBA::ULongLong uncompressed_bytes (void);
+    virtual ::CORBA::ULongLong uncompressed_bytes ();
 
-    virtual ::Compression::CompressionRatio compression_ratio (void);
+    virtual ::Compression::CompressionRatio compression_ratio ();
 
   protected:
     void update_stats (::CORBA::ULongLong uncompressed_bytes,
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
index 66a31fa1162..c53b6117471 100644
--- a/TAO/tao/Compression/Compression.cpp
+++ b/TAO/tao/Compression/Compression.cpp
@@ -16,7 +16,7 @@ TAO_Compression_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[])
 
 
 int
-TAO_Compression_Loader::Initializer (void)
+TAO_Compression_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (
     ace_svc_desc_TAO_Compression_Loader);
diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h
index 26f80c6b8ff..ceeeae0909d 100644
--- a/TAO/tao/Compression/Compression.h
+++ b/TAO/tao/Compression/Compression.h
@@ -40,7 +40,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
index 7fb3e396249..e28f98bc21a 100644
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ b/TAO/tao/Compression/Compression_Manager.cpp
@@ -107,7 +107,7 @@ namespace TAO
   }
 
   ::Compression::CompressorFactorySeq *
-  CompressionManager::get_factories (void)
+  CompressionManager::get_factories ()
   {
     // todo
     return 0;
diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h
index 7c5a7e8cc3d..b0728f0e2d5 100644
--- a/TAO/tao/Compression/Compression_Manager.h
+++ b/TAO/tao/Compression/Compression_Manager.h
@@ -46,7 +46,7 @@ namespace TAO
       (::Compression::CompressorId compressor_id,
        ::Compression::CompressionLevel compression_level);
 
-    virtual ::Compression::CompressorFactorySeq *get_factories (void);
+    virtual ::Compression::CompressorFactorySeq *get_factories ();
 
   private:
     TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
index dfbb8166fc2..e7eadb5d0ca 100644
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ b/TAO/tao/Compression/Compressor_Factory.cpp
@@ -11,7 +11,7 @@ namespace TAO
   }
 
   ::Compression::CompressorId
-  CompressorFactory::compressor_id (void)
+  CompressorFactory::compressor_id ()
   {
     return compressor_id_;
   }
diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h
index 7204ce20366..e545cc34ec0 100644
--- a/TAO/tao/Compression/Compressor_Factory.h
+++ b/TAO/tao/Compression/Compressor_Factory.h
@@ -33,7 +33,7 @@ namespace TAO
   public:
     CompressorFactory (::Compression::CompressorId compressor_id);
 
-    virtual ::Compression::CompressorId compressor_id (void);
+    virtual ::Compression::CompressorId compressor_id ();
 
     virtual ::Compression::Compressor_ptr get_compressor
       (::Compression::CompressionLevel compression_level) = 0;
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
index 34a1947c942..7f5cc30d6b1 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
@@ -5,8 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
-Bzip2_CompressorFactory::Bzip2_CompressorFactory (void) :
+Bzip2_CompressorFactory::Bzip2_CompressorFactory () :
   ::TAO::CompressorFactory (::Compression::COMPRESSORID_BZIP2),
   compressor_ (::Compression::Compressor::_nil ())
 {
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h
index ef7b5176b11..49071b33075 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
       public ::TAO::CompressorFactory
     {
       public:
-        Bzip2_CompressorFactory (void);
+        Bzip2_CompressorFactory ();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level);
diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
index ca73864c783..5acf3010b2d 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
+++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
@@ -6,8 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
-Lzo_CompressorFactory::Lzo_CompressorFactory (void) :
+Lzo_CompressorFactory::Lzo_CompressorFactory () :
   ::TAO::CompressorFactory (::Compression::COMPRESSORID_LZO),
   compressor_ (::Compression::Compressor::_nil ())
 {
diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.h b/TAO/tao/Compression/lzo/LzoCompressor_Factory.h
index aa1e4fbeb46..ebb3db51930 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.h
+++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
       public ::TAO::CompressorFactory
     {
       public:
-        Lzo_CompressorFactory (void);
+        Lzo_CompressorFactory ();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level);
diff --git a/TAO/tao/Compression/rle/RLECompressor.cpp b/TAO/tao/Compression/rle/RLECompressor.cpp
index 81ad5367df7..b15368c778e 100644
--- a/TAO/tao/Compression/rle/RLECompressor.cpp
+++ b/TAO/tao/Compression/rle/RLECompressor.cpp
@@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 RLECompressor::RLECompressor(::Compression::CompressorFactory_ptr compressor_factory)
     : BaseCompressor (compressor_factory, 0)
 {
diff --git a/TAO/tao/Compression/rle/RLECompressor.h b/TAO/tao/Compression/rle/RLECompressor.h
index 741f8f5810c..948b744a405 100644
--- a/TAO/tao/Compression/rle/RLECompressor.h
+++ b/TAO/tao/Compression/rle/RLECompressor.h
@@ -29,7 +29,6 @@ namespace TAO
     class TAO_RLECOMPRESSOR_Export RLECompressor : public ::TAO::BaseCompressor
     {
     public:
-
         RLECompressor(::Compression::CompressorFactory_ptr);
 
         virtual void compress (
diff --git a/TAO/tao/Compression/rle/RLECompressor_Factory.cpp b/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
index bc07307d25c..ddfb3c13ec8 100644
--- a/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
+++ b/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-RLE_CompressorFactory::RLE_CompressorFactory(void)
+RLE_CompressorFactory::RLE_CompressorFactory()
     : ::TAO::CompressorFactory(Compression::COMPRESSORID_RLE)
     , compressor_(::Compression::Compressor::_nil())
 {
diff --git a/TAO/tao/Compression/rle/RLECompressor_Factory.h b/TAO/tao/Compression/rle/RLECompressor_Factory.h
index e4b144388f7..f9bf39ff003 100644
--- a/TAO/tao/Compression/rle/RLECompressor_Factory.h
+++ b/TAO/tao/Compression/rle/RLECompressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
         public ::TAO::CompressorFactory
     {
     public:
-        RLE_CompressorFactory(void);
+        RLE_CompressorFactory();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel = 0);
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index 213f37cb44e..41857b7799c 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -7,8 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
-Zlib_CompressorFactory::Zlib_CompressorFactory (void) :
+Zlib_CompressorFactory::Zlib_CompressorFactory () :
   ::TAO::CompressorFactory (::Compression::COMPRESSORID_ZLIB)
 {
 }
@@ -39,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/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
index 1cdd468357b..2ae221ecba2 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h
@@ -34,7 +34,7 @@ namespace TAO
         const ::Compression::Compressor_var> ZlibCompressorMap;
 
   public:
-    Zlib_CompressorFactory (void);
+    Zlib_CompressorFactory ();
 
     virtual ::Compression::Compressor_ptr get_compressor (
         ::Compression::CompressionLevel compression_level);
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
index 04fe4aa0fa4..7a77ef1f4cc 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -21,7 +21,7 @@ TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m)
 }
 
 template <class MUTEX>
-TAO_Condition<MUTEX>::TAO_Condition (void)
+TAO_Condition<MUTEX>::TAO_Condition ()
     : mutex_ (nullptr),
       delete_lock_ (false),
       cond_ (nullptr)
@@ -39,7 +39,7 @@ TAO_Condition<MUTEX>::TAO_Condition (void)
 
 
 template <class MUTEX>
-TAO_Condition<MUTEX>::~TAO_Condition (void)
+TAO_Condition<MUTEX>::~TAO_Condition ()
 {
   if (this->remove () == -1)
     TAOLIB_ERROR ((LM_ERROR,
diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl
index c51494ec098..dc169d494f8 100644
--- a/TAO/tao/Condition.inl
+++ b/TAO/tao/Condition.inl
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::wait (void)
+TAO_Condition<MUTEX>::wait ()
 {
   return this->cond_->wait ();
 }
@@ -27,25 +27,25 @@ TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime)
 }
 
 template<class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::remove (void)
+TAO_Condition<MUTEX>::remove ()
 {
   return this->cond_->remove ();
 }
 
 template<class MUTEX> ACE_INLINE MUTEX *
-TAO_Condition<MUTEX>::mutex (void)
+TAO_Condition<MUTEX>::mutex ()
 {
   return this->mutex_;
 }
 
 template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::signal (void)
+TAO_Condition<MUTEX>::signal ()
 {
   return this->cond_->signal ();
 }
 
 template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::broadcast (void)
+TAO_Condition<MUTEX>::broadcast ()
 {
   return this->cond_->broadcast ();
 }
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 80dc152804b..ecc2a877c11 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -47,15 +47,14 @@ class TAO_Transport;
 class TAO_Export TAO_Connection_Handler : public TAO_LF_CH_Event
 {
 public:
-
   /// Constructor
   explicit TAO_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor
-  virtual ~TAO_Connection_Handler (void);
+  virtual ~TAO_Connection_Handler ();
 
   /// Return the underlying transport object
-  TAO_Transport *transport (void);
+  TAO_Transport *transport ();
 
   /// Set the underlying transport object
   void transport (TAO_Transport* transport);
@@ -81,7 +80,7 @@ public:
    * @return Return 0 if the connection was already closed, non-zero
    * otherwise.
    */
-  virtual int close_connection (void) = 0;
+  virtual int close_connection () = 0;
 
   /// The event handler calls, here so that other objects who hold a
   /// reference to this object can call the event handler methods.
@@ -89,7 +88,7 @@ public:
 
   /// This method is invoked from the svc () method of the Svc_Handler
   /// Object.
-  int svc_i (void);
+  int svc_i ();
 
   /// A open () hook
   /**
@@ -108,11 +107,11 @@ public:
   /// the connection handler to know that it is opening as a result of
   /// a delayed asynch connection rather than an immediate synch
   /// connection, which has no additional reference needs.
-  void connection_pending (void);
+  void connection_pending ();
 
   /// A pending connection may be canceled due to an error detected
   /// while the initiating thread is still in the Connector.
-  void cancel_pending_connection (void);
+  void cancel_pending_connection ();
 
   /// Set the Diff-Serv codepoint on outgoing packets.  Only has
   /// effect for remote protocols (e.g., IIOP); no effect for local
@@ -122,18 +121,18 @@ public:
   virtual int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
   /// Release the OS resources related to this handler.
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
 
 protected:
   /// Return our TAO_ORB_Core pointer
-  TAO_ORB_Core *orb_core (void);
+  TAO_ORB_Core *orb_core ();
 
   /// A common function called at the start of any protocol-specific
   /// open. Returns -1 on a failure (although no failure mode is
   /// currently defined).
-  int shared_open (void);
+  int shared_open ();
 
   /// Set options on the socket
   int set_socket_option (ACE_SOCK &sock, int snd_size, int rcv_size);
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index dcdf2eb1e5d..a001bdf90f0 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -5,13 +5,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_ORB_Core *
-TAO_Connection_Handler::orb_core (void)
+TAO_Connection_Handler::orb_core ()
 {
   return this->orb_core_;
 }
 
 ACE_INLINE TAO_Transport *
-TAO_Connection_Handler::transport (void)
+TAO_Connection_Handler::transport ()
 {
   return this->transport_;
 }
@@ -42,7 +42,7 @@ TAO_Connection_Handler::is_connecting () const
 }
 
 ACE_INLINE void
-TAO_Connection_Handler::connection_pending (void)
+TAO_Connection_Handler::connection_pending ()
 {
   if (!this->connection_pending_)
     {
@@ -52,7 +52,7 @@ TAO_Connection_Handler::connection_pending (void)
 }
 
 ACE_INLINE void
-TAO_Connection_Handler::cancel_pending_connection (void)
+TAO_Connection_Handler::cancel_pending_connection ()
 {
   if (this->connection_pending_)
     {
diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp
index c44c9a988ab..bb07f837513 100644
--- a/TAO/tao/Connector_Impl.cpp
+++ b/TAO/tao/Connector_Impl.cpp
@@ -18,7 +18,6 @@ TAO_Connect_Creation_Strategy<SVC_HANDLER>::
     : ACE_Creation_Strategy <SVC_HANDLER> (t, orb_core->reactor ()),
       orb_core_ (orb_core)
 {
-
 }
 
 template <class SVC_HANDLER> int
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index e220cb83212..42ca96486ec 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -58,7 +58,6 @@ private:
 };
 
 
-
 /**
  * @class TAO_Connect_Concurrency_Strategy
  *
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index e460006dc2b..3c947763ea1 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -52,14 +52,14 @@ class TAO_Export TAO_Default_Endpoint_Selector_Factory
 {
 public:
   /// Constructor.
-  TAO_Default_Endpoint_Selector_Factory (void);
+  TAO_Default_Endpoint_Selector_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Default_Endpoint_Selector_Factory (void);
+  virtual ~TAO_Default_Endpoint_Selector_Factory ();
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
   // Prevent copying/assignment.
@@ -70,7 +70,6 @@ protected:
   /// The possible endpoint selector strategies that can be
   /// returned by this factory
   TAO_Default_Endpoint_Selector * const default_endpoint_selector_;
-
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory)
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 5df53e6209e..abdf8a259e2 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -35,34 +35,32 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager
   : public TAO_Thread_Lane_Resources_Manager
 {
 public:
-
   /// Constructor.
   TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_Default_Thread_Lane_Resources_Manager (void);
+  ~TAO_Default_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Open default resources.
-  int open_default_resources (void);
+  int open_default_resources ();
 
   /// Shutdown reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Cleanup transports.
-  virtual void close_all_transports (void);
+  virtual void close_all_transports ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
   // @{
+  TAO_Thread_Lane_Resources &lane_resources ();
 
-  TAO_Thread_Lane_Resources &lane_resources (void);
-
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
+  TAO_Thread_Lane_Resources &default_lane_resources ();
 
   // @}
 
@@ -73,7 +71,6 @@ private:
 protected:
   /// Default lane resources.
   TAO_Thread_Lane_Resources * const lane_resources_;
-
 };
 
 /**
@@ -88,13 +85,11 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory
   : public TAO_Thread_Lane_Resources_Manager_Factory
 {
 public:
-
   /// Destructor.
-  virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory (void);
+  virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory ();
 
   /// Factory method.
   TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
-
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 9f2f0ba9315..20760ca02f4 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (void)
+TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , TAO::NetworkPriorityPolicy ()
@@ -58,7 +58,7 @@ TAO_Client_Network_Priority_Policy::create (const CORBA::Any &)
 }
 
 CORBA::PolicyType
-TAO_Client_Network_Priority_Policy::policy_type (void)
+TAO_Client_Network_Priority_Policy::policy_type ()
 {
   return TAO::CLIENT_NETWORK_PRIORITY_TYPE;
 }
@@ -74,7 +74,7 @@ TAO_Client_Network_Priority_Policy::clone () const
 }
 
 TAO::DiffservCodepoint
-TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (void)
+TAO_Client_Network_Priority_Policy::request_diffserv_codepoint ()
 {
   return this->request_diffserv_codepoint_;
 }
@@ -87,7 +87,7 @@ TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (
 }
 
 TAO::DiffservCodepoint
-TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (void)
+TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint ()
 {
   return this->reply_diffserv_codepoint_;
 }
@@ -100,7 +100,7 @@ TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (
 }
 
 TAO::NetworkPriorityModel
-TAO_Client_Network_Priority_Policy::network_priority_model (void)
+TAO_Client_Network_Priority_Policy::network_priority_model ()
 {
   return this->network_priority_model_;
 }
@@ -113,7 +113,7 @@ TAO_Client_Network_Priority_Policy::network_priority_model (
 }
 
 CORBA::Policy_ptr
-TAO_Client_Network_Priority_Policy::copy (void)
+TAO_Client_Network_Priority_Policy::copy ()
 {
   TAO_Client_Network_Priority_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -124,7 +124,7 @@ TAO_Client_Network_Priority_Policy::copy (void)
 }
 
 void
-TAO_Client_Network_Priority_Policy::destroy (void)
+TAO_Client_Network_Priority_Policy::destroy ()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
index 93b933ed808..876a84a93bd 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
@@ -45,7 +45,7 @@ class TAO_DiffServPolicy_Export TAO_Client_Network_Priority_Policy
 {
 public:
   /// Constructor.
-  TAO_Client_Network_Priority_Policy (void);
+  TAO_Client_Network_Priority_Policy ();
 
   /// Constructor.
   TAO_Client_Network_Priority_Policy (
@@ -60,25 +60,25 @@ public:
   /// Returns a copy of <this>.
   TAO_Client_Network_Priority_Policy *clone () const;
 
-  TAO::DiffservCodepoint request_diffserv_codepoint (void);
+  TAO::DiffservCodepoint request_diffserv_codepoint ();
 
   void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp);
 
-  TAO::DiffservCodepoint reply_diffserv_codepoint (void);
+  TAO::DiffservCodepoint reply_diffserv_codepoint ();
 
   void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp);
 
-  TAO::NetworkPriorityModel network_priority_model (void);
+  TAO::NetworkPriorityModel network_priority_model ();
 
   void network_priority_model (TAO::NetworkPriorityModel npm);
 
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
index 647f0dbfdef..d669b6ee3ed 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
@@ -9,7 +9,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_DiffServPolicy_Initializer::static_init (void)
+TAO_DiffServPolicy_Initializer::static_init ()
 {
   TAO_ORB_Core::set_network_priority_protocols_hooks (
     "DS_Network_Priority_Protocols_Hooks");
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.h b/TAO/tao/DiffServPolicy/DiffServPolicy.h
index 1f88da59fef..d052c23a5b7 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.h
@@ -31,7 +31,7 @@ class TAO_DiffServPolicy_Export TAO_DiffServPolicy_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int static_init (void);
+  static int static_init ();
 
   /// Initialize the Diffserv loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
@@ -42,7 +42,6 @@ TAO_Requires_DiffServPolicy_Initializer =
   TAO_DiffServPolicy_Initializer::static_init ();
 
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer)
 ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer)
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
index f195cd99ee2..10949423533 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
@@ -40,7 +40,6 @@ class TAO_DiffServPolicy_Export TAO_DiffServ_PolicyFactory
     public virtual ::CORBA::LocalObject
 {
 public:
-
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value);
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
index 654df95ab73..442e933b3af 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_DiffServ_Network_Priority_Hook::~TAO_DiffServ_Network_Priority_Hook(void)
+TAO_DiffServ_Network_Priority_Hook::~TAO_DiffServ_Network_Priority_Hook()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
index af0b1529007..dee47f35e35 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
@@ -29,7 +29,7 @@ class TAO_DiffServPolicy_Export TAO_DiffServ_Network_Priority_Hook
   : public TAO_Network_Priority_Hook
 {
 public:
-  virtual ~TAO_DiffServ_Network_Priority_Hook(void);
+  virtual ~TAO_DiffServ_Network_Priority_Hook();
 
   /// This function is a hook, that is called from the Root_POA's
   /// constructor. It allows the POA to cache the server side network
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
index 93ac25c2918..dd1c2462632 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
@@ -12,14 +12,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DS_Network_Priority_Protocols_Hooks::
-TAO_DS_Network_Priority_Protocols_Hooks (void)
+TAO_DS_Network_Priority_Protocols_Hooks ()
   : orb_core_ (0)
 {
 }
 
 
 TAO_DS_Network_Priority_Protocols_Hooks::
-~TAO_DS_Network_Priority_Protocols_Hooks (void)
+~TAO_DS_Network_Priority_Protocols_Hooks ()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
index 740e9ef2c29..363c7334dbb 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
@@ -30,12 +30,11 @@ class TAO_DiffServPolicy_Export TAO_DS_Network_Priority_Protocols_Hooks
       : public TAO_Network_Priority_Protocols_Hooks
 {
 public:
-
   /// Constructor
-  TAO_DS_Network_Priority_Protocols_Hooks (void);
+  TAO_DS_Network_Priority_Protocols_Hooks ();
 
   /// Destructor
-  virtual ~TAO_DS_Network_Priority_Protocols_Hooks (void);
+  virtual ~TAO_DS_Network_Priority_Protocols_Hooks ();
 
   /// Initialize the network priority protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index 4e156ca184a..1a67c368d19 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
+TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , TAO::NetworkPriorityPolicy ()
@@ -16,7 +16,7 @@ TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
 {
 }
 
-TAO_Server_Network_Priority_Policy::~TAO_Server_Network_Priority_Policy (void)
+TAO_Server_Network_Priority_Policy::~TAO_Server_Network_Priority_Policy ()
 {
 }
 
@@ -59,7 +59,7 @@ TAO_Server_Network_Priority_Policy::create (const CORBA::Any &)
 }
 
 CORBA::PolicyType
-TAO_Server_Network_Priority_Policy::policy_type (void)
+TAO_Server_Network_Priority_Policy::policy_type ()
 {
   return TAO::NETWORK_PRIORITY_TYPE;
 }
@@ -75,7 +75,7 @@ TAO_Server_Network_Priority_Policy::clone () const
 }
 
 TAO::DiffservCodepoint
-TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (void)
+TAO_Server_Network_Priority_Policy::request_diffserv_codepoint ()
 {
   return this->request_diffserv_codepoint_;
 }
@@ -88,7 +88,7 @@ TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (
 }
 
 TAO::DiffservCodepoint
-TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (void)
+TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint ()
 {
   return this->reply_diffserv_codepoint_;
 }
@@ -101,7 +101,7 @@ TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (
 }
 
 TAO::NetworkPriorityModel
-TAO_Server_Network_Priority_Policy::network_priority_model (void)
+TAO_Server_Network_Priority_Policy::network_priority_model ()
 {
   return this->network_priority_model_;
 }
@@ -114,7 +114,7 @@ TAO_Server_Network_Priority_Policy::network_priority_model (
 }
 
 CORBA::Policy_ptr
-TAO_Server_Network_Priority_Policy::copy (void)
+TAO_Server_Network_Priority_Policy::copy ()
 {
   TAO_Server_Network_Priority_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -125,7 +125,7 @@ TAO_Server_Network_Priority_Policy::copy (void)
 }
 
 void
-TAO_Server_Network_Priority_Policy::destroy (void)
+TAO_Server_Network_Priority_Policy::destroy ()
 {
 }
 
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
index fd8eb16f60a..ed3d7fad55a 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -44,9 +44,8 @@ class TAO_DiffServPolicy_Export TAO_Server_Network_Priority_Policy
     public ::CORBA::LocalObject
 {
 public:
-
   /// default constructor.
-  TAO_Server_Network_Priority_Policy (void);
+  TAO_Server_Network_Priority_Policy ();
 
   /// Constructor.
   TAO_Server_Network_Priority_Policy (
@@ -61,25 +60,25 @@ public:
   /// Returns a copy of <this>.
   TAO_Server_Network_Priority_Policy *clone () const;
 
-  TAO::DiffservCodepoint request_diffserv_codepoint (void);
+  TAO::DiffservCodepoint request_diffserv_codepoint ();
 
   void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp);
 
-  TAO::DiffservCodepoint reply_diffserv_codepoint (void);
+  TAO::DiffservCodepoint reply_diffserv_codepoint ();
 
   void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp);
 
-  TAO::NetworkPriorityModel network_priority_model (void);
+  TAO::NetworkPriorityModel network_priority_model ();
 
   void network_priority_model (TAO::NetworkPriorityModel npm);
 
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -94,7 +93,7 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-  virtual ~TAO_Server_Network_Priority_Policy (void);
+  virtual ~TAO_Server_Network_Priority_Policy ();
 
 private:
   /// The attributes
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 3506b030283..270b617167b 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -71,7 +71,7 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc)
           // Otherwise fall through.
           break;
         }
-      // fallthrough
+      ACE_FALLTHROUGH;
     default:
       throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
   }
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index 4b522011808..cfa81bd3bea 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -66,7 +66,6 @@ TAO_DynValueBox_i::init (CORBA::TypeCode_ptr tc)
 
   this->init_common ();
   this->set_to_null ();
-
 }
 
 void
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 55026b9f5a8..d192e327e5d 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -36,7 +36,7 @@ TAO_AMH_DSI_Exception_Holder::~TAO_AMH_DSI_Exception_Holder ()
 }
 
 ::CORBA::ValueBase *
-TAO_AMH_DSI_Exception_Holder::_copy_value (void)
+TAO_AMH_DSI_Exception_Holder::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
@@ -62,7 +62,7 @@ tao_TAO_AMH_DSI_Exception_Holder_remove_ref (TAO_AMH_DSI_Exception_Holder * p)
 }
 
 
-TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (void)
+TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var ()
   : ptr_ (0)
 {
 }
@@ -92,7 +92,7 @@ TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var (
   this->ptr_ = p.ptr ();
 }
 
-TAO_AMH_DSI_Exception_Holder_var::~TAO_AMH_DSI_Exception_Holder_var (void)
+TAO_AMH_DSI_Exception_Holder_var::~TAO_AMH_DSI_Exception_Holder_var ()
 {
   CORBA::remove_ref (this->ptr_);
 }
@@ -143,13 +143,13 @@ TAO_AMH_DSI_Exception_Holder_var::in () const
 }
 
 TAO_AMH_DSI_Exception_Holder *&
-TAO_AMH_DSI_Exception_Holder_var::inout (void)
+TAO_AMH_DSI_Exception_Holder_var::inout ()
 {
   return this->ptr_;
 }
 
 TAO_AMH_DSI_Exception_Holder *&
-TAO_AMH_DSI_Exception_Holder_var::out (void)
+TAO_AMH_DSI_Exception_Holder_var::out ()
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
@@ -157,7 +157,7 @@ TAO_AMH_DSI_Exception_Holder_var::out (void)
 }
 
 TAO_AMH_DSI_Exception_Holder *
-TAO_AMH_DSI_Exception_Holder_var::_retn (void)
+TAO_AMH_DSI_Exception_Holder_var::_retn ()
 {
   // yield ownership of managed obj reference
   TAO_AMH_DSI_Exception_Holder* tmp = this->ptr_;
@@ -229,13 +229,13 @@ TAO_AMH_DSI_Exception_Holder_out::operator TAO_AMH_DSI_Exception_Holder*& ()
 }
 
 TAO_AMH_DSI_Exception_Holder *&
-TAO_AMH_DSI_Exception_Holder_out::ptr (void) // ptr
+TAO_AMH_DSI_Exception_Holder_out::ptr () // ptr
 {
   return this->ptr_;
 }
 
 TAO_AMH_DSI_Exception_Holder *
-TAO_AMH_DSI_Exception_Holder_out::operator-> (void)
+TAO_AMH_DSI_Exception_Holder_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -319,7 +319,7 @@ TAO_AMH_DSI_Response_Handler::TAO_AMH_DSI_Response_Handler (
 {
 }
 
-TAO_AMH_DSI_Response_Handler::~TAO_AMH_DSI_Response_Handler (void)
+TAO_AMH_DSI_Response_Handler::~TAO_AMH_DSI_Response_Handler ()
 {
 }
 
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
index c6b9d09b047..90a63d9de15 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
@@ -39,11 +39,11 @@ typedef TAO_AMH_DSI_Response_Handler *TAO_AMH_DSI_Response_Handler_ptr;
 class TAO_DynamicInterface_Export TAO_AMH_DSI_Response_Handler_var
 {
 public:
-  TAO_AMH_DSI_Response_Handler_var (void);
+  TAO_AMH_DSI_Response_Handler_var ();
   TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_Response_Handler_ptr);
   TAO_AMH_DSI_Response_Handler_var (
       const TAO_AMH_DSI_Response_Handler_var &);
-  ~TAO_AMH_DSI_Response_Handler_var (void);
+  ~TAO_AMH_DSI_Response_Handler_var ();
 
   TAO_AMH_DSI_Response_Handler_var &operator= (
       TAO_AMH_DSI_Response_Handler_ptr);
@@ -55,9 +55,9 @@ public:
   operator TAO_AMH_DSI_Response_Handler_ptr &();
 
   TAO_AMH_DSI_Response_Handler_ptr in () const;
-  TAO_AMH_DSI_Response_Handler_ptr &inout (void);
-  TAO_AMH_DSI_Response_Handler_ptr &out (void);
-  TAO_AMH_DSI_Response_Handler_ptr _retn (void);
+  TAO_AMH_DSI_Response_Handler_ptr &inout ();
+  TAO_AMH_DSI_Response_Handler_ptr &out ();
+  TAO_AMH_DSI_Response_Handler_ptr _retn ();
   TAO_AMH_DSI_Response_Handler_ptr ptr () const;
 
 private:
@@ -77,11 +77,11 @@ typedef TAO_AMH_DSI_Exception_Holder *TAO_AMH_DSI_Exception_Holder_ptr;
 class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder_var
 {
 public:
-  TAO_AMH_DSI_Exception_Holder_var (void);
+  TAO_AMH_DSI_Exception_Holder_var ();
   TAO_AMH_DSI_Exception_Holder_var (TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var (const TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var (const TAO_AMH_DSI_Exception_Holder_var &);
-  ~TAO_AMH_DSI_Exception_Holder_var (void);
+  ~TAO_AMH_DSI_Exception_Holder_var ();
 
   TAO_AMH_DSI_Exception_Holder_var &operator= (TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var &operator= (
@@ -92,9 +92,9 @@ public:
   operator TAO_AMH_DSI_Exception_Holder*& ();
 
   TAO_AMH_DSI_Exception_Holder* in () const;
-  TAO_AMH_DSI_Exception_Holder*& inout (void);
-  TAO_AMH_DSI_Exception_Holder*& out (void);
-  TAO_AMH_DSI_Exception_Holder* _retn (void);
+  TAO_AMH_DSI_Exception_Holder*& inout ();
+  TAO_AMH_DSI_Exception_Holder*& out ();
+  TAO_AMH_DSI_Exception_Holder* _retn ();
   TAO_AMH_DSI_Exception_Holder* ptr () const;
 
   // Hooks used by template sequence and valuetype manager classes
@@ -124,8 +124,8 @@ public:
   TAO_AMH_DSI_Exception_Holder_out &operator= (
       TAO_AMH_DSI_Exception_Holder*);
   operator TAO_AMH_DSI_Exception_Holder*& ();
-  TAO_AMH_DSI_Exception_Holder*& ptr (void);
-  TAO_AMH_DSI_Exception_Holder* operator-> (void);
+  TAO_AMH_DSI_Exception_Holder*& ptr ();
+  TAO_AMH_DSI_Exception_Holder* operator-> ();
 
 private:
   TAO_AMH_DSI_Exception_Holder* &ptr_;
@@ -144,15 +144,15 @@ public:
   typedef TAO_AMH_DSI_Exception_Holder_var _var_type;
   TAO_AMH_DSI_Exception_Holder (CORBA::Exception *ex);
 
-  virtual ~TAO_AMH_DSI_Exception_Holder (void);
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ~TAO_AMH_DSI_Exception_Holder ();
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   static TAO_AMH_DSI_Exception_Holder* _downcast ( CORBA::ValueBase* );
 
   static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &,
                                          TAO_AMH_DSI_Exception_Holder *& );
   virtual const char* _tao_obv_repository_id () const;
-  static const char* _tao_obv_static_repository_id (void);
+  static const char* _tao_obv_static_repository_id ();
 
   static void _tao_any_destructor (void *);
 
@@ -163,7 +163,7 @@ public:
   CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
 
 protected:
-  TAO_AMH_DSI_Exception_Holder (void);
+  TAO_AMH_DSI_Exception_Holder ();
   ///  *** Terrible Hack ? ***
   virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
   virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
@@ -208,7 +208,7 @@ public:
   typedef TAO_AMH_DSI_Response_Handler_var _var_type;
 
   TAO_AMH_DSI_Response_Handler (TAO_ServerRequest &sr);
-  ~TAO_AMH_DSI_Response_Handler (void);
+  ~TAO_AMH_DSI_Response_Handler ();
 
   virtual void invoke_reply (CORBA::NVList_ptr args,
                              CORBA::NamedValue_ptr result);
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
index 3562b7c9a19..5e900a10bd7 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
@@ -27,7 +27,7 @@ TAO_AMH_DSI_Response_Handler::_duplicate (TAO_AMH_DSI_Response_Handler_ptr x)
 
 // Inline operations for class TAO_AMH_DSI_Response_Handler_var
 ACE_INLINE
-TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (void)
+TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var ()
   : ptr_ (TAO_AMH_DSI_Response_Handler::_nil ())
 {
 }
@@ -38,7 +38,7 @@ TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_
 {}
 
 ACE_INLINE
-TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var (void)
+TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var ()
 {
   CORBA::release(ptr_);
 }
@@ -98,13 +98,13 @@ TAO_AMH_DSI_Response_Handler_var::in () const
 }
 
 ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr &
-TAO_AMH_DSI_Response_Handler_var::inout (void)
+TAO_AMH_DSI_Response_Handler_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr &
-TAO_AMH_DSI_Response_Handler_var::out (void)
+TAO_AMH_DSI_Response_Handler_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = TAO_AMH_DSI_Response_Handler::_nil ();
@@ -112,7 +112,7 @@ TAO_AMH_DSI_Response_Handler_var::out (void)
 }
 
 ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr
-TAO_AMH_DSI_Response_Handler_var::_retn (void)
+TAO_AMH_DSI_Response_Handler_var::_retn ()
 {
   // yield ownership
   TAO_AMH_DSI_Response_Handler_ptr val = this->ptr_;
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index d4ac999a9d8..9a2aa9888c7 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -83,7 +83,7 @@ CORBA::ContextList::ContextList (CORBA::ULong len, char* *ctx_list)
     }
 }
 
-CORBA::ContextList::~ContextList (void)
+CORBA::ContextList::~ContextList ()
 {
   for (CORBA::ULong i = 0; i < this->count (); ++i)
     {
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 3bbc17f3bef..11ed45d34b0 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -129,19 +129,19 @@ namespace CORBA
     ContextList (CORBA::ULong len, char **ctx_list);
 
     /// Destructor.
-    ~ContextList (void);
+    ~ContextList ();
 
     /// Return the number of elements.
-    CORBA::ULong count (void);
+    CORBA::ULong count ();
 
     /// Increment the reference count.
-    ContextList_ptr _duplicate (void);
+    ContextList_ptr _duplicate ();
 
     /// Increment the reference count.
     static ContextList_ptr _duplicate (ContextList *);
 
     /// Decrement the reference count and delete if it is 0.
-    void _destroy (void);
+    void _destroy ();
 
     /// Return null pointer of this type.
     static ContextList_ptr _nil ();
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index f8aaa486cc0..3b84a8dd3bc 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -137,7 +137,7 @@ TAO_DII_Arguments_Converter_Impl::handle_corba_exception (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_DII_Arguments_Converter_Impl::Initializer (void)
+TAO_DII_Arguments_Converter_Impl::Initializer ()
 {
   return ACE_Service_Config::process_directive (
     ace_svc_desc_TAO_DII_Arguments_Converter_Impl);
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
index d094f14b454..8031c022a0a 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
@@ -57,7 +57,7 @@ public:
                                        CORBA::Exception *exception);
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 65632313631..120a81d8b91 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -43,7 +43,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
   Dynamic::ParameterList *
-  DII_Invocation::arguments (void)
+  DII_Invocation::arguments ()
   {
     Dynamic::ParameterList_var safe_parameter_list;
 
@@ -162,7 +162,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
   //@NOTE: Need to figure a way to share this code
   Dynamic::ParameterList *
-  DII_Deferred_Invocation::arguments (void)
+  DII_Deferred_Invocation::arguments ()
   {
     Dynamic::ParameterList_var safe_parameter_list;
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 218dae68668..642cef4f301 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -43,7 +43,7 @@ namespace TAO
   {
   }
 
-  DII_Invocation_Adapter::~DII_Invocation_Adapter (void)
+  DII_Invocation_Adapter::~DII_Invocation_Adapter ()
   {
     delete[] ex_data_;
   }
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 10dd960187b..c84438c6a55 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -85,7 +85,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
 }
 
 void
-TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
+TAO_DII_Deferred_Reply_Dispatcher::connection_closed ()
 {
   try
     {
@@ -133,7 +133,7 @@ TAO_DII_Asynch_Reply_Dispatcher::TAO_DII_Asynch_Reply_Dispatcher (
 {
 }
 
-TAO_DII_Asynch_Reply_Dispatcher::~TAO_DII_Asynch_Reply_Dispatcher (void)
+TAO_DII_Asynch_Reply_Dispatcher::~TAO_DII_Asynch_Reply_Dispatcher ()
 {
   // this was handed to us by the caller.
   CORBA::release(callback_);
@@ -194,7 +194,7 @@ TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply (
 }
 
 void
-TAO_DII_Asynch_Reply_Dispatcher::connection_closed (void)
+TAO_DII_Asynch_Reply_Dispatcher::connection_closed ()
 {
   try
     {
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 0e259322511..d516a6c03a4 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -47,10 +47,10 @@ public:
   /// The Reply_Dispatcher methods
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
 
   /// The following methods are not needed for this class..
-  virtual void reply_timed_out (void)  {}
+  virtual void reply_timed_out () {}
   virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &)
   {
     return 0;
@@ -77,12 +77,12 @@ class TAO_DynamicInterface_Export TAO_DII_Asynch_Reply_Dispatcher
 public:
   TAO_DII_Asynch_Reply_Dispatcher (const Messaging::ReplyHandler_ptr callback,
                                      TAO_ORB_Core *orb_core);
-  virtual ~TAO_DII_Asynch_Reply_Dispatcher (void);
+  virtual ~TAO_DII_Asynch_Reply_Dispatcher ();
 
   /// The Reply_Dispatcher methods
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
 
 private:
   /// The buffer that is used to initialise the data block
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
index 736cd4372d5..5fb4984b60e 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
@@ -14,7 +14,7 @@ TAO_DII_Reply_Handler::_duplicate (TAO_DII_Reply_Handler_ptr x)
 
 // Inline operations for class TAO_DII_Reply_Handler_var
 ACE_INLINE
-TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (void)
+TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var ()
   : ptr_ (TAO_DII_Reply_Handler::_nil ())
 {
 }
@@ -26,7 +26,7 @@ TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (
 {}
 
 ACE_INLINE
-TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var (void)
+TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var ()
 {
   CORBA::release (this->ptr_);
 }
@@ -87,13 +87,13 @@ TAO_DII_Reply_Handler_var::in () const
 }
 
 ACE_INLINE TAO_DII_Reply_Handler_ptr &
-TAO_DII_Reply_Handler_var::inout (void)
+TAO_DII_Reply_Handler_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE TAO_DII_Reply_Handler_ptr &
-TAO_DII_Reply_Handler_var::out (void)
+TAO_DII_Reply_Handler_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = TAO_DII_Reply_Handler::_nil ();
@@ -101,7 +101,7 @@ TAO_DII_Reply_Handler_var::out (void)
 }
 
 ACE_INLINE TAO_DII_Reply_Handler_ptr
-TAO_DII_Reply_Handler_var::_retn (void)
+TAO_DII_Reply_Handler_var::_retn ()
 {
   // yield ownership
   TAO_DII_Reply_Handler_ptr val = this->ptr_;
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index dace7b4b5f4..c710f5c7d8f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -6,11 +6,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void)
+TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl ()
 {
 }
 
-TAO_Dynamic_Adapter_Impl::~TAO_Dynamic_Adapter_Impl (void)
+TAO_Dynamic_Adapter_Impl::~TAO_Dynamic_Adapter_Impl ()
 {
 }
 
@@ -126,7 +126,7 @@ TAO_Dynamic_Adapter_Impl::create_exception_list (
 }
 
 int
-TAO_Dynamic_Adapter_Impl::Initializer (void)
+TAO_Dynamic_Adapter_Impl::Initializer ()
 {
   TAO_ORB_Core::dynamic_adapter_name ("Concrete_Dynamic_Adapter");
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_Adapter_Impl);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 4a91448a9f0..97cf2fcce26 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -76,7 +76,7 @@ public:
   virtual void create_exception_list (CORBA::ExceptionList_ptr &list);
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 61298d32691..e4c14c79d71 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -23,7 +23,7 @@ TAO_DynamicImplementation::_is_a (const char *logical_type_id)
 }
 
 CORBA::Object_ptr
-TAO_DynamicImplementation::_this (void)
+TAO_DynamicImplementation::_this ()
 {
   // The _this() function returns a CORBA::Object_ptr for the target
   // object. Unlike _this() for static skeletons, its return type is
@@ -43,7 +43,7 @@ TAO_DynamicImplementation::_this (void)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_DynamicImplementation::_get_interface (void)
+TAO_DynamicImplementation::_get_interface ()
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -76,7 +76,7 @@ TAO_DynamicImplementation::_downcast (const char *)
 }
 
 TAO_Stub *
-TAO_DynamicImplementation::_create_stub (void)
+TAO_DynamicImplementation::_create_stub ()
 {
   // If DynamicImplementation::_this() is invoked outside of the
   // context of a request invocation on a target object being served
@@ -173,7 +173,7 @@ TAO_DynamicImplementation::_dispatch (
 }
 
 CORBA::RepositoryId
-TAO_DynamicImplementation::get_id_from_primary_interface (void)
+TAO_DynamicImplementation::get_id_from_primary_interface ()
 {
   // If this method is called outside of the
   // context of a request invocation on a target object being served
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index ca6cd84b0c8..f9381bf0b36 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -65,10 +65,10 @@ public:
   virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
   /// Returns a CORBA::Object_ptr for the target object.
-  CORBA::Object_ptr _this (void);
+  CORBA::Object_ptr _this ();
 
   /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (void);
+  virtual CORBA::InterfaceDef_ptr _get_interface ();
 
 protected:
   /// Return 0.  Should never be used.
@@ -78,7 +78,7 @@ protected:
   virtual void *_downcast (const char *repository_id);
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (void);
+  virtual TAO_Stub *_create_stub ();
 
   /// Turns around and calls invoke.
   virtual void _dispatch (
@@ -87,7 +87,7 @@ protected:
 
 private:
   /// Encapsulates code common to _is_a(), _get_interface() and _create_stub().
-  CORBA::RepositoryId get_id_from_primary_interface (void);
+  CORBA::RepositoryId get_id_from_primary_interface ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 82f57f73181..7bdd96745b1 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -18,7 +18,7 @@ CORBA::ExceptionList::ExceptionList (CORBA::ULong len,
     }
 }
 
-CORBA::ExceptionList::~ExceptionList (void)
+CORBA::ExceptionList::~ExceptionList ()
 {
   for (CORBA::ULong i = 0; i < this->count (); ++i)
     {
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index b28dcb53b9e..af721bffa29 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -60,18 +60,18 @@ namespace CORBA
     ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list);
 
     /// Destructor.
-    ~ExceptionList (void);
+    ~ExceptionList ();
 
     /// Return the number of elements.
-    CORBA::ULong count (void);
+    CORBA::ULong count ();
 
     /// Increase the reference count.
-    ExceptionList_ptr _duplicate (void);
+    ExceptionList_ptr _duplicate ();
 
     /// Increase the reference count in the spec defined manner.
     static ExceptionList_ptr _duplicate (ExceptionList *);
 
-    void _destroy (void);
+    void _destroy ();
 
     static ExceptionList_ptr _nil ();
 
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 71e69be6eb1..b8e55c213b5 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -104,7 +104,7 @@ CORBA::Request::Request (CORBA::Object_ptr obj,
            CORBA::NamedValue);
 }
 
-CORBA::Request::~Request (void)
+CORBA::Request::~Request ()
 {
   ACE_ASSERT (refcount_ == 0);
 
@@ -123,7 +123,7 @@ CORBA::Request::~Request (void)
 // flow in some exotic situations.
 
 void
-CORBA::Request::invoke (void)
+CORBA::Request::invoke ()
 {
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -161,7 +161,7 @@ CORBA::Request::invoke (void)
 }
 
 void
-CORBA::Request::send_oneway (void)
+CORBA::Request::send_oneway ()
 {
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -188,7 +188,7 @@ CORBA::Request::send_oneway (void)
 }
 
 void
-CORBA::Request::send_deferred (void)
+CORBA::Request::send_deferred ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -296,7 +296,7 @@ CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
 #endif /* TAO_HAS_AMI */
 
 void
-CORBA::Request::get_response (void)
+CORBA::Request::get_response ()
 {
   while (!this->response_received_)
     {
@@ -310,7 +310,7 @@ CORBA::Request::get_response (void)
 }
 
 CORBA::Boolean
-CORBA::Request::poll_response (void)
+CORBA::Request::poll_response ()
 {
   CORBA::Boolean response_received = false;
 
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index e9a50696c97..6991baecde8 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -73,13 +73,13 @@ namespace CORBA
     const CORBA::Char *operation () const;
 
     /// Return the arguments for the request.
-    CORBA::NVList_ptr arguments (void);
+    CORBA::NVList_ptr arguments ();
 
     /// Return the result for the request.
-    CORBA::NamedValue_ptr result (void);
+    CORBA::NamedValue_ptr result ();
 
     /// Return the exceptions resulting from this request.
-    CORBA::ExceptionList_ptr exceptions (void);
+    CORBA::ExceptionList_ptr exceptions ();
 
     /// Accessor for the Context member.
     CORBA::Context_ptr ctx () const;
@@ -89,7 +89,7 @@ namespace CORBA
 
     /// Return a list of the request's result's contexts.  Since TAO
     /// does not implement Contexts, this will always be 0.
-    CORBA::ContextList_ptr contexts (void);
+    CORBA::ContextList_ptr contexts ();
 
     /**
      * @name Argument manipulation helper functions.
@@ -143,7 +143,7 @@ namespace CORBA
     //@{
     void send_deferred ();
     void get_response ();
-    CORBA::Boolean poll_response (void);
+    CORBA::Boolean poll_response ();
     //@}
 
     /// Callback method for deferred synchronous requests.
@@ -182,11 +182,11 @@ namespace CORBA
     void raw_user_exception (TAO_InputCDR &cdr);
 
     /// Accessor for the input stream containing the exception.
-    ACE_CString &raw_user_exception (void);
+    ACE_CString &raw_user_exception ();
 
     /// Proprietary method to check whether a response has been
     /// received.
-    CORBA::Boolean response_received (void);
+    CORBA::Boolean response_received ();
 
     // Useful for template programming.
     typedef CORBA::Request_ptr _ptr_type;
@@ -210,7 +210,7 @@ namespace CORBA
              CORBA::ORB_ptr orb,
              const CORBA::Char *op);
 
-    ~Request (void);
+    ~Request ();
 
   private:
     /// Target object.
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 2a1c368d58b..5d9e7136aea 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -33,35 +33,35 @@ CORBA::Request::operation () const
 
 // Return the arguments for the request.
 ACE_INLINE CORBA::NVList_ptr
-CORBA::Request::arguments (void)
+CORBA::Request::arguments ()
 {
   return this->args_;
 }
 
 // Return the result for the request.
 ACE_INLINE CORBA::NamedValue_ptr
-CORBA::Request::result (void)
+CORBA::Request::result ()
 {
   return this->result_;
 }
 
 // Return the exceptions resulting from this request.
 ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::Request::exceptions (void)
+CORBA::Request::exceptions ()
 {
   return this->exceptions_.in ();
 }
 
 // Return the request's contexts
 ACE_INLINE CORBA::ContextList_ptr
-CORBA::Request::contexts (void)
+CORBA::Request::contexts ()
 {
   return this->contexts_;
 }
 
 // The argument manipulation helper functions
 ACE_INLINE CORBA::Any &
-CORBA::Request::add_in_arg (void)
+CORBA::Request::add_in_arg ()
 {
   return this->args_->add_element (CORBA::ARG_IN)->any_;
 }
@@ -73,7 +73,7 @@ CORBA::Request::add_in_arg (const CORBA::Char *name)
 }
 
 ACE_INLINE CORBA::Any &
-CORBA::Request::add_inout_arg (void)
+CORBA::Request::add_inout_arg ()
 {
   return this->args_->add_element (CORBA::ARG_INOUT)->any_;
 }
@@ -85,7 +85,7 @@ CORBA::Request::add_inout_arg (const CORBA::Char *name)
 }
 
 ACE_INLINE CORBA::Any &
-CORBA::Request::add_out_arg (void)
+CORBA::Request::add_out_arg ()
 {
   return this->args_->add_element (CORBA::ARG_OUT)->any_;
 }
@@ -147,13 +147,13 @@ CORBA::Request::raw_user_exception (TAO_InputCDR &cdr)
 }
 
 ACE_INLINE ACE_CString &
-CORBA::Request::raw_user_exception (void)
+CORBA::Request::raw_user_exception ()
 {
   return this->raw_user_exception_;
 }
 
 ACE_INLINE CORBA::Boolean
-CORBA::Request::response_received (void)
+CORBA::Request::response_received ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index c485c43d3a1..a2f01df0392 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -49,7 +49,7 @@ CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
   this->orb_server_request_.is_dsi ();
 }
 
-CORBA::ServerRequest::~ServerRequest (void)
+CORBA::ServerRequest::~ServerRequest ()
 {
   if (this->params_ != 0)
     {
@@ -159,7 +159,7 @@ CORBA::ServerRequest::set_exception (const CORBA::Any &value)
 // This method will be utilized by the DSI servant to marshal outgoing
 // parameters.
 void
-CORBA::ServerRequest::dsi_marshal (void)
+CORBA::ServerRequest::dsi_marshal ()
 {
   // There was a user exception, no need to marshal any parameters.
   if (this->sent_gateway_exception_)
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 80daba964d4..e55ba8d9df1 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -58,7 +58,7 @@ namespace CORBA
     ServerRequest (TAO_ServerRequest &orb_server_request);
 
     /// Destructor.
-    ~ServerRequest (void);
+    ~ServerRequest ();
 
     /// Implementation uses this to provide the ORB with the operation's
     /// parameter list ... on return, their values are available; the
@@ -89,7 +89,7 @@ namespace CORBA
     // basic CORBA Object Model.
 
     /// Marshal outgoing parameters.
-    void dsi_marshal (void);
+    void dsi_marshal ();
 
     /// Accessor for the Context member.
     CORBA::Context_ptr ctx () const;
@@ -118,7 +118,7 @@ namespace CORBA
     void _tao_reply_byte_order (int byte_order);
 
     /// Return a reference to the underlying TAO_ServerRequest object.
-    TAO_ServerRequest & _tao_server_request (void);
+    TAO_ServerRequest & _tao_server_request ();
 
     /// Returns a user exception through a TAO gateway without
     /// knowing its type.
diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl
index 13efdb7d4fb..25bd3df8d45 100644
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ b/TAO/tao/DynamicInterface/Server_Request.inl
@@ -55,7 +55,7 @@ CORBA::ServerRequest::_tao_reply_byte_order (int byte_order)
 }
 
 ACE_INLINE TAO_ServerRequest &
-CORBA::ServerRequest::_tao_server_request (void)
+CORBA::ServerRequest::_tao_server_request ()
 {
   return this->orb_server_request_;
 }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index c58073a777c..564db8117d0 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -12,7 +12,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::UnknownUserException::UnknownUserException (void)
+CORBA::UnknownUserException::UnknownUserException ()
   : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
                           "UnknownUserException"),
     exception_ (0)
@@ -37,13 +37,13 @@ CORBA::UnknownUserException::UnknownUserException (
            CORBA::Any (*e.exception_));
 }
 
-CORBA::UnknownUserException::~UnknownUserException (void)
+CORBA::UnknownUserException::~UnknownUserException ()
 {
   delete this->exception_;
 }
 
 CORBA::Any &
-CORBA::UnknownUserException::exception (void)
+CORBA::UnknownUserException::exception ()
 {
   return *this->exception_;
 }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 4a2a88379a1..871efd00dc2 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -45,7 +45,7 @@ namespace CORBA
   {
   public:
     /// Constructor.
-    UnknownUserException (void);
+    UnknownUserException ();
 
     /// Constructor.
     UnknownUserException (CORBA::Any& exception);
@@ -54,10 +54,10 @@ namespace CORBA
     UnknownUserException (const UnknownUserException& e);
 
     /// Destructor.
-    virtual ~UnknownUserException (void);
+    virtual ~UnknownUserException ();
 
     /// Return the any containing the user exception.
-    CORBA::Any& exception (void);
+    CORBA::Any& exception ();
 
     /// To throw an UnknownUserException of this type.
     virtual void _raise () const;
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp
index ddde096cb16..5577389cca4 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp
@@ -10,17 +10,17 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer (void)
+TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_DTP_Config_Registry);
 }
 
 
-TAO_DTP_Config_Registry::TAO_DTP_Config_Registry (void)
+TAO_DTP_Config_Registry::TAO_DTP_Config_Registry ()
 {
 }
 
-TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry (void)
+TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry ()
 {
 }
 
@@ -53,11 +53,11 @@ TAO_DTP_Config_Registry::rebind (const ACE_CString& name,
 
 //-------------------------------------------------------------------------
 
-TAO_DTP_Config::TAO_DTP_Config (void)
+TAO_DTP_Config::TAO_DTP_Config ()
 {
 }
 
-TAO_DTP_Config::~TAO_DTP_Config (void)
+TAO_DTP_Config::~TAO_DTP_Config ()
 {
 }
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h
index 1cb1cb90ead..9b9087b19f2 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.h
+++ b/TAO/tao/Dynamic_TP/DTP_Config.h
@@ -52,14 +52,14 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition
 class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer
 {
  public:
-  TAO_DTP_Config_Registry_Installer (void);
+  TAO_DTP_Config_Registry_Installer ();
 };
 
 class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry : public ACE_Service_Object
 {
 public:
-  TAO_DTP_Config_Registry (void);
-  virtual ~TAO_DTP_Config_Registry (void);
+  TAO_DTP_Config_Registry ();
+  virtual ~TAO_DTP_Config_Registry ();
 
   virtual int init (int argc, ACE_TCHAR* []);
 
@@ -78,10 +78,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_Config : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_DTP_Config (void);
+  TAO_DTP_Config ();
 
   /// Destructor.
-  virtual ~TAO_DTP_Config (void);
+  virtual ~TAO_DTP_Config ();
 
   /// Read a definition parameter set from the supplied args.
   /// There must be a -TPName argument, which, if replicated will cause the set to be ignored, unless -TPOverwrite is also set
diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
index 63273b603f7..76997783c04 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
@@ -19,7 +19,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DTP_ORBInitializer::TAO_DTP_ORBInitializer (/*const ACE_CString &tplist*/)
 {
-
 }
 
 void
@@ -72,7 +71,6 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
         "DTP_Thread_Lane_Resources_Manager_Factory");
   ACE_Service_Config::process_directive (
     ace_svc_desc_TAO_DTP_Thread_Lane_Resources_Manager_Factory);
-
 }
 
 void
@@ -122,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_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
index fd884660896..2bb8ff66e58 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
@@ -42,7 +42,7 @@ class TAO_DTP_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-  TAO_DTP_ORBInitializer (void);
+  TAO_DTP_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
index 06f5b83a5b5..e6d46069100 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
@@ -14,12 +14,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader (void)
+TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader (void)
+TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader ()
 {
 }
 
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
index 8b81afd949f..825daa1e499 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
@@ -34,10 +34,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_DTP_ORB_Loader (void);
+  TAO_DTP_ORB_Loader ();
 
   /// Destructor.
-  virtual ~TAO_DTP_ORB_Loader (void);
+  virtual ~TAO_DTP_ORB_Loader ();
 
   /// Initialize the DynamicTP loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
index 96d7391e483..408cc1f868d 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
@@ -15,11 +15,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DTP_POA_Loader::TAO_DTP_POA_Loader (void)
+TAO_DTP_POA_Loader::TAO_DTP_POA_Loader ()
 {
 }
 
-TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader (void)
+TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader ()
 {
 }
 
@@ -68,7 +68,6 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
 
   for (int curarg = 0; curarg < argc; curarg++)
     {
-
       if (TAO_debug_level > 0)
         {
           TAOLIB_DEBUG((LM_DEBUG,
@@ -93,7 +92,6 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
         }
       else
         {
-
           /*
             If we get here then we have another map set to process and
             add to the map registry.
@@ -119,7 +117,6 @@ int
 TAO_DTP_POA_Loader::load_poa_map (ACE_TCHAR *map,
                                   TAO_CSD_Strategy_Repository *repo)
 {
-
   ACE_CString poa_name;
   ACE_CString config_name;
   TAO_DTP_POA_Strategy * strategy_container = 0;
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
index a0a021149f0..99e9aa1d0ef 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
@@ -32,10 +32,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_DTP_POA_Loader (void);
+  TAO_DTP_POA_Loader ();
 
   /// Destructor.
-  virtual ~TAO_DTP_POA_Loader (void);
+  virtual ~TAO_DTP_POA_Loader ();
 
   /// Initialize the DynamicTP loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
index 053ac1bba8b..ea0088f136c 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
@@ -48,7 +48,6 @@ TAO_DTP_POA_Strategy::CustomRequestOutcome
 TAO_DTP_POA_Strategy::custom_asynch_request (
   TAO::CSD::TP_Custom_Request_Operation* op)
 {
-
   TAO::CSD::TP_Servant_State::HandleType servant_state =
     this->get_servant_state (op->servant ());
 
@@ -66,7 +65,6 @@ TAO_DTP_POA_Strategy::custom_asynch_request (
 bool
 TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core)
 {
-
   this->dtp_task_.thr_mgr (orb_core.thr_mgr ());
 
   // Activates the worker threads, and waits until all have been started.
@@ -95,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_);
@@ -107,10 +104,8 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core)
         }
 
 
-
     }
   return (this->dtp_task_.open () == 0);
-
 }
 
 void
@@ -181,8 +176,6 @@ TAO_DTP_POA_Strategy::dispatch_collocated_request_i
                               const char*                     operation,
                               PortableServer::Servant         servant)
 {
-
-
   TAO::CSD::TP_Servant_State::HandleType servant_state =
                         this->get_servant_state (servant);
 
@@ -218,7 +211,6 @@ TAO_DTP_POA_Strategy::dispatch_collocated_request_i
     }
   else if (is_synchronous)
     {
-
       TAO::CSD::TP_Collocated_Synch_Request *req_ptr;
       ACE_NEW_RETURN (req_ptr,
                       TAO::CSD::TP_Collocated_Synch_Request (
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
index 3b9acd43681..aeb0359a025 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
@@ -201,7 +201,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
 };
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp
index 80a3bbd2dd2..99d6ca3609c 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp
@@ -269,21 +269,21 @@ TAO_DTP_Task::clear_request (TAO::CSD::TP_Request_Handle &r)
 }
 
 void
-TAO_DTP_Task::add_busy (void)
+TAO_DTP_Task::add_busy ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_);
   ++this->busy_threads_;
 }
 
 void
-TAO_DTP_Task::remove_busy (void)
+TAO_DTP_Task::remove_busy ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_);
   --this->busy_threads_;
 }
 
 void
-TAO_DTP_Task::add_active (void)
+TAO_DTP_Task::add_active ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_);
   ++this->active_count_;
@@ -303,7 +303,7 @@ TAO_DTP_Task::remove_active (bool force)
 }
 
 bool
-TAO_DTP_Task::need_active (void)
+TAO_DTP_Task::need_active ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->aw_lock_, false);
   return ((this->busy_threads_ == static_cast<unsigned long> (this->active_count_)) &&
@@ -312,14 +312,14 @@ TAO_DTP_Task::need_active (void)
 }
 
 bool
-TAO_DTP_Task::above_minimum (void)
+TAO_DTP_Task::above_minimum ()
 {
   return this->min_pool_threads_ > 0 &&
     this->active_count_ > this->min_pool_threads_;
 }
 
 int
-TAO_DTP_Task::svc (void)
+TAO_DTP_Task::svc ()
 {
   this->add_busy ();
   if (TAO_debug_level > 4)
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h
index c39e3b57772..ae858e9f443 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.h
+++ b/TAO/tao/Dynamic_TP/DTP_Task.h
@@ -62,7 +62,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base
 {
 public:
-
   /// Default Constructor.
   TAO_DTP_Task();
 
@@ -125,12 +124,12 @@ private:
   /// release the request, reset the accepting flag if necessary
   void clear_request (TAO::CSD::TP_Request_Handle &r);
 
-  void add_busy (void);
-  void remove_busy (void);
-  void add_active (void);
+  void add_busy ();
+  void remove_busy ();
+  void add_active ();
   bool remove_active (bool);
-  bool need_active (void);
-  bool above_minimum (void);
+  bool need_active ();
+  bool above_minimum ();
 
   typedef TAO_SYNCH_MUTEX         LockType;
   typedef TAO_Condition<LockType> ConditionType;
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
index 636c345d7da..500efca43f4 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
@@ -25,10 +25,9 @@ TAO_DTP_Thread_Lane_Resources_Manager::TAO_DTP_Thread_Lane_Resources_Manager
   // Create the thread-pool manager.
   ACE_NEW (this->tp_manager_,
            TAO_DTP_Thread_Pool_Manager (orb_core));
-
 }
 
-TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (void)
+TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager ()
 {
   // Delete the default resources.
   delete this->default_lane_resources_;
@@ -38,7 +37,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (v
 }
 
 int
-TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources (void)
+TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources ()
 {
   TAO_ORB_Parameters *params =
     this->orb_core_->orb_params ();
@@ -57,14 +56,14 @@ TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources (void)
 }
 
 void
-TAO_DTP_Thread_Lane_Resources_Manager::finalize (void)
+TAO_DTP_Thread_Lane_Resources_Manager::finalize ()
 {
   // Finalize default resources.
   this->default_lane_resources_->finalize ();
 }
 
 void
-TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->shutdown_reactor ();
@@ -72,7 +71,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor (void)
 }
 
 void
-TAO_DTP_Thread_Lane_Resources_Manager::close_all_transports (void)
+TAO_DTP_Thread_Lane_Resources_Manager::close_all_transports ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->close_all_transports ();
@@ -85,19 +84,19 @@ TAO_DTP_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofi
 }
 
 TAO_Thread_Lane_Resources &
-TAO_DTP_Thread_Lane_Resources_Manager::lane_resources (void)
+TAO_DTP_Thread_Lane_Resources_Manager::lane_resources ()
 {
     return *this->default_lane_resources_;
 }
 
 TAO_Thread_Lane_Resources &
-TAO_DTP_Thread_Lane_Resources_Manager::default_lane_resources (void)
+TAO_DTP_Thread_Lane_Resources_Manager::default_lane_resources ()
 {
   return *this->default_lane_resources_;
 }
 
 TAO_DTP_Thread_Pool_Manager &
-TAO_DTP_Thread_Lane_Resources_Manager::tp_manager (void)
+TAO_DTP_Thread_Lane_Resources_Manager::tp_manager ()
 {
   return *this->tp_manager_;
 }
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
index 13d90d8b5f5..f84d06c5422 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
@@ -40,37 +40,35 @@ class TAO_Dynamic_TP_Export TAO_DTP_Thread_Lane_Resources_Manager :
   public TAO_Thread_Lane_Resources_Manager
 {
 public:
-
   /// Constructor.
   TAO_DTP_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_DTP_Thread_Lane_Resources_Manager (void);
+  ~TAO_DTP_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Open default resources.
-  int open_default_resources (void);
+  int open_default_resources ();
 
   /// Shutdown reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Certain ORB policies such as dropping replies on shutdown
   /// would need cleanup of transports to wake threads up.
-  void close_all_transports (void);
+  void close_all_transports ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
   // @{
+  TAO_Thread_Lane_Resources &lane_resources ();
 
-  TAO_Thread_Lane_Resources &lane_resources (void);
-
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
+  TAO_Thread_Lane_Resources &default_lane_resources ();
 
-  TAO_DTP_Thread_Pool_Manager &tp_manager (void);
+  TAO_DTP_Thread_Pool_Manager &tp_manager ();
 
   // @}
 
@@ -98,15 +96,12 @@ class TAO_Dynamic_TP_Export TAO_DTP_Thread_Lane_Resources_Manager_Factory
   : public TAO_Thread_Lane_Resources_Manager_Factory
 {
 public:
-
   /// Factory method.
   TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (
     TAO_ORB_Core &core);
-
 };
 
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP,
                                TAO_DTP_Thread_Lane_Resources_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO_Dynamic_TP,
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
index 852e4862245..18627baba14 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
@@ -26,7 +26,7 @@ TAO_DTP_New_Leader_Generator::TAO_DTP_New_Leader_Generator (
 }
 
 bool
-TAO_DTP_New_Leader_Generator::no_leaders_available (void)
+TAO_DTP_New_Leader_Generator::no_leaders_available ()
 {
   return this->pool_.new_dynamic_thread ();
 }
@@ -38,7 +38,7 @@ TAO_DTP_Termination_Waiter::TAO_DTP_Termination_Waiter (TAO_DTP_Thread_Pool &p)
 }
 
 int
-TAO_DTP_Termination_Waiter::svc (void)
+TAO_DTP_Termination_Waiter::svc ()
 {
   do
     {
@@ -61,9 +61,8 @@ TAO_DTP_Thread_Pool_Threads::TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &p
 }
 
 int
-TAO_DTP_Thread_Pool_Threads::svc (void)
+TAO_DTP_Thread_Pool_Threads::svc ()
 {
-
   if (TAO_debug_level > 7)
     {
       TAOLIB_DEBUG ((LM_DEBUG,
@@ -170,7 +169,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core)
 }
 
 bool
-TAO_DTP_Thread_Pool::above_minimum (void)
+TAO_DTP_Thread_Pool::above_minimum ()
 {
   return this->definition_.min_threads_ > 0 &&
     (int)this->active_count_ > this->definition_.min_threads_;
@@ -188,7 +187,7 @@ TAO_DTP_Thread_Pool::current_threads () const
 }
 
 void
-TAO_DTP_Thread_Pool::add_active (void)
+TAO_DTP_Thread_Pool::add_active ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
   ++this->active_count_;
@@ -207,7 +206,7 @@ TAO_DTP_Thread_Pool::remove_active (bool force)
 }
 
 int
-TAO_DTP_Thread_Pool::create_initial_threads (void)
+TAO_DTP_Thread_Pool::create_initial_threads ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
@@ -237,7 +236,7 @@ TAO_DTP_Thread_Pool::create_initial_threads (void)
 }
 
 bool
-TAO_DTP_Thread_Pool::new_dynamic_thread (void)
+TAO_DTP_Thread_Pool::new_dynamic_thread ()
 {
   // Note that we are checking this condition below without the lock
   // held.
@@ -394,17 +393,17 @@ TAO_DTP_Thread_Pool::TAO_DTP_Thread_Pool (TAO_DTP_Thread_Pool_Manager &manager,
 }
 
 void
-TAO_DTP_Thread_Pool::open (void)
+TAO_DTP_Thread_Pool::open ()
 {
   // Nothing to do for now
 }
 
-TAO_DTP_Thread_Pool::~TAO_DTP_Thread_Pool (void)
+TAO_DTP_Thread_Pool::~TAO_DTP_Thread_Pool ()
 {
 }
 
 void
-TAO_DTP_Thread_Pool::shutting_down (void)
+TAO_DTP_Thread_Pool::shutting_down ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
@@ -417,7 +416,7 @@ TAO_DTP_Thread_Pool::shutting_down (void)
 
 
 void
-TAO_DTP_Thread_Pool::wait (void)
+TAO_DTP_Thread_Pool::wait ()
 {
   this->waiter_.wait ();
 }
@@ -441,7 +440,7 @@ TAO_DTP_Thread_Pool_Manager::TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core
 {
 }
 
-TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager (void)
+TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager ()
 {
   // Delete all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -452,7 +451,7 @@ TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager (void)
 
 
 void
-TAO_DTP_Thread_Pool_Manager::wait (void)
+TAO_DTP_Thread_Pool_Manager::wait ()
 {
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
        iterator != this->thread_pools_.end ();
@@ -496,7 +495,6 @@ TAO_DTP_Thread_Pool_Manager::destroy_threadpool (CORBA::ULong threadpool)
 
   // Delete the thread pool.
   delete tao_thread_pool;
-
 }
 
 CORBA::ULong
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
index 6789f78a869..9dbc121e046 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
@@ -53,7 +53,7 @@ public:
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
-  bool no_leaders_available (void);
+  bool no_leaders_available ();
 
 private:
   /// Pool associated with this leader generator.
@@ -75,7 +75,7 @@ public:
   TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &pool);
 
   /// Method executed when a thread is spawned.
-  int svc (void);
+  int svc ();
 
   /// Accessor to the pool to which this thread belongs to.
   TAO_DTP_Thread_Pool &pool () const;
@@ -102,7 +102,7 @@ public:
   TAO_DTP_Termination_Waiter (TAO_DTP_Thread_Pool &pool);
 
   /// Method executed when a thread is spawned.
-  int svc (void);
+  int svc ();
 
 protected:
   /// Pool to which this thread belongs to.
@@ -129,19 +129,19 @@ public:
                        TAO_DTP_Definition &definition);
 
   /// Destructor.
-  ~TAO_DTP_Thread_Pool (void);
+  ~TAO_DTP_Thread_Pool ();
 
   /// Open the pool.
-  void open (void);
+  void open ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Mark this thread pool that we are shutting down.
-  void shutting_down (void);
+  void shutting_down ();
 
   /// Create the initial threads - only called once.
-  int create_initial_threads (void);
+  int create_initial_threads ();
 
   /// Called by the TAO_DTP_New_Leader_Generator to request a new dynamic
   /// thread.
@@ -152,28 +152,26 @@ public:
    * @retval true A new thread is created
    * @retval false No thread could be created
    */
-  bool new_dynamic_thread (void);
+  bool new_dynamic_thread ();
 
   /// Called by the run loop to determine if to expire a thread or not
   /// when the dynamic timeout is reached.
-  bool above_minimum (void);
+  bool above_minimum ();
 
   /// @name Accessors
   // @{
-
   bool use_timeouts () const;
   const ACE_Time_Value& dynamic_thread_time () const;
 
   TAO_DTP_Thread_Pool_Manager &manager () const;
   CORBA::ULong id () const;
   CORBA::ULong current_threads () const;
-  void add_active (void);
+  void add_active ();
   bool remove_active (bool force);
 
   // @}
 
 private:
-
   int create_threads_i (size_t count);
 
   TAO_DTP_Thread_Pool_Manager &manager_;
@@ -215,15 +213,14 @@ private:
 class TAO_Dynamic_TP_Export TAO_DTP_Thread_Pool_Manager
 {
 public:
-
   /// Constructor.
   TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_DTP_Thread_Pool_Manager (void);
+  ~TAO_DTP_Thread_Pool_Manager ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Create a threadpool without lanes.
   CORBA::ULong create_threadpool (TAO_DTP_Definition &def);
@@ -243,7 +240,6 @@ public:
 private:
   /// @name Helpers
   // @{
-
   CORBA::ULong
   create_threadpool_i (TAO_DTP_Definition &def);
 
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
index 2b7092ae0f2..d3be0e91089 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
@@ -137,7 +137,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
     }
 }
 
-TAO_ETCL_Literal_Constraint::~TAO_ETCL_Literal_Constraint (void)
+TAO_ETCL_Literal_Constraint::~TAO_ETCL_Literal_Constraint ()
 {
   if (this->any_ != 0)
     {
@@ -411,7 +411,7 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs)
 }
 
 TAO_ETCL_Literal_Constraint
-TAO_ETCL_Literal_Constraint::operator- (void)
+TAO_ETCL_Literal_Constraint::operator- ()
 {
   switch (this->type_)
   {
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.h b/TAO/tao/ETCL/TAO_ETCL_Constraint.h
index 7187aa54804..ed9fd2e5be3 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.h
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.h
@@ -40,7 +40,7 @@ class TAO_ETCL_Export TAO_ETCL_Literal_Constraint
   : public ETCL_Literal_Constraint
 {
 public:
-  TAO_ETCL_Literal_Constraint (void);
+  TAO_ETCL_Literal_Constraint ();
 
   // = Constructors for each of the various types of literals.
 
@@ -56,7 +56,7 @@ public:
   TAO_ETCL_Literal_Constraint (const ETCL_Literal_Constraint *lit);
 
   /// Destructor.
-  virtual ~TAO_ETCL_Literal_Constraint(void);
+  virtual ~TAO_ETCL_Literal_Constraint();
 
   /// Assignment operator.
   void operator= (const TAO_ETCL_Literal_Constraint& co);
@@ -87,7 +87,7 @@ public:
 
   // Unary minus.
   TAO_ETCL_Literal_Constraint
-  operator- (void);
+  operator- ();
 
   /// Ensure both operands are of the same simple numeric type.
   virtual Literal_Type
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl
index f12a2537209..54b0390fb81 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl
@@ -2,7 +2,7 @@
 // ****************************************************************
 
 ACE_INLINE
-TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (void)
+TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint ()
   : any_ (0)
 {
 }
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 8119ff6643b..18d8e46135f 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -76,7 +76,7 @@ public:
   /**
    * @return The next endpoint in the list, if any.
    */
-  virtual TAO_Endpoint *next (void) = 0;
+  virtual TAO_Endpoint *next () = 0;
 
   /**
    * Return the next endpoint in the list, but use protocol-specific
@@ -124,7 +124,7 @@ protected:
   mutable TAO_SYNCH_MUTEX addr_lookup_lock_;
 
   /// Cache the hash value
-  CORBA::ULong hash_val_;
+  CORBA::ULong hash_val_ {};
 
   /// IOP tag, identifying the protocol for which this endpoint
   /// contains addressing info.
diff --git a/TAO/tao/Endpoint.inl b/TAO/tao/Endpoint.inl
index 17025738d69..99e0438fd79 100644
--- a/TAO/tao/Endpoint.inl
+++ b/TAO/tao/Endpoint.inl
@@ -9,7 +9,6 @@ TAO_Endpoint::TAO_Endpoint (CORBA::ULong tag,
   //    which case this optimizaton wouldn't work. We can get around
   //    that using a bool. But we don't want to increase the runtime
   //    memory.
-  , hash_val_ (0)
   , tag_ (tag)
   , priority_ (priority)
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index 8084ab4a572..5ad9d3b3198 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -11,7 +11,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_EndpointPolicy_Initializer::static_init (void)
+TAO_EndpointPolicy_Initializer::static_init ()
 {
   ACE_Service_Config::process_directive  (ace_svc_desc_TAO_EndpointPolicy_Initializer);
   return 0;
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.h b/TAO/tao/EndpointPolicy/EndpointPolicy.h
index 6895190df68..54d628e2243 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.h
@@ -30,7 +30,7 @@ class TAO_EndpointPolicy_Export TAO_EndpointPolicy_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int static_init (void);
+  static int static_init ();
 
   /// Initialize the Endpoint Policy loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
@@ -40,7 +40,6 @@ static int
 TAO_Requires_EndpointPolicy_Initializer = TAO_EndpointPolicy_Initializer::static_init ();
 
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer)
 ACE_FACTORY_DECLARE (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer)
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
index b9474320f07..0a93de48150 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
@@ -46,7 +46,6 @@ public:
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value);
 private:
-
   TAO_ORB_Core * orb_core_;
 };
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index a245b774cb1..726e96d31d3 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -23,7 +23,7 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i ()
 
 
 CORBA::PolicyType
-TAO_EndpointPolicy_i::policy_type (void)
+TAO_EndpointPolicy_i::policy_type ()
 {
   return EndpointPolicy::ENDPOINT_POLICY_TYPE;
 }
@@ -39,7 +39,7 @@ TAO_EndpointPolicy_i::clone () const
 }
 
 EndpointPolicy::EndpointList *
-TAO_EndpointPolicy_i::value (void)
+TAO_EndpointPolicy_i::value ()
 {
   EndpointPolicy::EndpointList* list = 0;
   ACE_NEW_RETURN (list,
@@ -50,7 +50,7 @@ TAO_EndpointPolicy_i::value (void)
 }
 
 CORBA::Policy_ptr
-TAO_EndpointPolicy_i::copy (void)
+TAO_EndpointPolicy_i::copy ()
 {
   TAO_EndpointPolicy_i* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -61,7 +61,7 @@ TAO_EndpointPolicy_i::copy (void)
 }
 
 void
-TAO_EndpointPolicy_i::destroy (void)
+TAO_EndpointPolicy_i::destroy ()
 {
   this->value_.length (0);
 }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
index 5fe59a50bb5..198e7a59bc2 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
@@ -57,16 +57,16 @@ public:
 
   // = The EndpointPolicy::Policy methods
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
-  virtual EndpointPolicy::EndpointList * value (void);
+  virtual EndpointPolicy::EndpointList * value ();
 
 private:
   /// The attribute
@@ -74,7 +74,6 @@ private:
 };
 
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
index 197b7e26192..13b1dba968d 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
@@ -8,7 +8,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void)
+TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory()
 {
 }
 
@@ -55,7 +55,6 @@ TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void
 }
 
 
-
 ACE_FACTORY_DEFINE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_Endpoint_Acceptor_Filter_Factory,
                        ACE_TEXT ("TAO_Acceptor_Filter_Factory"),
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
index 7f0318ba824..40f1ec6b0d6 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
@@ -37,7 +37,7 @@ class TAO_EndpointPolicy_Export TAO_Endpoint_Acceptor_Filter_Factory
   : public TAO_Acceptor_Filter_Factory
 {
 public:
-  virtual ~TAO_Endpoint_Acceptor_Filter_Factory(void);
+  virtual ~TAO_Endpoint_Acceptor_Filter_Factory();
 
   /// Create a new TAO_Endpoint_Acceptor_Filter object.
   TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager);
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h b/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
index 062366f373f..a02c03ffcd4 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
+++ b/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
@@ -40,7 +40,7 @@ class TAO_Acceptor;
 class TAO_EndpointPolicy_Export  TAO_Endpoint_Value_Impl
 {
 public:
-  virtual ~TAO_Endpoint_Value_Impl(void);
+  virtual ~TAO_Endpoint_Value_Impl();
 
   /// This method is used to compare a candidate IOR endpoint with the
   /// endpoint defined by this policy value.
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index ac2bde0fef2..54517440cd1 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -23,7 +23,7 @@ IIOPEndpointValue_i::IIOPEndpointValue_i (const char *host, CORBA::UShort port)
     this->addr_.set_type (-1);
 }
 
-IIOPEndpointValue_i::~IIOPEndpointValue_i (void)
+IIOPEndpointValue_i::~IIOPEndpointValue_i ()
 {
 }
 
@@ -88,7 +88,7 @@ IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor,
 }
 
 char *
-IIOPEndpointValue_i::host (void)
+IIOPEndpointValue_i::host ()
 {
   return CORBA::string_dup (this->host_.in());
 }
@@ -102,7 +102,7 @@ IIOPEndpointValue_i::host (const char *h)
 }
 
 CORBA::UShort
-IIOPEndpointValue_i::port (void)
+IIOPEndpointValue_i::port ()
 {
   return this->port_;
 }
@@ -116,7 +116,7 @@ IIOPEndpointValue_i::port (CORBA::UShort p )
 }
 
 CORBA::ULong
-IIOPEndpointValue_i::protocol_tag (void)
+IIOPEndpointValue_i::protocol_tag ()
 {
   return IOP::TAG_INTERNET_IOP;
 }
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
index 119ba18f526..0f240ed5dcd 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
@@ -66,7 +66,7 @@ public:
   /// of one-off values.
   IIOPEndpointValue_i (const char *host, CORBA::UShort port);
 
-  virtual ~IIOPEndpointValue_i (void);
+  virtual ~IIOPEndpointValue_i ();
 
   /// The is_equivalent test is used by the endpoint policy framework
   /// for testing if a target endpoint is the same as the endpoint
@@ -83,15 +83,15 @@ public:
                                     bool is_multi_prot) const;
 
   /// Host attribute get/set operators.
-  char * host (void);
+  char * host ();
   void host (const char * h);
 
   /// Port attribute get/set operators.
-  CORBA::UShort port (void);
+  CORBA::UShort port ();
   void port (CORBA::UShort p);
 
   // Protocol tag get operator, inherited from EndpointValueBase
-  CORBA::ULong protocol_tag (void);
+  CORBA::ULong protocol_tag ();
 
 private:
   CORBA::Boolean is_equivalent_i (CORBA::UShort port, const char *host) const;
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 9d7adebf961..cd188fd4f2b 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -106,7 +106,7 @@ CORBA::Environment::default_environment ()
   // clear the environment before calling into the ORB.
   TAO_ORB_Core_instance ()->default_environment ()->clear ();
 
-  return TAO_default_environment ();;
+  return TAO_default_environment ();
 }
 
 // Convenience -- say if the exception is a system exception or not.
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 126b3476a5e..226ce19e108 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -97,7 +97,6 @@ namespace CORBA
   class TAO_Export Exception
   {
   public:
-
     /// Copy constructor.
     /**
      * @note This constructor should be protected, but VC7.1 at
@@ -165,13 +164,13 @@ namespace CORBA
      * class SomeException : public // Derives from CORBA::Exception
      * {
      * public:
-     *   virtual CORBA::Exception *_tao_duplicate () const
+     *   CORBA::Exception *_tao_duplicate () override const
      *   {
-     *     CORBA::Exception *result = 0;
+     *     CORBA::Exception *result {};
      *     ACE_NEW_RETURN (
      *         result,
      *         SomeException (*this),
-     *         0);
+     *         nullptr);
      *     return result;
      *   }
      * };
diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h
index 9c94f223358..8ecb778cff6 100644
--- a/TAO/tao/Exclusive_TMS.h
+++ b/TAO/tao/Exclusive_TMS.h
@@ -37,13 +37,12 @@ class TAO_Reply_Dispatcher;
  */
 class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
 {
-
 public:
   /// Constructor.
   TAO_Exclusive_TMS (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Exclusive_TMS (void);
+  virtual ~TAO_Exclusive_TMS ();
 
   /**
    * @name The TAO_Transport_Mux_Strategy overrided methods
@@ -52,7 +51,7 @@ public:
    * for details.
    */
   //@{
-  virtual CORBA::ULong request_id (void);
+  virtual CORBA::ULong request_id ();
   virtual int bind_dispatcher (CORBA::ULong request_id,
                                ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd);
   virtual int unbind_dispatcher (CORBA::ULong request_id);
@@ -60,10 +59,10 @@ public:
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
   virtual int reply_timed_out (CORBA::ULong request_id);
 
-  virtual bool idle_after_send (void);
-  virtual bool idle_after_reply (void);
-  virtual void connection_closed (void);
-  virtual bool has_request (void);
+  virtual bool idle_after_send ();
+  virtual bool idle_after_reply ();
+  virtual void connection_closed ();
+  virtual bool has_request ();
   //@}
 
 protected:
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
index 584bb6adef1..f5db64e3153 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -38,7 +38,6 @@ class TAO_ORB_Core;
  */
 class TAO_Export TAO_Fault_Tolerance_Service
 {
-
 public:
   /// Ctor
   TAO_Fault_Tolerance_Service () = default;
@@ -57,7 +56,6 @@ private:
   TAO_Fault_Tolerance_Service (const TAO_Fault_Tolerance_Service &);
 
 private:
-
   /// hook to callback on to the service
   TAO_Service_Callbacks *ft_service_callback_ {};
 };
diff --git a/TAO/tao/Fault_Tolerance_Service.inl b/TAO/tao/Fault_Tolerance_Service.inl
index ef19160391b..832bf39de0d 100644
--- a/TAO/tao/Fault_Tolerance_Service.inl
+++ b/TAO/tao/Fault_Tolerance_Service.inl
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Service_Callbacks *
-TAO_Fault_Tolerance_Service::service_callback (void)
+TAO_Fault_Tolerance_Service::service_callback ()
 {
   return this->ft_service_callback_;
 }
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 66e0dbfb0d9..cf0775a2375 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -33,7 +33,7 @@ TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::
 
 template<typename S_forany,
          template <typename> class Insert_Policy>
-TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array_Clonable_Argument_T (void)
+TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -47,7 +47,7 @@ TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Fixed_Array
 template<typename S_forany,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void)
+TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone ()
 {
   typedef TAO::details::array_traits<S_forany> ARRAY_TRAITS;
   typename ARRAY_TRAITS::slice_type * tmp_ptr = 0;
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index 9f7ac53d101..c6afd417205 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -44,7 +44,7 @@ template<typename S_forany,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
-TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void)
+TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg ()
 {
   return this->x_.inout ();
 }
@@ -65,7 +65,7 @@ template<typename S_forany,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *&
-TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void)
+TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -77,7 +77,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::
-Ret_Fixed_Array_Argument_T (void)
+Ret_Fixed_Array_Argument_T ()
 {}
 
 template<typename S_var,
@@ -85,7 +85,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *&
-TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void)
+TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg ()
 {
   return this->x_._retn_arg ();
 }
@@ -95,7 +95,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
-TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void)
+TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp ()
 {
   return this->x_.ptr ();
 }
@@ -105,7 +105,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
-TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void)
+TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn ()
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 85c9537cb1b..cf3f01779bf 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -31,7 +31,7 @@ TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *a
 
 template<typename S,
          template <typename> class Insert_Policy>
-TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable_Argument_T (void)
+TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -43,7 +43,7 @@ TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Fixed_Size_Clonable
 template<typename S,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void)
+TAO::In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>::clone ()
 {
   S* clone_x = new S (*(this->x_));
   In_Fixed_Size_Clonable_Argument_T<S,Insert_Policy>* clone_arg =
diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl
index 09a8bd2d4c6..e1d79d3bbce 100644
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ b/TAO/tao/Fixed_Size_Argument_T.inl
@@ -42,7 +42,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg ()
 {
   return *this->x_;
 }
@@ -62,7 +62,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -73,7 +73,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::
-Ret_Fixed_Size_Argument_T (void)
+Ret_Fixed_Size_Argument_T ()
 {
 }
 
@@ -81,7 +81,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -90,7 +90,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp ()
 {
   return this->x_;
 }
@@ -99,7 +99,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp
index eb7f16811ec..5d1f212ba8e 100644
--- a/TAO/tao/FlResource/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource/FlResource_Factory.cpp
@@ -7,13 +7,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  FlResource_Factory::FlResource_Factory (void)
+  FlResource_Factory::FlResource_Factory ()
     : reactor_impl_( 0 )
   {
   }
 
   ACE_Reactor_Impl *
-  FlResource_Factory::reactor_impl (void)
+  FlResource_Factory::reactor_impl ()
   {
     // synchronized by external locks
     if (!this->reactor_impl_)
diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h
index 8fe7606ce82..e079c870140 100644
--- a/TAO/tao/FlResource/FlResource_Factory.h
+++ b/TAO/tao/FlResource/FlResource_Factory.h
@@ -43,7 +43,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/FlResource/FlResource_Loader.cpp b/TAO/tao/FlResource/FlResource_Loader.cpp
index 83a1fbfab7f..c7bbee25b17 100644
--- a/TAO/tao/FlResource/FlResource_Loader.cpp
+++ b/TAO/tao/FlResource/FlResource_Loader.cpp
@@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  FlResource_Loader::FlResource_Loader (void)
+  FlResource_Loader::FlResource_Loader ()
   {
     FlResource_Factory *tmp = 0;
 
@@ -17,7 +17,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory (tmp);
   }
 
-  FlResource_Loader::~FlResource_Loader (void)
+  FlResource_Loader::~FlResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/FlResource/FlResource_Loader.h b/TAO/tao/FlResource/FlResource_Loader.h
index 7d4a8dc47ee..d1a3d2ca525 100644
--- a/TAO/tao/FlResource/FlResource_Loader.h
+++ b/TAO/tao/FlResource/FlResource_Loader.h
@@ -25,7 +25,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class FlResource_Loader
    *
@@ -42,11 +41,10 @@ namespace TAO
    */
   class TAO_FlResource_Export FlResource_Loader
   {
-
   public:
-    FlResource_Loader (void);
+    FlResource_Loader ();
 
-    virtual ~FlResource_Loader (void);
+    virtual ~FlResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp
index c3549b3d95f..794abcd15ab 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   FoxResource_Factory::FoxResource_Factory (FXApp *app)
     : reactor_impl_ (0)
     , fxapp_ (app)
@@ -14,7 +13,7 @@ namespace TAO
   }
 
   ACE_Reactor_Impl *
-  FoxResource_Factory::reactor_impl (void)
+  FoxResource_Factory::reactor_impl ()
   {
     if (this->fxapp_ == 0)
       return 0;
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.h b/TAO/tao/FoxResource/FoxResource_Factory.h
index e9c8c6e82ac..d14571a194e 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.h
+++ b/TAO/tao/FoxResource/FoxResource_Factory.h
@@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class FoxResource_Factory
    *
@@ -42,7 +41,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.cpp b/TAO/tao/FoxResource/FoxResource_Loader.cpp
index e60dd560464..795911c83f9 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Loader.cpp
@@ -16,7 +16,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory( tmp );
   }
 
-  FoxResource_Loader::~FoxResource_Loader (void)
+  FoxResource_Loader::~FoxResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.h b/TAO/tao/FoxResource/FoxResource_Loader.h
index 06d1a7dd11b..111f38f4a2d 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.h
+++ b/TAO/tao/FoxResource/FoxResource_Loader.h
@@ -45,11 +45,9 @@ namespace TAO
   class TAO_FoxResource_Export FoxResource_Loader
   {
   public:
-
     FoxResource_Loader (FXApp *app);
 
-    virtual ~FoxResource_Loader (void);
-
+    virtual ~FoxResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 9b42415725f..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;
@@ -1533,7 +1531,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
 
     // request/reply id.
     CORBA::ULong tmp = 0;
-    CORBA::ULong *id = &tmp;
+    CORBA::ULong *id = std::addressof(tmp);
     char *tmp_id = nullptr;
 
     if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::Request ||
@@ -1616,8 +1614,7 @@ TAO_GIOP_Message_Base::is_ready_for_bidirectional (TAO_OutputCDR &msg) const
   msg.get_version (giop_version);
 
   // Get the parser we need to use
-  TAO_GIOP_Message_Generator_Parser *generator_parser =
-    this->get_parser (giop_version);
+  TAO_GIOP_Message_Generator_Parser *generator_parser = this->get_parser (giop_version);
 
   // We dont really know.. So ask the generator and parser objects that
   // we know.
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index 3d5efa6a49d..6243f4ae2e5 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -86,7 +86,6 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply (
   params.locate_reply_status (static_cast <GIOP::LocateStatusType> (locate_reply_status));
 
   return 0;
-
 }
 
 bool
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index aec9acbfd60..6396db7a269 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -476,7 +476,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
             if (!(msg << index))
               return false;
             if (!(msg << *ior))
-              return false;;
+              return false;
           }
         else
           {
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 71f35eef866..46f2c2465b4 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -46,13 +46,13 @@ public:
   const TAO::ObjectKey &object_key () const;
 
   /// Get the object_key in read/write mode..
-  TAO::ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key ();
 
   /// Get the reference to the underlying profile
-  TAO_Tagged_Profile &profile (void);
+  TAO_Tagged_Profile &profile ();
 
   /// Get the CDR stream for read/write
-  TAO_InputCDR &incoming_stream (void);
+  TAO_InputCDR &incoming_stream ();
 
 private:
   /// Request id
diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl
index 4d38b855e10..b32a26cda9b 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.inl
+++ b/TAO/tao/GIOP_Message_Locate_Header.inl
@@ -31,19 +31,19 @@ TAO_GIOP_Locate_Request_Header::object_key () const
 }
 
 ACE_INLINE TAO::ObjectKey &
-TAO_GIOP_Locate_Request_Header::object_key (void)
+TAO_GIOP_Locate_Request_Header::object_key ()
 {
   return this->profile_.object_key ();
 }
 
 ACE_INLINE TAO_Tagged_Profile &
-TAO_GIOP_Locate_Request_Header::profile (void)
+TAO_GIOP_Locate_Request_Header::profile ()
 {
   return this->profile_;
 }
 
 ACE_INLINE TAO_InputCDR &
-TAO_GIOP_Locate_Request_Header::incoming_stream (void)
+TAO_GIOP_Locate_Request_Header::incoming_stream ()
 {
   return *this->incoming_;
 }
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index efdba8c1a79..2add83bc660 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -54,7 +54,7 @@ namespace TAO
      * Please note that this call is NOT synchronized. Left to the
      * higher level versions to synchronize access.
      */
-    virtual ACE_Reactor *get_reactor (void) ;
+    virtual ACE_Reactor *get_reactor () ;
 
     /**
      * Reclaim the reactor if allocated by this factory.
@@ -69,7 +69,7 @@ namespace TAO
      * Please note that this call is NOT synchronized. Left to the
      * get_reactor() to synchronize access.
      */
-    virtual ACE_Reactor_Impl *reactor_impl (void) = 0;
+    virtual ACE_Reactor_Impl *reactor_impl () = 0;
 
   private:
     /**
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index 07a46d0d6f4..46e48aa5189 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -65,7 +65,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T,
          class ALLOCATION_TRAITS,
          class ELEMENT_TRAITS>
diff --git a/TAO/tao/HR_Time_Policy_Strategy.h b/TAO/tao/HR_Time_Policy_Strategy.h
index 931994b6210..7765560d5ae 100644
--- a/TAO/tao/HR_Time_Policy_Strategy.h
+++ b/TAO/tao/HR_Time_Policy_Strategy.h
@@ -41,11 +41,11 @@ class TAO_Export TAO_HR_Time_Policy_Strategy
 public:
   virtual ~TAO_HR_Time_Policy_Strategy ();
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void);
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy ();
 
 private:
   static ACE_Time_Policy_T<ACE_HR_Time_Policy>  time_policy_;
diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp
index 80938aac971..d353a5a5820 100644
--- a/TAO/tao/HTTP_Client.cpp
+++ b/TAO/tao/HTTP_Client.cpp
@@ -43,7 +43,6 @@ TAO_HTTP_Client::read (ACE_Message_Block *mb)
     }
 
   return ACE_Utils::truncate_cast<int> (HTTP_reader.byte_count ());
-
 }
 
 int
diff --git a/TAO/tao/HTTP_Client.h b/TAO/tao/HTTP_Client.h
index b836e33e806..e0a1ee6a6f6 100644
--- a/TAO/tao/HTTP_Client.h
+++ b/TAO/tao/HTTP_Client.h
@@ -50,8 +50,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_HTTP_Client
 {
 public:
-  TAO_HTTP_Client (void);
-  ~TAO_HTTP_Client (void);
+  TAO_HTTP_Client ();
+  ~TAO_HTTP_Client ();
 
   /// Initializes the class with the given filename, hostname and port.
   /// it should be called with the filename, before any read/write calls
@@ -75,7 +75,6 @@ private:
 
   /// The connector endpoint to initiate the client connection
   ACE_Connector<TAO_HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp
index 87d6184c7a2..a2b9b3a2c10 100644
--- a/TAO/tao/HTTP_Handler.cpp
+++ b/TAO/tao/HTTP_Handler.cpp
@@ -43,7 +43,6 @@ TAO_HTTP_Handler::open (void *)
   if (this->receive_reply () != 0)
     TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1);
   return 0;
-
 }
 
 int
@@ -134,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
     {
@@ -183,7 +181,6 @@ TAO_HTTP_Reader::receive_reply ()
 
       // Increment bytes_read
       bytes_read += num_recvd;
-
     }
   else
     {
diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h
index 60bc2d2869f..4baf60fb1d8 100644
--- a/TAO/tao/HTTP_Handler.h
+++ b/TAO/tao/HTTP_Handler.h
@@ -40,7 +40,7 @@ class TAO_Export TAO_HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE
 {
 public:
   /// Null constructor, insures that it works properly with Connector
-  TAO_HTTP_Handler (void);
+  TAO_HTTP_Handler ();
 
   /// Always use this constructor to make HTTP_Handlers
   TAO_HTTP_Handler (ACE_Message_Block *mb,
@@ -55,11 +55,11 @@ public:
   /// Close down the Blob
   virtual int close (u_long flags = 0);
 
-  ~TAO_HTTP_Handler (void);
+  ~TAO_HTTP_Handler ();
 
 protected:
-  virtual int send_request (void);
-  virtual int receive_reply (void);
+  virtual int send_request ();
+  virtual int receive_reply ();
 
   ACE_Message_Block *mb_;
   ACE_TCHAR *filename_;
@@ -85,8 +85,8 @@ public:
 
 private:
   //NOTE: these functions return -1 on error
-  int send_request (void);
-  int receive_reply (void);
+  int send_request ();
+  int receive_reply ();
   const char *request_prefix_;
   const char *request_suffix_;
 };
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 38082de9354..f4dafe938a2 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IFR_Client_Adapter_Impl::~TAO_IFR_Client_Adapter_Impl (void)
+TAO_IFR_Client_Adapter_Impl::~TAO_IFR_Client_Adapter_Impl ()
 {
 }
 
@@ -155,7 +155,7 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_IFR_Client_Adapter_Impl::Initializer (void)
+TAO_IFR_Client_Adapter_Impl::Initializer ()
 {
   TAO_ORB_Core::ifr_client_adapter_name ("Concrete_IFR_Client_Adapter");
 
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index 03524d88fd1..921b6ac6750 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -39,7 +39,7 @@ class TAO_IFR_CLIENT_Export TAO_IFR_Client_Adapter_Impl
   : public TAO_IFR_Client_Adapter
 {
 public:
-  virtual ~TAO_IFR_Client_Adapter_Impl (void);
+  virtual ~TAO_IFR_Client_Adapter_Impl ();
 
   virtual CORBA::Boolean interfacedef_cdr_insert (
       TAO_OutputCDR &cdr,
@@ -66,7 +66,7 @@ public:
 #endif /*TAO_HAS_MINIMUM_CORBA*/
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 682bbf03b0b..0362bb59c83 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -367,7 +367,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
           TAOLIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - ")
                       ACE_TEXT ("IIOP_Acceptor::open, ")
-                      ACE_TEXT ("Overriding address in IOR with %C\n"),
+                      ACE_TEXT ("overriding address in IOR with %C\n"),
                       this->hostname_in_ior_));
         }
       specified_hostname = this->hostname_in_ior_;
@@ -596,8 +596,8 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
     {
       if (TAO_debug_level >= 5)
           TAOLIB_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor - ")
-                      ACE_TEXT ("Overriding the hostname with <%C>\n"),
+                      ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::hostname, ")
+                      ACE_TEXT ("overriding the hostname with <%C>\n"),
                       this->hostname_in_ior_));
 
       host = CORBA::string_dup (this->hostname_in_ior_);
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 124d7f78697..d2d11311186 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -46,17 +46,17 @@ class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_IIOP_Acceptor (void);
+  TAO_IIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_IIOP_Acceptor (void);
+  ~TAO_IIOP_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   /// Returns address for default endpoint
   const ACE_INET_Addr& default_address () const;
@@ -84,12 +84,12 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/tao/IIOP_Acceptor.inl b/TAO/tao/IIOP_Acceptor.inl
index b5ca077b2aa..2b9ce3418e7 100644
--- a/TAO/tao/IIOP_Acceptor.inl
+++ b/TAO/tao/IIOP_Acceptor.inl
@@ -17,7 +17,7 @@ TAO_IIOP_Acceptor::address () const
 }
 
 ACE_INLINE const ACE_INET_Addr *
-TAO_IIOP_Acceptor::endpoints (void)
+TAO_IIOP_Acceptor::endpoints ()
 {
   ACE_ASSERT (this->addrs_ != 0);
 
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 55126126816..a5734c7d8d3 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #ifdef TAO_LOG_CH_REF_COUNTS
 ACE_Event_Handler::Reference_Count
-TAO_IIOP_Connection_Handler::add_reference (void)
+TAO_IIOP_Connection_Handler::add_reference ()
 {
   Reference_Count rc = TAO_IIOP_SVC_HANDLER::add_reference ();
   if (TAO_debug_level > 9)
@@ -34,11 +34,10 @@ TAO_IIOP_Connection_Handler::add_reference (void)
                   rc));
     }
   return rc;
-
 }
 
 ACE_Event_Handler::Reference_Count
-TAO_IIOP_Connection_Handler::remove_reference (void)
+TAO_IIOP_Connection_Handler::remove_reference ()
 {
   TAO_Transport *tport = this->transport ();
   Reference_Count rc = TAO_IIOP_SVC_HANDLER::remove_reference ();
@@ -543,7 +542,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
                       listen_point.host.in ()));
         }
 
-      // Construct an  IIOP_Endpoint object using the host as provided
+      // Construct an IIOP_Endpoint object using the host as provided
       // in the listen point list.  We must use host in that form because
       // that's also how the ORB on the other side will advertise the host
       // in an IOR.
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index 3a0f5e9c1e9..84eec039289 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -56,12 +56,10 @@ namespace IIOP
 class TAO_Export TAO_IIOP_Connection_Handler : public TAO_IIOP_SVC_HANDLER,
                                                public TAO_Connection_Handler
 {
-
 public:
-
 #ifdef TAO_LOG_CH_REF_COUNTS
-  Reference_Count add_reference (void);
-  Reference_Count remove_reference (void);
+  Reference_Count add_reference ();
+  Reference_Count remove_reference ();
 #endif
 
   TAO_IIOP_Connection_Handler (ACE_Thread_Manager * = 0);
@@ -70,7 +68,7 @@ public:
   TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_IIOP_Connection_Handler (void);
+  ~TAO_IIOP_Connection_Handler ();
 
   /// Called by the @c Strategy_Acceptor when the handler is completely
   /// connected.  Argument is unused.
@@ -83,8 +81,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -93,13 +91,13 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   /// Process the @a listen_list
   int process_listen_point_list (IIOP::ListenPointList &listen_list);
 
   /// Check if network priority needs to be enabled
-  int enable_network_priority (void);
+  int enable_network_priority ();
 
   /// Set Diff-Serv codepoint on outgoing packets.
   int set_dscp_codepoint (CORBA::Boolean set_network_priority);
@@ -110,15 +108,14 @@ public:
   /// This is used during a canceled connection attempt. Force the
   /// SO_LINGER timeout to 0 so that when the peer is closed, it won't
   /// hang around.
-  void abort (void);
+  void abort ();
 
 protected:
-
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   //@}
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 7012aac3152..6ea3956f64e 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -51,15 +51,15 @@ class TAO_Export TAO_IIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_IIOP_Connector (void);
+  TAO_IIOP_Connector ();
 
   /// Destructor.
-  ~TAO_IIOP_Connector (void);
+  ~TAO_IIOP_Connector ();
 
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
   virtual int check_prefix (const char *endpoint);
@@ -104,7 +104,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
@@ -131,7 +131,6 @@ private:
                                       ACE_Time_Value *timeout = 0);
 
 
-
   /// Return the remote endpoint, a helper function
   TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 3f4dbfc101c..3389f4e5459 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -100,7 +100,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
 TAO_IIOP_Endpoint &
 TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other)
 {
-  if (this != &other)
+  if (this != std::addressof(other))
     {
       this->host_ = other.host_;
       this->port_ = other.port_;
@@ -116,10 +116,6 @@ TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other)
   return *this;
 }
 
-TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint ()
-{
-}
-
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
   : TAO_Endpoint (rhs.tag_, rhs.priority_)
   , host_ (rhs.host_)
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index d8f7647c6a5..95c4a23b2b7 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -50,7 +50,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_IIOP_Endpoint (void);
+  TAO_IIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -69,13 +69,12 @@ public:
                      CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_IIOP_Endpoint (void);
-
+  ~TAO_IIOP_Endpoint () = default;
 
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
 
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
 
   /**
    * Return the next endpoint in the list, but use protocol-specific
@@ -97,14 +96,14 @@ public:
   virtual int addr_to_string (char *buffer, size_t length);
 
   /// Makes a copy of @c this
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
+  virtual CORBA::ULong hash ();
 
   // = IIOP_Endpoint-specific methods.
 
@@ -183,7 +182,6 @@ private:
   TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &);
 
 private:
-
   /// String representing the host name.
   CORBA::String_var host_;
 
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index d912f287795..5d18f450516 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -33,8 +33,8 @@ class TAO_Connector;
 class TAO_Export TAO_IIOP_Protocol_Factory : public TAO_Protocol_Factory
 {
 public:
-  TAO_IIOP_Protocol_Factory (void);
-  virtual ~TAO_IIOP_Protocol_Factory (void);
+  TAO_IIOP_Protocol_Factory ();
+  virtual ~TAO_IIOP_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -51,8 +51,8 @@ public:
   virtual char options_delimiter () const;
 
   // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
 };
 
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/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 98248d2b542..a619734ccb8 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -45,7 +45,7 @@ public:
   static const char object_key_delimiter_;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -93,25 +93,25 @@ public:
 
   /// Encode endpoints for RT profiles, using a single TAO_TAG_ENDPOINT
   /// component.
-  virtual int encode_endpoints (void);
+  virtual int encode_endpoints ();
 
   /// Encode alternate endpoints for non-RT profiles, using multiple
   /// TAG_ALTERNATE_IIOP_ADDRESS components, one endpoint per component
-  virtual int encode_alternate_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_alternate_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
 
   /// Since SSLIOP_Profile derives from IIOP_Profile, but SSLIOP_Endpoint
   /// does not derive from IIOP_Endpoint, it is necessary to have a way
   /// of always getting the IIOP_Endpoint using a generic interface
   /// regardless of the final type of the profile.
-  virtual TAO_Endpoint *base_endpoint (void);
+  virtual TAO_Endpoint *base_endpoint ();
 
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
 
 protected:
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_IIOP_Profile (void);
+  ~TAO_IIOP_Profile ();
 
   /**
    * Helper method for encode_endpoints to deal with RT requests.
@@ -126,11 +126,11 @@ protected:
    * encapsulation of a sequence of structs, each representing a
    * single endpoint.  Data format is specified in iiop_endpoins.pidl.
    */
-  int encode_endpoints_for_rt (void);
+  int encode_endpoints_for_rt ();
 
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index bb63d2ce313..0cc555091ad 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -356,8 +356,7 @@ TAO_IIOP_Transport::get_listen_point (
   // been established. If this is wrong, please correct me.
 
   ACE_INET_Addr local_addr;
-  if (this->connection_handler_->peer ().get_local_addr (local_addr)
-      == -1)
+  if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1)
     {
       TAOLIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 63d3496d6b4..09c147dbe85 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -60,7 +60,7 @@ protected:
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  virtual ~TAO_IIOP_Transport (void);
+  virtual ~TAO_IIOP_Transport ();
 
   /** @name Overridden Template Methods
    *
@@ -68,8 +68,7 @@ protected:
    * details.
    */
   //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
 
   virtual ssize_t send (iovec *iov, int iovcnt,
                         size_t &bytes_transferred,
@@ -108,7 +107,7 @@ public:
 
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
-  virtual TAO_Connection_Handler * connection_handler_i (void);
+  virtual TAO_Connection_Handler * connection_handler_i ();
   //@}
 
 private:
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index 938b6fe61fa..8ad96eb55c4 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -18,7 +18,7 @@ TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
 {
 }
 
-TAO_IORInfo::~TAO_IORInfo (void)
+TAO_IORInfo::~TAO_IORInfo ()
 {
 }
 
@@ -68,7 +68,7 @@ TAO_IORInfo::add_ior_component_to_profile (
 }
 
 char *
-TAO_IORInfo::manager_id (void)
+TAO_IORInfo::manager_id ()
 {
   this->check_validity ();
 
@@ -77,7 +77,7 @@ TAO_IORInfo::manager_id (void)
 }
 
 PortableInterceptor::AdapterState
-TAO_IORInfo::state (void)
+TAO_IORInfo::state ()
 {
   this->check_validity ();
 
@@ -85,7 +85,7 @@ TAO_IORInfo::state (void)
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
-TAO_IORInfo::adapter_template (void)
+TAO_IORInfo::adapter_template ()
 {
   this->check_validity ();
 
@@ -106,7 +106,7 @@ TAO_IORInfo::adapter_template (void)
 }
 
 PortableInterceptor::ObjectReferenceFactory *
-TAO_IORInfo::current_factory (void)
+TAO_IORInfo::current_factory ()
 {
   this->check_validity ();
 
@@ -136,7 +136,7 @@ TAO_IORInfo::current_factory (
 }
 
 void
-TAO_IORInfo::check_validity (void)
+TAO_IORInfo::check_validity ()
 {
   if (this->poa_ == 0)
     {
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index add90ed5270..7ce42e6ee7c 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -54,7 +54,6 @@ public:
    * Methods exposed by the PortableInterceptor::IORInfo interface.
    */
   //@{
-
   /// Return the policy matching the given policy type that is in
   /// effect for the object whose IOR is being created.
   virtual CORBA::Policy_ptr get_effective_policy (CORBA::PolicyType type);
@@ -68,13 +67,13 @@ public:
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id);
 
-  virtual char * manager_id (void);
+  virtual char * manager_id ();
 
-  virtual PortableInterceptor::AdapterState state (void);
+  virtual PortableInterceptor::AdapterState state ();
 
-  virtual PortableInterceptor::ObjectReferenceTemplate *adapter_template (void);
+  virtual PortableInterceptor::ObjectReferenceTemplate *adapter_template ();
 
-  virtual PortableInterceptor::ObjectReferenceFactory *current_factory (void);
+  virtual PortableInterceptor::ObjectReferenceFactory *current_factory ();
 
   virtual void current_factory (
       PortableInterceptor::ObjectReferenceFactory * current_factory);
@@ -86,7 +85,7 @@ public:
    * Once the IOR interception points have been invoked, this IORInfo
    * instance is no longer valid.
    */
-  void invalidate (void);
+  void invalidate ();
 
   /// Inform the this IORInfo object that the
   /// IORInterceptor::components_established() interception point has
@@ -97,12 +96,12 @@ public:
    * are invalid.  They are only valid in the
    * IORInterceptor::establish_components() interception point.
    */
-  void components_established (void);
+  void components_established ();
 
 protected:
   /// Protected destructor to enforce proper memory management through
   /// the reference counting mechanism.
-  ~TAO_IORInfo (void);
+  ~TAO_IORInfo ();
 
   /// Check if this IORInfo instance is valid.
   /**
@@ -110,7 +109,7 @@ protected:
    * this IORInfo object is no longer valid.  Throw an exception in
    * that case.
    */
-  void check_validity (void);
+  void check_validity ();
 
 private:
   TAO_IORInfo (const TAO_IORInfo &) = delete;
diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl
index 645750acf18..2a8ad1ac007 100644
--- a/TAO/tao/IORInterceptor/IORInfo.inl
+++ b/TAO/tao/IORInterceptor/IORInfo.inl
@@ -3,13 +3,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-TAO_IORInfo::invalidate (void)
+TAO_IORInfo::invalidate ()
 {
   this->poa_ = 0;
 }
 
 ACE_INLINE void
-TAO_IORInfo::components_established (void)
+TAO_IORInfo::components_established ()
 {
   this->components_established_ = true;
 }
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 3264348c172..837c4f852ea 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -7,12 +7,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInterceptor_Adapter_Factory_Impl::~
-  TAO_IORInterceptor_Adapter_Factory_Impl (void)
+  TAO_IORInterceptor_Adapter_Factory_Impl ()
 {
 }
 
 TAO_IORInterceptor_Adapter *
-TAO_IORInterceptor_Adapter_Factory_Impl::create (void)
+TAO_IORInterceptor_Adapter_Factory_Impl::create ()
 {
   TAO_IORInterceptor_Adapter_Impl *nia = 0;
   ACE_NEW_THROW_EX (nia,
@@ -28,7 +28,7 @@ TAO_IORInterceptor_Adapter_Factory_Impl::create (void)
 // Initialization and registration of dynamic service object.
 
 int
-TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
+TAO_IORInterceptor_Adapter_Factory_Impl::Initializer ()
 {
   TAO_ORB_Core::iorinterceptor_adapter_factory_name (
     "Concrete_IORInterceptor_Adapter_Factory");
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index 116c7662729..adb68179abd 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -39,12 +39,12 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl
   : public TAO_IORInterceptor_Adapter_Factory
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void);
+  virtual ~TAO_IORInterceptor_Adapter_Factory_Impl ();
 
-  virtual TAO_IORInterceptor_Adapter *create (void);
+  virtual TAO_IORInterceptor_Adapter *create ();
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index a56217e32dd..d4aa38b8341 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
+TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO_IORInterceptor_Adapter_Impl::add_interceptor (
 }
 
 void
-TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (void)
+TAO_IORInterceptor_Adapter_Impl::destroy_interceptors ()
 {
   this->ior_interceptor_list_.destroy_interceptors ();
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 94676c82abc..8d93549faa6 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -49,7 +49,7 @@ class TAO_IORInterceptor_Adapter_Impl
   : public TAO_IORInterceptor_Adapter
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter_Impl (void);
+  virtual ~TAO_IORInterceptor_Adapter_Impl ();
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor);
@@ -58,7 +58,7 @@ public:
       PortableInterceptor::IORInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies);
 
-  virtual void destroy_interceptors (void);
+  virtual void destroy_interceptors ();
 
   virtual void establish_components (TAO_Root_POA *poa );
 
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
index c446c802a16..c963caeda4e 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -39,9 +39,9 @@ class TAO_Export TAO_IORInterceptor_Adapter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter_Factory (void);
+  virtual ~TAO_IORInterceptor_Adapter_Factory ();
 
-  virtual TAO_IORInterceptor_Adapter * create (void) = 0;
+  virtual TAO_IORInterceptor_Adapter * create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.cpp b/TAO/tao/IORManipulation/IORManip_Filter.cpp
index eb2539bc8f9..5756653eb91 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Filter.cpp
@@ -6,12 +6,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORManip_Filter::TAO_IORManip_Filter (void)
+TAO_IORManip_Filter::TAO_IORManip_Filter ()
 {
 }
 
 
-TAO_IORManip_Filter::~TAO_IORManip_Filter (void)
+TAO_IORManip_Filter::~TAO_IORManip_Filter ()
 {
 }
 
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.h b/TAO/tao/IORManipulation/IORManip_Filter.h
index 25a319eff9b..5896182f454 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.h
+++ b/TAO/tao/IORManipulation/IORManip_Filter.h
@@ -38,10 +38,10 @@ class TAO_IORManip_Export TAO_IORManip_Filter
 {
 public:
   /// Constructor.
-  TAO_IORManip_Filter (void);
+  TAO_IORManip_Filter ();
 
   /// Destructor.
-  virtual ~TAO_IORManip_Filter (void);
+  virtual ~TAO_IORManip_Filter ();
 
   /// Perform filtering using the profile passed in as a guide.
   /// If no profile is provided, filter using the profile_matches() method.
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
index 0e1df9788a3..fe3ef5fe0c6 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
@@ -10,12 +10,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORManip_IIOP_Filter::TAO_IORManip_IIOP_Filter (void)
+TAO_IORManip_IIOP_Filter::TAO_IORManip_IIOP_Filter ()
 {
 }
 
 
-TAO_IORManip_IIOP_Filter::~TAO_IORManip_IIOP_Filter (void)
+TAO_IORManip_IIOP_Filter::~TAO_IORManip_IIOP_Filter ()
 {
 }
 
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
index 0b606e23f95..42b84878526 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
@@ -42,10 +42,10 @@ public:
   };
 
   /// Constructor.
-  TAO_IORManip_IIOP_Filter (void);
+  TAO_IORManip_IIOP_Filter ();
 
   /// Destructor.
-  virtual ~TAO_IORManip_IIOP_Filter (void);
+  virtual ~TAO_IORManip_IIOP_Filter ();
 
   /// Compares the profile to the profile info.
   virtual CORBA::Boolean compare_profile_info (
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index 11fd191b7b6..fff1b577e8e 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORManip_Loader::TAO_IORManip_Loader (void)
+TAO_IORManip_Loader::TAO_IORManip_Loader ()
 {
 }
 
@@ -20,7 +20,7 @@ TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[])
 }
 
 int
-TAO_IORManip_Loader::Initializer (void)
+TAO_IORManip_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader);
 }
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index 3acc58d28a9..18e970fca5f 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -28,7 +28,7 @@ class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
-  TAO_IORManip_Loader (void);
+  TAO_IORManip_Loader ();
 
   /// Creates a IORManip factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
@@ -36,7 +36,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 8eac641e59e..e9122d13c5e 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -11,11 +11,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
+TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl ()
 {
 }
 
-TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
+TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl ()
 {
 }
 
@@ -55,8 +55,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
   for (i = 1; i < iors.length () ; i++)
     {
       // this gets a copy of the MProfile, hence the auto_ptr;
-      ACE_auto_ptr_reset (tmp_pfiles,
-                          iors[i]->_stubobj ()->make_profiles ());
+      tmp_pfiles.reset (iors[i]->_stubobj ()->make_profiles ());
 
       // check to see if any of the profiles in tmp_pfiles are already
       // in Merged_Profiles.  If so raise exception.
@@ -183,8 +182,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   // Now we can remove the profiles which we want to eliminate from
   // the Object.
-  ACE_auto_ptr_reset (tmp_pfiles,
-                      ior2->_stubobj ()->make_profiles ());
+  tmp_pfiles.reset (ior2->_stubobj ()->make_profiles ());
 
   TAO_MProfile& mp = stub -> base_profiles();
   if (mp.remove_profiles (tmp_pfiles.get ()) < 0)
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 11b0c62e4ca..e6627234f95 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -37,9 +37,8 @@ class TAO_IOR_Manipulation_impl
     public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor
-  TAO_IOR_Manipulation_impl (void);
+  TAO_IOR_Manipulation_impl ();
 
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors);
@@ -78,7 +77,7 @@ public:
 
 protected:
   /// Destructor
-  ~TAO_IOR_Manipulation_impl (void);
+  ~TAO_IOR_Manipulation_impl ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/Async_IORTable.cpp b/TAO/tao/IORTable/Async_IORTable.cpp
index 762d66d249d..181480efeea 100644
--- a/TAO/tao/IORTable/Async_IORTable.cpp
+++ b/TAO/tao/IORTable/Async_IORTable.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Async_IORTable_Initializer::init (void)
+TAO_Async_IORTable_Initializer::init ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Async_Table_Adapter_Factory);
 }
diff --git a/TAO/tao/IORTable/Async_IORTable.h b/TAO/tao/IORTable/Async_IORTable.h
index 8cb08364839..6eeebf99c42 100644
--- a/TAO/tao/IORTable/Async_IORTable.h
+++ b/TAO/tao/IORTable/Async_IORTable.h
@@ -29,7 +29,7 @@ class TAO_Async_IORTable_Export TAO_Async_IORTable_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
index d467760a738..e343a903b12 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
@@ -11,11 +11,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl (void)
+TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl ()
 {
 }
 
-TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl (void)
+TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
index 956e24ef602..e5ce2e137a6 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
@@ -38,10 +38,10 @@ class TAO_Async_IOR_Table_Impl : public virtual TAO_IOR_Table_Impl
 {
 public:
   /// Constructor
-  TAO_Async_IOR_Table_Impl (void);
-  virtual ~TAO_Async_IOR_Table_Impl (void);
+  TAO_Async_IOR_Table_Impl ();
+  virtual ~TAO_Async_IOR_Table_Impl ();
 
-  virtual bool async_available (void) { return true; }
+  virtual bool async_available () { return true; }
 
   virtual void async_find (::IORTable::Locate_ResponseHandler rh,
                            const char *object_key);
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.cpp b/TAO/tao/IORTable/Async_Table_Adapter.cpp
index 92ae3ea2a87..7fb88ec03a5 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Async_Table_Adapter.cpp
@@ -23,12 +23,12 @@ TAO_Async_Table_Adapter::TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter (void)
+TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter ()
 {
 }
 
 void
-TAO_Async_Table_Adapter::open (void)
+TAO_Async_Table_Adapter::open ()
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   TAO_Async_IOR_Table_Impl *impl = 0;
@@ -99,7 +99,7 @@ TAO_Async_Table_Adapter::find_object (IORTable::Locate_ResponseHandler rh,
 
 // ****************************************************************
 
-TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory (void)
+TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.h b/TAO/tao/IORTable/Async_Table_Adapter.h
index 330445362d1..8c6a558e9b3 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.h
+++ b/TAO/tao/IORTable/Async_Table_Adapter.h
@@ -32,11 +32,11 @@ public:
   TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core);
 
   /// Destructor
-  virtual ~TAO_Async_Table_Adapter (void);
+  virtual ~TAO_Async_Table_Adapter ();
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (void);
+  virtual void open ();
 
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
@@ -55,7 +55,7 @@ class TAO_Async_IORTable_Export TAO_Async_Table_Adapter_Factory :
 {
 public:
   /// Constructor
-  TAO_Async_Table_Adapter_Factory (void);
+  TAO_Async_Table_Adapter_Factory ();
 
   /// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   /// details.
diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp
index ae5d20342cb..d4c63ec8ebc 100644
--- a/TAO/tao/IORTable/IORTable.cpp
+++ b/TAO/tao/IORTable/IORTable.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_IORTable_Initializer::init (void)
+TAO_IORTable_Initializer::init ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory);
 }
diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h
index edc17a37cf4..1dccde36fe6 100644
--- a/TAO/tao/IORTable/IORTable.h
+++ b/TAO/tao/IORTable/IORTable.h
@@ -29,7 +29,7 @@ class TAO_IORTable_Export TAO_IORTable_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static int
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index a30cb93701e..8137e5d1eb7 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -28,7 +28,7 @@ TAO::Objref_Traits <TAO_IOR_Table_Impl>::release (TAO_IOR_Table_Impl_ptr p)
 }
 
 TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil (void)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil ()
 {
   return TAO_IOR_Table_Impl::_nil ();
 }
@@ -40,7 +40,7 @@ TAO::Objref_Traits <TAO_IOR_Table_Impl>::marshal (const TAO_IOR_Table_Impl_ptr,
   return false;
 }
 
-TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
+TAO_IOR_Table_Impl::TAO_IOR_Table_Impl ()
 {
 }
 
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index be602fb44f6..01f1d36cb74 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -98,7 +98,7 @@ namespace TAO
 
     static void release (TAO_IOR_Table_Impl_ptr);
 
-    static TAO_IOR_Table_Impl_ptr nil (void);
+    static TAO_IOR_Table_Impl_ptr nil ();
 
     static ::CORBA::Boolean marshal (const TAO_IOR_Table_Impl_ptr p,
                                      TAO_OutputCDR &cdr);
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index b2a8384ff51..021233b2b9f 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
@@ -38,7 +38,7 @@ TAO_AMH_Locate_ResponseHandler::TAO_AMH_Locate_ResponseHandler (
   this->init (sr,0);
 }
 
-TAO_AMH_Locate_ResponseHandler::~TAO_AMH_Locate_ResponseHandler (void)
+TAO_AMH_Locate_ResponseHandler::~TAO_AMH_Locate_ResponseHandler ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h
index f07c884b168..34456416143 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.h
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.h
@@ -48,11 +48,11 @@ typedef TAO_AMH_Locate_ResponseHandler *TAO_AMH_Locate_ResponseHandler_ptr;
 class TAO_Async_IORTable_Export TAO_AMH_Locate_ResponseHandler_var
 {
 public:
-  TAO_AMH_Locate_ResponseHandler_var (void);
+  TAO_AMH_Locate_ResponseHandler_var ();
   TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_Locate_ResponseHandler_ptr);
   TAO_AMH_Locate_ResponseHandler_var (
       const TAO_AMH_Locate_ResponseHandler_var &);
-  ~TAO_AMH_Locate_ResponseHandler_var (void);
+  ~TAO_AMH_Locate_ResponseHandler_var ();
 
   TAO_AMH_Locate_ResponseHandler_var &operator= (
       TAO_AMH_Locate_ResponseHandler_ptr);
@@ -64,9 +64,9 @@ public:
   operator TAO_AMH_Locate_ResponseHandler_ptr &();
 
   TAO_AMH_Locate_ResponseHandler_ptr in () const;
-  TAO_AMH_Locate_ResponseHandler_ptr &inout (void);
-  TAO_AMH_Locate_ResponseHandler_ptr &out (void);
-  TAO_AMH_Locate_ResponseHandler_ptr _retn (void);
+  TAO_AMH_Locate_ResponseHandler_ptr &inout ();
+  TAO_AMH_Locate_ResponseHandler_ptr &out ();
+  TAO_AMH_Locate_ResponseHandler_ptr _retn ();
   TAO_AMH_Locate_ResponseHandler_ptr ptr () const;
 
 private:
@@ -102,7 +102,7 @@ public:
   typedef TAO_AMH_Locate_ResponseHandler_var _var_type;
 
   TAO_AMH_Locate_ResponseHandler (TAO_ServerRequest &sr);
-  ~TAO_AMH_Locate_ResponseHandler (void);
+  ~TAO_AMH_Locate_ResponseHandler ();
 
   virtual void raise_excep (const CORBA::Exception &ex);
 
@@ -134,7 +134,6 @@ namespace IORTable
 {
   // satisfy the native type requirement for the asnyc locate interface
   typedef const TAO_AMH_Locate_ResponseHandler_var &Locate_ResponseHandler;
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl
index 0049174c13a..129c89310ba 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.inl
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl
@@ -15,7 +15,7 @@ TAO_AMH_Locate_ResponseHandler::_duplicate (TAO_AMH_Locate_ResponseHandler_ptr x
 
 // Inline operations for class TAO_AMH_Locate_ResponseHandler_var
 ACE_INLINE
-TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (void)
+TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var ()
   : ptr_ (TAO_AMH_Locate_ResponseHandler::_nil ())
 {
 }
@@ -26,7 +26,7 @@ TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_
 {}
 
 ACE_INLINE
-TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var (void)
+TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var ()
 {
   CORBA::release(ptr_);
 }
@@ -86,13 +86,13 @@ TAO_AMH_Locate_ResponseHandler_var::in () const
 }
 
 ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr &
-TAO_AMH_Locate_ResponseHandler_var::inout (void)
+TAO_AMH_Locate_ResponseHandler_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr &
-TAO_AMH_Locate_ResponseHandler_var::out (void)
+TAO_AMH_Locate_ResponseHandler_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = TAO_AMH_Locate_ResponseHandler::_nil ();
@@ -100,7 +100,7 @@ TAO_AMH_Locate_ResponseHandler_var::out (void)
 }
 
 ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr
-TAO_AMH_Locate_ResponseHandler_var::_retn (void)
+TAO_AMH_Locate_ResponseHandler_var::_retn ()
 {
   // yield ownership
   TAO_AMH_Locate_ResponseHandler_ptr val = this->ptr_;
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index f6240e35da4..60d8c629706 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -26,7 +26,7 @@ TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO_Table_Adapter::~TAO_Table_Adapter (void)
+TAO_Table_Adapter::~TAO_Table_Adapter ()
 {
   delete this->lock_;
 }
@@ -43,7 +43,7 @@ TAO_Table_Adapter::create_lock (TAO_SYNCH_MUTEX &thread_lock)
 }
 
 void
-TAO_Table_Adapter::open (void)
+TAO_Table_Adapter::open ()
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   TAO_IOR_Table_Impl *impl = 0;
@@ -95,7 +95,7 @@ TAO_Table_Adapter::name () const
 }
 
 CORBA::Object_ptr
-TAO_Table_Adapter::root (void)
+TAO_Table_Adapter::root ()
 {
   return CORBA::Object::_duplicate (this->root_.in());
 }
@@ -117,7 +117,6 @@ TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
                                      stub->is_collocated (),
                                      stub->collocated_servant ()),
                       CORBA::Object::_nil ());
-
     }
 
   return result;
@@ -190,7 +189,7 @@ TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
 
 // ****************************************************************
 
-TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void)
+TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 6b0e775a3b3..071709e8a88 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -32,16 +32,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter
 {
 public:
-
   /// Constructor
   TAO_Table_Adapter (TAO_ORB_Core &orb_core);
 
   /// Destructor
-  virtual ~TAO_Table_Adapter (void);
+  virtual ~TAO_Table_Adapter ();
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (void);
+  virtual void open ();
   virtual void close (int wait_for_completion);
   virtual void check_close (int wait_for_completion);
   virtual int priority () const;
@@ -50,7 +49,7 @@ public:
                         CORBA::Object_out foward_to);
 
   virtual const char *name () const;
-  virtual CORBA::Object_ptr root (void);
+  virtual CORBA::Object_ptr root ();
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
@@ -80,7 +79,7 @@ class TAO_IORTable_Export TAO_Table_Adapter_Factory : public TAO_Adapter_Factory
 {
 public:
   /// Constructor
-  TAO_Table_Adapter_Factory (void);
+  TAO_Table_Adapter_Factory ();
 
   /// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   /// details.
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index a2c429cb4a3..4e6b3ad6891 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -208,7 +208,7 @@ namespace TAO
 {
   namespace ImR_Client
   {
-    ImR_Client_Adapter_Impl::ImR_Client_Adapter_Impl (void)
+    ImR_Client_Adapter_Impl::ImR_Client_Adapter_Impl ()
      : server_object_ (0)
     {
     }
@@ -451,7 +451,7 @@ namespace TAO
     // Initialization and registration of dynamic service object.
 
     int
-    ImR_Client_Adapter_Impl::Initializer (void)
+    ImR_Client_Adapter_Impl::Initializer ()
     {
       TAO_Root_POA::imr_client_adapter_name (
         "Concrete_ImR_Client_Adapter");
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
index 94acb032f72..0139e8372f5 100644
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ b/TAO/tao/ImR_Client/ImR_Client.h
@@ -46,10 +46,10 @@ namespace TAO
     {
     public:
       /// Constructor.
-      ImR_Client_Adapter_Impl (void);
+      ImR_Client_Adapter_Impl ();
 
       /// Used to force the initialization of the PortableServer code.
-      static int Initializer (void);
+      static int Initializer ();
 
       /// ImplRepo helper method, notify the ImplRepo on startup
       virtual void imr_notify_startup (TAO_Root_POA* poa);
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index ac871f10bdb..050cf12341c 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -12,12 +12,12 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
 }
 
 void
-ServerObject_i::ping (void)
+ServerObject_i::ping ()
 {
 }
 
 void
-ServerObject_i::shutdown (void)
+ServerObject_i::shutdown ()
 {
   // Note : We want our child POAs to be able to unregister themselves from
   // the ImR, so we must destroy them before shutting down the orb.
@@ -26,7 +26,7 @@ ServerObject_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-ServerObject_i::_default_POA (void)
+ServerObject_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
index d3df7a0bd3e..a75b2092807 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -42,13 +42,13 @@ public:
   ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /// Ping method.
-  void ping (void);
+  void ping ();
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Returns the default POA for this servant.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 protected:
   /// Our ORB.  We need this member in case we need to shutdown the
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index fd128efea0c..523b212c8f5 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -50,7 +50,6 @@ class TAO_Transport;
 class TAO_Export TAO_Incoming_Message_Queue
 {
 public:
-
   /// Constructor.
   TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core);
 
@@ -66,7 +65,6 @@ public:
   CORBA::ULong queue_length () const;
 
 private:
-
   friend class TAO_Transport;
 
 private:
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl
index 336e713d1d7..bf378bd9a0e 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 ACE_INLINE
-TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void)
+TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base ()
   : refcount_(1)
 {}
 
@@ -11,7 +11,7 @@ TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void)
 template <typename T>
 ACE_INLINE
 void
-TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void)
+TAO_Intrusive_Ref_Count_Base<T>::_add_ref ()
 {
   ++this->refcount_;
 }
@@ -20,7 +20,7 @@ TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void)
 template <typename T>
 ACE_INLINE
 void
-TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void)
+TAO_Intrusive_Ref_Count_Base<T>::_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
index 2b293e14b47..df2fb310c3c 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
@@ -63,7 +63,6 @@ template <typename T>
 class TAO_Intrusive_Ref_Count_Handle
 {
 public:
-
   /// Default Constructor - enters the "nil" state.
   TAO_Intrusive_Ref_Count_Handle ();
 
@@ -120,7 +119,6 @@ public:
   bool operator== (const TAO_Intrusive_Ref_Count_Handle& h) const;
 
 private:
-
   /// Claim a "copy" of the reference-counted object by adding
   /// one to its reference counter.  Do nothing if this smart pointer
   /// object is currently in the "nil" state.
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
index c06193db780..ef37073a8b2 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (void)
+TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle ()
   : ptr_(0)
 {
 }
diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.inl b/TAO/tao/Intrusive_Ref_Count_Object_T.inl
index 818e51e2faa..6f5705d854f 100644
--- a/TAO/tao/Intrusive_Ref_Count_Object_T.inl
+++ b/TAO/tao/Intrusive_Ref_Count_Object_T.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename OBJ, typename ACE_LOCK>
 ACE_INLINE
-TAO_Intrusive_Ref_Count_Object<OBJ,ACE_LOCK>::TAO_Intrusive_Ref_Count_Object (void)
+TAO_Intrusive_Ref_Count_Object<OBJ,ACE_LOCK>::TAO_Intrusive_Ref_Count_Object ()
 {}
 
 template <typename OBJ, typename ACE_LOCK>
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_Adapter.h b/TAO/tao/Invocation_Adapter.h
index b46e6032395..244383701e6 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -158,7 +158,6 @@ namespace TAO
      * methods to get the right behavior at their level.
      */
     //@{
-
     /// Helper method that prepares the necessary stuff for a remote
     /// invocation.
 
diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl
index 17e2988230e..b60e6fc44d1 100644
--- a/TAO/tao/Invocation_Base.inl
+++ b/TAO/tao/Invocation_Base.inl
@@ -17,13 +17,13 @@ namespace TAO
   }
 
   ACE_INLINE CORBA::Object_ptr
-  Invocation_Base::forwarded_reference (void)
+  Invocation_Base::forwarded_reference ()
   {
     return CORBA::Object::_duplicate (this->forwarded_to_.in ());
   }
 
   ACE_INLINE CORBA::Object_ptr
-  Invocation_Base::steal_forwarded_reference (void)
+  Invocation_Base::steal_forwarded_reference ()
   {
     this->reply_status_ = GIOP::NO_EXCEPTION;
     return this->forwarded_to_._retn ();
@@ -60,20 +60,20 @@ namespace TAO
   }
 
   ACE_INLINE TAO_Operation_Details &
-  Invocation_Base::operation_details (void)
+  Invocation_Base::operation_details ()
   {
     return this->details_;
   }
 
 #if TAO_HAS_INTERCEPTORS == 1
   ACE_INLINE size_t &
-  Invocation_Base::stack_size  (void)
+  Invocation_Base::stack_size  ()
   {
     return this->stack_size_;
   }
 
   ACE_INLINE CORBA::Exception *
-  Invocation_Base::caught_exception (void)
+  Invocation_Base::caught_exception ()
   {
     return this->caught_exception_;
   }
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index 79d117e335a..2d876183efe 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -58,14 +58,12 @@ namespace CORBA
 class TAO_Export TAO_Invocation_Endpoint_Selector
 {
 public:
-
   /// Destructor.
-  virtual ~TAO_Invocation_Endpoint_Selector (void);
+  virtual ~TAO_Invocation_Endpoint_Selector ();
 
   /// Select the endpoint and set @a r's @c profile_
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val) = 0;
-
 };
 
 // ****************************************************************
@@ -86,9 +84,8 @@ class TAO_Export TAO_Default_Endpoint_Selector
   : public TAO_Invocation_Endpoint_Selector
 {
 public:
-
   /// Destructor.
-  virtual ~TAO_Default_Endpoint_Selector (void);
+  virtual ~TAO_Default_Endpoint_Selector ();
 
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val);
diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp
index 4c62c4e9d80..3c2564db0eb 100644
--- a/TAO/tao/Invocation_Retry_State.cpp
+++ b/TAO/tao/Invocation_Retry_State.cpp
@@ -31,7 +31,6 @@ namespace
                           TAO::Invocation_Retry_Params &client_factory_params,
                           TAO::Invocation_Retry_Params &result)
   {
-
   // Retry delay
   if (command_line_params.init_retry_delay_ !=
       result.init_retry_delay_)
@@ -70,7 +69,6 @@ namespace
                     command_line_params,
                     client_factory_params,
                     result);
-
   }
 }
 
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
index 4e2c5a0a8a7..8be0f5ef7bf 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -49,10 +49,10 @@ public:
   friend class TAO_LF_Multi_Event;
 
   /// Constructor
-  TAO_LF_CH_Event (void);
+  TAO_LF_CH_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_CH_Event (void);
+  virtual ~TAO_LF_CH_Event ();
 
   //@{
 protected:
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index c6e0ea6db08..045d1959146 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -42,7 +42,7 @@ public:
   TAO_LF_Connect_Strategy (TAO_ORB_Core *orb, bool no_upcall);
 
   /// Destructor
-  ~TAO_LF_Connect_Strategy (void);
+  ~TAO_LF_Connect_Strategy ();
 
   /**
    * Concrete implementation for this class. Please see
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 6d661658616..9cacf590163 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -47,14 +47,13 @@ class TAO_Leader_Follower;
 class TAO_Export TAO_LF_Event
 {
 public:
-
   friend class TAO_Leader_Follower;
 
   /// Constructor
-  TAO_LF_Event (void);
+  TAO_LF_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_Event (void);
+  virtual ~TAO_LF_Event ();
 
   /// Bind a follower
   /**
@@ -139,7 +138,6 @@ protected:
   virtual bool is_state_final () const = 0;
 
 private:
-
   /// Set the state irrespective of anything.
   virtual void set_state (LFS_STATE new_state);
 
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
index 441e4727f77..d4fc4730b29 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -36,7 +36,7 @@ public:
   TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *folloer);
 
   /// Destructor
-  ~TAO_LF_Event_Binder (void);
+  ~TAO_LF_Event_Binder ();
 
 private:
   void operator= (const TAO_LF_Event_Binder &);
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h
index 71462061a0e..f47ec1c814b 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.h
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h
@@ -37,7 +37,7 @@ public:
                                    ACE_Time_Value *max_wait_time);
 
   /// Destructor
-  ~TAO_LF_Event_Loop_Thread_Helper (void);
+  ~TAO_LF_Event_Loop_Thread_Helper ();
 
   /// Calls @c set_event_loop_thread on the leader/followers object.
   int event_loop_return () const;
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
index 57ca9424aca..877dd2526cf 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
@@ -14,7 +14,7 @@ TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper (
 }
 
 ACE_INLINE
-TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void)
+TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper ()
 {
   int const call_reset = (this->event_loop_return_ == 0);
   this->lf_strategy_.reset_event_loop_thread (call_reset,
diff --git a/TAO/tao/LF_Follower.h b/TAO/tao/LF_Follower.h
index 9d81113e8a3..0aa04b467da 100644
--- a/TAO/tao/LF_Follower.h
+++ b/TAO/tao/LF_Follower.h
@@ -47,16 +47,16 @@ public:
   TAO_LF_Follower (TAO_Leader_Follower &leader_follower);
 
   /// Destructor
-  ~TAO_LF_Follower (void);
+  ~TAO_LF_Follower ();
 
   /// Access the leader follower that owns this follower
-  TAO_Leader_Follower &leader_follower (void);
+  TAO_Leader_Follower &leader_follower ();
 
   /// Wait until on the underlying condition variable
   int wait (ACE_Time_Value *tv);
 
   /// Signal the underlying condition variable
-  int signal (void);
+  int signal ();
 
 private:
   /// The Leader/Follower set this Follower belongs to
diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl
index 907a90ebea0..d96c60fe1a3 100644
--- a/TAO/tao/LF_Follower.inl
+++ b/TAO/tao/LF_Follower.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Leader_Follower &
-TAO_LF_Follower::leader_follower (void)
+TAO_LF_Follower::leader_follower ()
 {
   return this->leader_follower_;
 }
diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h
index 9121627ea01..4de8316be15 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ b/TAO/tao/LF_Follower_Auto_Adder.h
@@ -36,7 +36,7 @@ public:
   TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &, TAO_LF_Follower *follower);
 
   /// Destructor
-  ~TAO_LF_Follower_Auto_Adder (void);
+  ~TAO_LF_Follower_Auto_Adder ();
 
 private:
   /// Keep a reference to the leader follower
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.h b/TAO/tao/LF_Follower_Auto_Ptr.h
index 0cb45361a48..6ba7dd34691 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.h
+++ b/TAO/tao/LF_Follower_Auto_Ptr.h
@@ -36,12 +36,12 @@ public:
   TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &);
 
   /// Destructor
-  ~TAO_LF_Follower_Auto_Ptr (void);
+  ~TAO_LF_Follower_Auto_Ptr ();
 
   /// Implement the smart pointer methods
-  TAO_LF_Follower *get (void);
-  TAO_LF_Follower *operator->(void);
-  operator TAO_LF_Follower *(void);
+  TAO_LF_Follower *get ();
+  TAO_LF_Follower *operator->();
+  operator TAO_LF_Follower *();
 
 private:
   /// Keep a reference to the leader follower
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl
index 06586ae2fa0..bd91b66420f 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.inl
+++ b/TAO/tao/LF_Follower_Auto_Ptr.inl
@@ -9,19 +9,19 @@ TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf)
 }
 
 ACE_INLINE TAO_LF_Follower *
-TAO_LF_Follower_Auto_Ptr::get (void)
+TAO_LF_Follower_Auto_Ptr::get ()
 {
   return this->follower_;
 }
 
 ACE_INLINE TAO_LF_Follower *
-TAO_LF_Follower_Auto_Ptr::operator-> (void)
+TAO_LF_Follower_Auto_Ptr::operator-> ()
 {
   return this->follower_;
 }
 
 ACE_INLINE
-TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void)
+TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * ()
 {
   return this->follower_;
 }
diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h
index 1af364d0044..653edff43eb 100644
--- a/TAO/tao/LF_Invocation_Event.h
+++ b/TAO/tao/LF_Invocation_Event.h
@@ -37,10 +37,10 @@ class TAO_Export TAO_LF_Invocation_Event: public TAO_LF_Event
 {
 public:
   /// Constructor
-  TAO_LF_Invocation_Event (void);
+  TAO_LF_Invocation_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_Invocation_Event (void);
+  virtual ~TAO_LF_Invocation_Event ();
 
 protected:
   /// Validate and perform the state change
diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h
index bb8497e3df1..fa9f836d548 100644
--- a/TAO/tao/LF_Multi_Event.h
+++ b/TAO/tao/LF_Multi_Event.h
@@ -38,10 +38,10 @@ class TAO_Export TAO_LF_Multi_Event: public TAO_LF_Event
 {
 public:
   /// Constructor
-  TAO_LF_Multi_Event (void);
+  TAO_LF_Multi_Event ();
 
   /// Destructor
-  virtual ~TAO_LF_Multi_Event (void);
+  virtual ~TAO_LF_Multi_Event ();
 
   /// Propagate the follower to all the events in the collection.
   virtual int bind (TAO_LF_Follower *follower);
@@ -54,10 +54,10 @@ public:
 
   /// Returns the connection handler that caused the successful status
   /// to be returned.
-  TAO_Connection_Handler *winner(void);
+  TAO_Connection_Handler *winner();
 
   /// Returns the transport associated with the first entry in the collection.
-  TAO_Transport *base_transport(void);
+  TAO_Transport *base_transport();
 
 private:
   void operator= (const TAO_LF_Multi_Event &);
@@ -81,7 +81,6 @@ protected:
   virtual bool error_detected_i () const;
 
 private:
-
   struct Event_Node {
     TAO_Connection_Handler * ptr_;
     Event_Node *next_;
diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h
index 1dd49e3c5b8..c0515a43bdb 100644
--- a/TAO/tao/LF_Strategy.h
+++ b/TAO/tao/LF_Strategy.h
@@ -43,7 +43,7 @@ class TAO_Export TAO_LF_Strategy
 {
 public:
   /// Destructor
-  virtual ~TAO_LF_Strategy (void);
+  virtual ~TAO_LF_Strategy ();
 
   /// The current thread will handle an upcall
   /**
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
index 7d4619d1000..675b032c151 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -34,7 +34,7 @@ public:
    *
    * Please check the documentation in TAO_LF_Strategy
    */
-  virtual ~TAO_LF_Strategy_Complete (void);
+  virtual ~TAO_LF_Strategy_Complete ();
 
   virtual void set_upcall_thread (TAO_Leader_Follower &);
   virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.h b/TAO/tao/LRU_Connection_Purging_Strategy.h
index ff2ceb76e43..f13ab17e8ab 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.h
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.h
@@ -41,7 +41,7 @@ public:
   TAO_LRU_Connection_Purging_Strategy (int cache_maximum);
 
   /// The destructor
-  virtual ~TAO_LRU_Connection_Purging_Strategy (void);
+  virtual ~TAO_LRU_Connection_Purging_Strategy ();
 
   /// Called when accessing an item from the cache
   virtual void update_item (TAO_Transport& transport);
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 7baf6687771..8ba45c8dab6 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -1,6 +1,5 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Reactor.h"
-#include "ace/Auto_Ptr.h"
 
 #include "tao/Leader_Follower.h"
 #include "tao/LF_Follower_Auto_Ptr.h"
@@ -12,6 +11,8 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Time_Policy.h"
 
+#include <memory>
+
 #if !defined (__ACE_INLINE__)
 # include "tao/Leader_Follower.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -225,7 +226,7 @@ TAO_Leader_Follower::resume_events ()
   // not need to obtain the lock, only called when holding the lock
   while (!this->deferred_event_set_.is_empty ())
     {
-      ACE_Auto_Ptr<Deferred_Event> event (this->deferred_event_set_.pop_front ());
+      std::unique_ptr<Deferred_Event> event (this->deferred_event_set_.pop_front ());
       // Send a notification to the reactor to cause the awakening of a new
       // follower, if there is one already available.
       ACE_Reactor *reactor = this->orb_core_->reactor ();
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index 204541e7678..e7555173d32 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -53,7 +53,7 @@ public:
                        TAO_New_Leader_Generator *new_leader_generator = 0);
 
   /// Destructor
-  ~TAO_Leader_Follower (void);
+  ~TAO_Leader_Follower ();
 
   /// The current thread has become a server thread (i.e. called
   /// ORB::run), update any flags and counters.
@@ -61,20 +61,20 @@ public:
 
   /// The current thread is not a server thread anymore, reset any
   /// flags and counters.
-  void reset_event_loop_thread (void);
+  void reset_event_loop_thread ();
 
   /// This thread is going to perform an upcall, it will no longer be
   /// an event loop thread.
-  void set_upcall_thread (void);
+  void set_upcall_thread ();
 
   /// Is there any thread running as a leader?
   bool leader_available () const;
 
   /// A server thread is making a request.
-  void set_client_thread (void);
+  void set_client_thread ();
 
   /// A server thread has finished is making a request.
-  void reset_client_thread (void);
+  void reset_client_thread ();
 
   /// Wait on the Leader/Followers loop until one event happens.
   /**
@@ -96,11 +96,11 @@ public:
 
   /// The current thread has become the leader thread in the
   /// client side leader-follower set.
-  void set_client_leader_thread (void) ;
+  void set_client_leader_thread ();
 
   /// The current thread is no longer the leader thread in the client
   /// side leader-follower set.
-  void reset_client_leader_thread (void) ;
+  void reset_client_leader_thread ();
 
   /// Sets the thread ID of the leader thread in the leader-follower
   /// model
@@ -112,14 +112,14 @@ public:
   /// Sets the client leader avoidance flag true. This is used with the
   /// noupcall wait strategy to allow the creation of dynamic threads
   /// when possible
-  void set_avoid_client_leader (void);
+  void set_avoid_client_leader ();
 
   /**
    * A leader thread is relinquishing its role, unless there are more
    * leader threads running pick up a follower (if there is any) to
    * play the leader role.
    */
-  int elect_new_leader (void);
+  int elect_new_leader ();
 
   /** @name Follower creation/destruction
    *
@@ -143,7 +143,7 @@ public:
    */
   //@{
   /// Allocate a new follower to the caller.
-  TAO_LF_Follower *allocate_follower (void);
+  TAO_LF_Follower *allocate_follower ();
 
   /// The caller has finished using a follower.
   void release_follower (TAO_LF_Follower *);
@@ -168,7 +168,7 @@ public:
   //@}
 
   /// Get a reference to the underlying mutex
-  TAO_SYNCH_MUTEX &lock (void);
+  TAO_SYNCH_MUTEX &lock ();
 
   /// Provide a pre-initialized reverse lock for the Leader/Followers
   /// set.
@@ -177,16 +177,16 @@ public:
    * running operations.  This helper class simplifies the process of
    * releasing and reacquiring said mutex.
    */
-  ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void);
+  ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock ();
 
   /// Check if there are any client threads running
   bool has_clients () const;
 
   /// Accessor to the reactor
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
   /// Called when we are out of leaders.
-  bool no_leaders_available (void);
+  bool no_leaders_available ();
 
   /// Set the new leader generator.
   void set_new_leader_generator(TAO_New_Leader_Generator *new_leader_generator);
@@ -221,7 +221,7 @@ private:
    * that all the pre-conditions are satisfied the Follower set is
    * changed and the promoted Follower is signaled.
    */
-  int elect_new_leader_i (void);
+  int elect_new_leader_i ();
 
   //@}
 
@@ -306,7 +306,7 @@ public:
   TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &leader_follower);
 
   /// Destructor
-  ~TAO_LF_Client_Thread_Helper (void);
+  ~TAO_LF_Client_Thread_Helper ();
 
 private:
   /// Reference to leader/followers object.
@@ -320,7 +320,7 @@ public:
   TAO_LF_Client_Leader_Thread_Helper (TAO_Leader_Follower &leader_follower);
 
   /// Destructor
-  ~TAO_LF_Client_Leader_Thread_Helper (void);
+  ~TAO_LF_Client_Leader_Thread_Helper ();
 
 private:
   /// Reference to leader/followers object.
diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl
index c49cb5d2bb4..104bd0a5fa0 100644
--- a/TAO/tao/Leader_Follower.inl
+++ b/TAO/tao/Leader_Follower.inl
@@ -29,7 +29,7 @@ TAO_Leader_Follower::get_tss_resources () const
 }
 
 ACE_INLINE void
-TAO_Leader_Follower::set_avoid_client_leader (void)
+TAO_Leader_Follower::set_avoid_client_leader ()
 {
   this->avoid_client_leader_ = true;
 }
@@ -41,7 +41,7 @@ TAO_Leader_Follower::follower_available () const
 }
 
 ACE_INLINE bool
-TAO_Leader_Follower::no_leaders_available (void)
+TAO_Leader_Follower::no_leaders_available ()
 {
   if (this->new_leader_generator_)
     return this->new_leader_generator_->no_leaders_available ();
@@ -49,7 +49,7 @@ TAO_Leader_Follower::no_leaders_available (void)
 }
 
 ACE_INLINE int
-TAO_Leader_Follower::elect_new_leader (void)
+TAO_Leader_Follower::elect_new_leader ()
 {
   if (this->leaders_ == 0)
     {
@@ -119,7 +119,7 @@ TAO_Leader_Follower::reset_event_loop_thread_i (TAO_ORB_Core_TSS_Resources *tss)
 }
 
 ACE_INLINE void
-TAO_Leader_Follower::reset_event_loop_thread (void)
+TAO_Leader_Follower::reset_event_loop_thread ()
 {
   TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
   if (tss->event_loop_thread_ > 0)
@@ -127,13 +127,13 @@ TAO_Leader_Follower::reset_event_loop_thread (void)
 }
 
 ACE_INLINE TAO_SYNCH_MUTEX &
-TAO_Leader_Follower::lock (void)
+TAO_Leader_Follower::lock ()
 {
   return this->lock_;
 }
 
 ACE_INLINE void
-TAO_Leader_Follower::set_upcall_thread (void)
+TAO_Leader_Follower::set_upcall_thread ()
 {
   TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
 
@@ -164,7 +164,7 @@ TAO_Leader_Follower::leader_available () const
 }
 
 ACE_INLINE void
-TAO_Leader_Follower::set_client_leader_thread (void)
+TAO_Leader_Follower::set_client_leader_thread ()
 {
   TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
   ++this->leaders_;
@@ -173,7 +173,7 @@ TAO_Leader_Follower::set_client_leader_thread (void)
 }
 
 ACE_INLINE void
-TAO_Leader_Follower::reset_client_leader_thread (void)
+TAO_Leader_Follower::reset_client_leader_thread ()
 {
   TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
   // We may be called twice when we gave up leadership from
@@ -207,7 +207,7 @@ TAO_Leader_Follower::remove_follower (TAO_LF_Follower *follower)
 }
 
 ACE_INLINE ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &
-TAO_Leader_Follower::reverse_lock (void)
+TAO_Leader_Follower::reverse_lock ()
 {
   return this->reverse_lock_;
 }
@@ -234,7 +234,7 @@ TAO_LF_Client_Thread_Helper::TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &l
 }
 
 ACE_INLINE
-TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper (void)
+TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper ()
 {
   this->leader_follower_.reset_client_thread ();
 }
@@ -247,7 +247,7 @@ TAO_LF_Client_Leader_Thread_Helper::TAO_LF_Client_Leader_Thread_Helper (TAO_Lead
 }
 
 ACE_INLINE
-TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void)
+TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper ()
 {
   this->leader_follower_.reset_client_leader_thread ();
 }
diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h
index af0c7f18731..5928452f5d3 100644
--- a/TAO/tao/Load_Protocol_Factory_T.h
+++ b/TAO/tao/Load_Protocol_Factory_T.h
@@ -58,8 +58,7 @@ namespace TAO
                           T,
                           -1);
 
-          ACE_auto_ptr_reset (safe_protocol_factory,
-                              protocol_factory);
+          safe_protocol_factory.reset (protocol_factory);
 
           transfer_ownership = true;
         }
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index a8a8d72c103..cb8c2a4b501 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -44,7 +44,6 @@ namespace CORBA
   class TAO_Export LocalObject : public virtual CORBA::Object
   {
   public:
-
     /// Destructor
     virtual ~LocalObject ();
 
diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl
index 7d2715b166e..63da214f852 100644
--- a/TAO/tao/LocalObject.inl
+++ b/TAO/tao/LocalObject.inl
@@ -34,7 +34,7 @@ CORBA::LocalObject::_narrow (CORBA::Object_ptr obj)
 }
 
 ACE_INLINE
-CORBA::LocalObject::LocalObject (void)
+CORBA::LocalObject::LocalObject ()
   : Object (0)
 {
 }
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
index 60770a6f8e5..25fac77b6de 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -59,13 +59,12 @@ namespace TAO
     LocateRequest_Invocation_Adapter (CORBA::Object_ptr target);
 
     /// Start the invocation on the target
-    void invoke (void);
+    void invoke ();
 
     /// Accessor to the inconsistent policy list
-    CORBA::PolicyList *get_inconsistent_policies (void);
+    CORBA::PolicyList *get_inconsistent_policies ();
 
   private:
-
     bool get_timeout (ACE_Time_Value &val);
 
     /// Helper method that takes care of setting the profiles within
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index 82b0fb48d3b..62a02f9b2bc 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -40,10 +40,10 @@ class TAO_Export TAO_MCAST_Parser : public TAO_IOR_Parser
 {
 public:
   /// Constructor
-  TAO_MCAST_Parser (void);
+  TAO_MCAST_Parser ();
 
   /// The destructor
-  virtual ~TAO_MCAST_Parser (void);
+  virtual ~TAO_MCAST_Parser ();
 
   /// = The IOR_Parser methods, please read the documentation in
   ///   IOR_Parser.h
@@ -54,7 +54,6 @@ public:
                                           CORBA::ORB_ptr orb);
 
 private:
-
   CORBA::Object_ptr multicast_to_service (const char *service_name,
                                           unsigned short port,
                                           const char *mcast_address,
@@ -77,7 +76,6 @@ private:
   void assign_to_variables (char const * mcast_name_ptr);
 
 private:
-
   CORBA::String_var mcast_address_;
 
   /// Default multicast port (currently Name Service mcast port).
@@ -91,7 +89,6 @@ private:
 
   /// Multicast service name
   CORBA::String_var service_name_;
-
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser)
diff --git a/TAO/tao/MCAST_Parser.inl b/TAO/tao/MCAST_Parser.inl
index db49f4704a8..deb0827869c 100644
--- a/TAO/tao/MCAST_Parser.inl
+++ b/TAO/tao/MCAST_Parser.inl
@@ -6,7 +6,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_MCAST_Parser::TAO_MCAST_Parser (void)
+TAO_MCAST_Parser::TAO_MCAST_Parser ()
   : mcast_address_ ()
   , mcast_port_ (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
   , mcast_nic_ ()
diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h
index 2967593191a..1a7ab2cd1f9 100644
--- a/TAO/tao/MMAP_Allocator.h
+++ b/TAO/tao/MMAP_Allocator.h
@@ -45,13 +45,13 @@ class TAO_MMAP_Allocator
 {
 public:
   /// Constructor
-  TAO_MMAP_Allocator (void);
+  TAO_MMAP_Allocator ();
 
   /// Destructor.
-  virtual ~TAO_MMAP_Allocator (void);
+  virtual ~TAO_MMAP_Allocator ();
 
   /// Return backing store handle.
-  ACE_HANDLE handle (void);
+  ACE_HANDLE handle ();
 
   /// Return offset in backing store file for memory address @a p. If @a p
   /// is not coming from this allocator -1 is returned.
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index d00ce8384b7..882306374e3 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -214,7 +214,6 @@ private:
   int give_shared_profile (TAO_Profile *pfile);
 
 private:
-
   /**
    * Used for chaning references when the current profile is
    * forwarded.  Note, this will only be valid for an MProfile which
diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl
index 83707de5eef..985b10ab1b3 100644
--- a/TAO/tao/MProfile.inl
+++ b/TAO/tao/MProfile.inl
@@ -39,7 +39,7 @@ TAO_MProfile::operator= (const TAO_MProfile& rhs)
 
 /// Cyclic get next.  It will simply cycle through the complete list.
 ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cnext (void)
+TAO_MProfile::get_cnext ()
 {
   if (last_ == 0)
     return 0;
@@ -53,7 +53,7 @@ TAO_MProfile::get_cnext (void)
 /// This will return the next element until either null is found or the
 /// end of list.  It then continues to return NULL until rewind.
 ACE_INLINE TAO_Profile *
-TAO_MProfile::get_next (void)
+TAO_MProfile::get_next ()
 {
   // Nolist or EndOfList
   if (last_ == 0 || current_ == last_)
@@ -63,7 +63,7 @@ TAO_MProfile::get_next (void)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cprev (void)
+TAO_MProfile::get_cprev ()
 {
   if (last_ == 0)
     return 0;
@@ -78,7 +78,7 @@ TAO_MProfile::get_cprev (void)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_MProfile::get_prev (void)
+TAO_MProfile::get_prev ()
 {
   if (last_ == 0 || current_ <= 1)
     // No List of BeginningOfList
@@ -100,7 +100,7 @@ TAO_MProfile::get_profile (TAO_PHandle handle)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_MProfile::get_current_profile (void)
+TAO_MProfile::get_current_profile ()
 {
   if (last_ == 0)
     return 0;
@@ -112,7 +112,7 @@ TAO_MProfile::get_current_profile (void)
 }
 
 ACE_INLINE TAO_PHandle
-TAO_MProfile::get_current_handle (void)
+TAO_MProfile::get_current_handle ()
 {
   if (current_ > 0)
     return current_ - 1;
@@ -130,7 +130,7 @@ TAO_MProfile::get_current_handle () const
 }
 
 ACE_INLINE void
-TAO_MProfile::rewind (void)
+TAO_MProfile::rewind ()
 {
   current_ = 0;
 }
@@ -158,7 +158,7 @@ TAO_MProfile::forward_from (TAO_MProfile *from)
 
 ACE_INLINE
 TAO_MProfile *
-TAO_MProfile::forward_from (void)
+TAO_MProfile::forward_from ()
 {
   return this->forward_from_;
 }
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index f1ab26afb16..63fbd04897f 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -20,12 +20,12 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
   : reply_status_ (GIOP::NO_EXCEPTION)
   , mesg_base_ (0)
   , request_id_ (0)
-  , response_expected_ (0)
-  , transport_ (0)
-  , orb_core_ (0)
+  , response_expected_ (false)
+  , transport_ (nullptr)
+  , orb_core_ (nullptr)
   , argument_flag_ (1)
   , rh_reply_status_ (TAO_RS_UNINITIALIZED)
-  , allocator_ (0)
+  , allocator_ (nullptr)
 {
 }
 
@@ -38,7 +38,7 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler ()
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
-    if (this->response_expected_ == 0) //oneway ?
+    if (!this->response_expected_) //oneway ?
       {
         return;
       }
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
index ff0302be5d1..79ed9106ddf 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
@@ -127,7 +127,6 @@ TAO_AMI_Arguments_Converter_Impl::Initializer ()
 }
 
 
-
 ACE_STATIC_SVC_DEFINE (
   TAO_AMI_Arguments_Converter_Impl,
   ACE_TEXT ("AMI_Arguments_Converter"),
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
index 59a5ead3ebc..4ce03c5bd2c 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
@@ -39,7 +39,6 @@ class TAO_Messaging_Export TAO_AMI_Arguments_Converter_Impl
   : public TAO::Collocated_Arguments_Converter
 {
 public:
-
   virtual void convert_request (TAO_ServerRequest & server_request,
                                 TAO::Argument * const args[],
                                 size_t nargs);
@@ -65,13 +64,11 @@ static int
 TAO_Requires_AMI_Arguments_Converter_Impl_Initializer =
   TAO_AMI_Arguments_Converter_Impl::Initializer ();
 
-
 ACE_STATIC_SVC_DECLARE (TAO_AMI_Arguments_Converter_Impl)
 ACE_FACTORY_DECLARE (TAO_Messaging, TAO_AMI_Arguments_Converter_Impl)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_AMI_ARGUMENTS_CONVERTER_IMPL_H */
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index af7ebc612a5..5a94b7bf591 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -153,7 +153,6 @@ namespace TAO
       }
     catch ( ::CORBA::Exception& ex)
       {
-
         PortableInterceptor::ReplyStatus const status =
           this->handle_any_exception (&ex);
 
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/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index a85a96033e8..7fad8db98bc 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -22,11 +22,6 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
 {
 }
 
-// Destructor.
-TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher ()
-{
-}
-
 // Dispatch the reply.
 int
 TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params &params)
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index b824cacc50d..2ae0d89c582 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -39,7 +39,7 @@ public:
       ACE_Allocator *allocator);
 
   /// Destructor.
-  virtual ~TAO_Asynch_Reply_Dispatcher ();
+  virtual ~TAO_Asynch_Reply_Dispatcher () = default;
 
   /// @name The Reply Dispatcher methods
   //@{
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
index 3b9da61a265..aec430f3560 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -18,11 +18,6 @@ TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
     ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
-TAO_Asynch_Timeout_Handler::~TAO_Asynch_Timeout_Handler ()
-{
-}
-
-
 long
 TAO_Asynch_Timeout_Handler::schedule_timer (TAO_Transport_Mux_Strategy *tms,
                                             CORBA::ULong request_id,
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
index ff43d74c2ff..be3c9bb2e6f 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
@@ -42,7 +42,7 @@ class TAO_Asynch_Timeout_Handler
 public:
   TAO_Asynch_Timeout_Handler (ACE_Reactor *reactor);
 
-  ~TAO_Asynch_Timeout_Handler ();
+  ~TAO_Asynch_Timeout_Handler () = default;
 
   /// Schedule a timer
   long schedule_timer (TAO_Transport_Mux_Strategy *tms,
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index 02a182a3a54..53ef3556a4a 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -44,7 +44,6 @@ class TAO_ConnectionTimeoutPolicy
   : public TAO::ConnectionTimeoutPolicy,
     public ::CORBA::LocalObject
 {
-
 public:
   /// Constructor.
   TAO_ConnectionTimeoutPolicy (const TimeBase::TimeT& relative_expiry);
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h
index 0a1bda88ebb..827388228e7 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.h
+++ b/TAO/tao/Messaging/ExceptionHolder_i.h
@@ -67,7 +67,6 @@ namespace TAO
     virtual CORBA::ValueBase* _copy_value ();
 
   protected:
-
     virtual ~ExceptionHolder ();
 
   private:
@@ -90,7 +89,6 @@ namespace TAO
   public:
     virtual CORBA::ValueBase * create_for_unmarshal ();
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index 4b17c72cfa3..d77293d13a0 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -18,8 +18,7 @@ TAO_Messaging_Loader::~TAO_Messaging_Loader ()
 }
 
 int
-TAO_Messaging_Loader::init (int,
-                            ACE_TCHAR* [])
+TAO_Messaging_Loader::init (int, ACE_TCHAR* [])
 {
   ACE_TRACE ("TAO_Messaging_Loader::init");
 
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index 07124b67568..0e549725264 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -38,7 +38,6 @@ class TAO_Messaging_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer Methods
    *
@@ -46,7 +45,6 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
@@ -54,7 +52,6 @@ public:
   //@}
 
 private:
-
   /// Register Messaging policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 27901cb7115..4c963aa57ed 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -37,7 +37,6 @@ class TAO_RelativeRoundtripTimeoutPolicy
   : public Messaging::RelativeRoundtripTimeoutPolicy,
     public ::CORBA::LocalObject
 {
-
 public:
   /// Constructor.
   TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry);
@@ -97,7 +96,6 @@ class TAO_Messaging_Export TAO_Sync_Scope_Policy
   : public Messaging::SyncScopePolicy,
     public ::CORBA::LocalObject
 {
-
 public:
   /// Constructor.
   TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization);
@@ -134,7 +132,6 @@ public:
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 private:
-
   /// The attribute
   Messaging::SyncScope synchronization_;
 };
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
index aab9fc1efe2..bab3dbbe6e8 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
@@ -45,16 +45,16 @@ namespace TAO
   class Eager_Transport_Queueing_Strategy : public Transport_Queueing_Strategy
   {
   public:
-    virtual bool must_queue (bool queue_empty) const;
+    bool must_queue (bool queue_empty) const override;
 
-    virtual bool buffering_constraints_reached (
+    bool buffering_constraints_reached (
       TAO_Stub *stub,
       size_t msg_count,
       size_t total_bytes,
       bool &must_flush,
       const ACE_Time_Value &current_deadline,
       bool &set_timer,
-      ACE_Time_Value &new_deadline) const;
+      ACE_Time_Value &new_deadline) const override;
 
   private:
     /// Check if the buffering constraint includes any timeouts and
@@ -88,7 +88,7 @@ namespace TAO
     : public Eager_Transport_Queueing_Strategy
   {
   public:
-    virtual bool must_queue (bool queue_empty) const;
+    bool must_queue (bool queue_empty) const override;
   };
 
   #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index c77fbe7948c..2e5541c6b78 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -24,7 +24,6 @@ module Messaging
   local interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
     readonly attribute TimeBase::TimeT relative_expiry;
   };
-
 };
 
 #endif /*TAO_MESSAGING_RT_POLICY_PIDL*/
diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp
index ea13255cb38..65e54c5ada9 100644
--- a/TAO/tao/Monitor/Monitor.cpp
+++ b/TAO/tao/Monitor/Monitor.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Monitor_Init::TAO_Monitor_Init (void)
+TAO_Monitor_Init::TAO_Monitor_Init ()
 {
 }
 
@@ -52,7 +52,7 @@ TAO_Monitor_Init::create_object (CORBA::ORB_ptr orb,
 // This one is used during static initialization while the other is used
 // when Monitor is a shared library.
 int
-TAO_Monitor_Init::Initializer (void)
+TAO_Monitor_Init::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Monitor_Init);
 }
diff --git a/TAO/tao/Monitor/Monitor.h b/TAO/tao/Monitor/Monitor.h
index b899f7b04ce..4742bdbc52e 100644
--- a/TAO/tao/Monitor/Monitor.h
+++ b/TAO/tao/Monitor/Monitor.h
@@ -33,14 +33,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Monitor_Export TAO_Monitor_Init : public TAO_Object_Loader
 {
 public:
-  TAO_Monitor_Init (void);
+  TAO_Monitor_Init ();
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 //#if defined (TAO_AS_STATIC_LIBS)
diff --git a/TAO/tao/Monitor/TAO_Monitor.pc.in b/TAO/tao/Monitor/TAO_Monitor.pc.in
index 5a9a2c65fd7..639315d1be3 100644
--- a/TAO/tao/Monitor/TAO_Monitor.pc.in
+++ b/TAO/tao/Monitor/TAO_Monitor.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_Monitor
 Description: TAO Monitor Library
-Requires: TAO_PortableServer, TAO_ETCL_Parser, ACE_MonitorControl
+Requires: TAO_PortableServer, ACE_Monitor_Control
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_Monitor
 Cflags: -I${includedir}
diff --git a/TAO/tao/Nested_Upcall_Guard.h b/TAO/tao/Nested_Upcall_Guard.h
index 3673bae0fde..e13950c4b07 100644
--- a/TAO/tao/Nested_Upcall_Guard.h
+++ b/TAO/tao/Nested_Upcall_Guard.h
@@ -61,7 +61,7 @@ namespace TAO
                     "disabling upcalls\n", t->id ()));
     }
 
-    ~Nested_Upcall_Guard (void)
+    ~Nested_Upcall_Guard ()
     {
       if (!this->enable_)
         {
@@ -82,7 +82,7 @@ namespace TAO
     }
 
   private:
-    Nested_Upcall_Guard (void);
+    Nested_Upcall_Guard ();
 
     Nested_Upcall_Guard (const Nested_Upcall_Guard&) = delete;
     Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&) = delete;
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.h b/TAO/tao/Network_Priority_Protocols_Hooks.h
index dcbc9745b81..d238ad62815 100644
--- a/TAO/tao/Network_Priority_Protocols_Hooks.h
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.h
@@ -41,7 +41,7 @@ class TAO_Export TAO_Network_Priority_Protocols_Hooks
 {
 public:
   /// destructor
-  virtual ~TAO_Network_Priority_Protocols_Hooks (void);
+  virtual ~TAO_Network_Priority_Protocols_Hooks ();
 
   virtual void init_hooks (TAO_ORB_Core *orb_core) = 0;
 
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
index 9560a347fa1..e77d57587aa 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -34,11 +34,11 @@ class TAO_Export TAO_New_Leader_Generator
 {
 public:
   /// Destructor.
-  virtual ~TAO_New_Leader_Generator (void);
+  virtual ~TAO_New_Leader_Generator ();
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
-  virtual bool no_leaders_available (void) = 0;
+  virtual bool no_leaders_available () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index 6efc37b0450..820187de548 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -40,8 +40,8 @@ class TAO_Null_Fragmentation_Strategy
   : public TAO_GIOP_Fragmentation_Strategy
 {
 public:
-  TAO_Null_Fragmentation_Strategy (void) {}
-  virtual ~TAO_Null_Fragmentation_Strategy (void);
+  TAO_Null_Fragmentation_Strategy () {}
+  virtual ~TAO_Null_Fragmentation_Strategy ();
   virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index f5dde223670..ca14b4dc6c7 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1084,7 +1084,6 @@ namespace TAO
                  const ACE_TCHAR* orb_opt,
                  ACE_TString& opt_arg)
   {
-
     if (opt_arg.length () > 0)
       return false;
 
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 81e5633180d..07bc49d43dd 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -95,7 +95,7 @@ namespace CORBA
 
   typedef CORBA::ULong PolicyType;
 
-  // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
+  // TODO - implement OMG's 'ORBid CORBA::ORB::id ()'.
 
   typedef
     TAO_VarSeq_Var_T<
diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl
index e66f3a52033..3d52dce87ab 100644
--- a/TAO/tao/ORB.inl
+++ b/TAO/tao/ORB.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // ---------------------------------------------------------------------------
 
 ACE_INLINE ACE_Time_Value *
-CORBA::ORB::get_timeout (void)
+CORBA::ORB::get_timeout ()
 {
   return this->timeout_;
 }
@@ -68,7 +68,7 @@ CORBA::ORB::_use_omg_ior_format (CORBA::Boolean ior)
 }
 
 ACE_INLINE CORBA::Boolean
-CORBA::ORB::_use_omg_ior_format (void)
+CORBA::ORB::_use_omg_ior_format ()
 {
   return this->use_omg_ior_format_;
 }
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4073819bfd0..7da08d0f8cb 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -66,6 +66,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Message_Block.h"
 #include <cstring>
+#include <memory>
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ClientRequestInterceptor_Adapter.h"
@@ -257,7 +258,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
     valuetype_adapter_ (nullptr),
     parser_registry_ (),
     bidir_adapter_ (nullptr),
-    bidir_giop_policy_ (0),
+    bidir_giop_policy_ (false),
     ziop_adapter_ (nullptr),
     ziop_enabled_ (false),
     flushing_strategy_ (nullptr),
@@ -332,7 +333,6 @@ TAO_ORB_Core::~TAO_ORB_Core ()
 
   // This will destroy the service repository for this core
   (void) TAO::ORB::close_services (this->config_);
-
 }
 
 int
@@ -1408,8 +1408,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
                                             (no_server_side_name_lookups
                                              || dotted_decimal_addresses);
 
-  this->orb_params ()->use_parallel_connects
-    (use_parallel_connects != 0);
+  this->orb_params ()->use_parallel_connects (use_parallel_connects != 0);
 
   this->orb_params ()->linger (linger);
   this->orb_params ()->accept_error_delay (accept_error_delay);
@@ -1728,7 +1727,6 @@ TAO_ORB_Core::collocation_resolver ()
 TAO::PolicyFactory_Registry_Adapter *
 TAO_ORB_Core::policy_factory_registry_i ()
 {
-
   TAO_PolicyFactory_Registry_Factory *loader =
     ACE_Dynamic_Service<TAO_PolicyFactory_Registry_Factory>::instance
       (this->configuration (),
@@ -2761,7 +2759,7 @@ TAO_ORB_Core::resolve_ior_table_i ()
 
   if (factory != nullptr)
     {
-      ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this));
+      std::unique_ptr <TAO_Adapter> iortable_adapter (factory->create (this));
       iortable_adapter->open ();
 
       CORBA::Object_var tmp_root = iortable_adapter->root ();
@@ -2795,7 +2793,7 @@ TAO_ORB_Core::resolve_async_ior_table_i ()
 
   if (factory != nullptr)
     {
-      ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this));
+      std::unique_ptr <TAO_Adapter> iortable_adapter (factory->create (this));
       iortable_adapter->open ();
 
       CORBA::Object_var tmp_root = iortable_adapter->root ();
@@ -2992,7 +2990,6 @@ TAO_ORB_Core::input_cdr_msgblock_allocator ()
 ACE_Allocator*
 TAO_ORB_Core::output_cdr_dblock_allocator ()
 {
-
   return this->lane_resources ().output_cdr_dblock_allocator ();
 }
 
@@ -3020,7 +3017,6 @@ TAO_ORB_Core::transport_message_buffer_allocator ()
 ACE_Data_Block*
 TAO_ORB_Core::create_input_cdr_data_block (size_t size)
 {
-
   ACE_Allocator *dblock_allocator = nullptr;
   ACE_Allocator *buffer_allocator = nullptr;
 
@@ -3097,7 +3093,6 @@ TAO_ORB_Core::implrepo_service ()
 
   if (CORBA::is_nil (this->implrepo_service_))
     {
-
       try
         {
           CORBA::Object_var temp =
@@ -3247,7 +3242,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
 
 #define TOCSRi TAO_ORB_Core_Static_Resources::instance ()
 
-  // A consern was raised that since this function is called by two
+  // A concern was raised that since this function is called by two
   // different initializers there may be a race condition that might
   // require a lock. We are not using a lock at this time because of
   // two callers, one happens only during service directive processing
@@ -3255,14 +3250,13 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
   // happens when the OC_Endpoint_Selector_Factory is loaded, the
   // latter is part of the messaging library. The messaging library
   // calls this function as part of pre_init processing, and this call
-  // happes for every ORB instance. This was the case before these The
+  // happens for every ORB instance. This was the case before these The
   // latter call occurs when the messaging library is loaded. The
   // redundant calls occurred then as well. Second, it isn't clear how
   // a lock in this static method would react in the face of windows
   // dlls, shared memory segments, etc. Therefore we are continuing to
   // keep this code lockless as it always was, assuming no
-  // simultanious overwrite will occur.
-
+  // simultaneous overwrite will occur.
   if (TOCSRi->connection_timeout_hook_ == nullptr)
     {
       if (TAO_debug_level > 2)
@@ -3516,7 +3510,6 @@ TAO_ORB_Core::add_interceptor (
       this->client_request_interceptor_adapter_->add_interceptor (
         interceptor,
         policies);
-
     }
   else
     {
@@ -3540,7 +3533,6 @@ TAO_ORB_Core::add_interceptor (
       this->server_request_interceptor_adapter_->add_interceptor (
         interceptor,
         policies);
-
     }
   else
     {
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 35b2b599763..84f2af9e925 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -162,7 +162,6 @@ class TAO_Export TAO_ORB_Core
                                          ACE_TCHAR *argv[],
                                          const char *);
 public:
-
   /// Constructor.
   TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g);
 
@@ -911,7 +910,6 @@ public:
 #endif
 
 protected:
-
   /// Destructor is protected since the ORB Core is a reference
   /// counted object.
   ~TAO_ORB_Core ();
@@ -993,7 +991,6 @@ protected:
                                    const TAO_MProfile& mprofile);
 
 private:
-
   /// The ORB Core should not be copied.
   //@{
   TAO_ORB_Core(const TAO_ORB_Core&);
@@ -1014,7 +1011,6 @@ private:
   bool use_local_memory_pool_;
 
 protected:
-
   /// Synchronize internal state...
   TAO_SYNCH_MUTEX lock_;
 
@@ -1116,7 +1112,6 @@ protected:
    * @name Service Level Hooks
    */
   //@{
-
   /// Fault Tolerant service hook.
   TAO_Fault_Tolerance_Service ft_service_;
 
@@ -1296,7 +1291,6 @@ protected:
 class TAO_Export TAO_ORB_Core_Static_Resources : public ACE_Service_Object
 {
 public:
-
   /// Return the context-specific singleton instance.
   static TAO_ORB_Core_Static_Resources* instance ();
 
@@ -1366,14 +1360,12 @@ public:
   TAO_ORB_Core::Timeout_Hook alt_connection_timeout_hook_;
 
 //private:
-
   /// Constructor.
   TAO_ORB_Core_Static_Resources ();
   TAO_ORB_Core_Static_Resources& operator=
       (const TAO_ORB_Core_Static_Resources&);
 
 private:
-
   /// Mostly unused variable whose sole purpose is to enforce
   /// the instantiation of a TAO_ORB_Core_Static_Resources instance
   /// at initialization time.
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index 2b2091241ac..acf22b2eb44 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -11,7 +11,7 @@ TAO_ORB_Core::configuration () const
 }
 
 ACE_INLINE unsigned long
-TAO_ORB_Core::_incr_refcnt (void)
+TAO_ORB_Core::_incr_refcnt ()
 {
   return this->refcount_++;
 }
@@ -23,7 +23,7 @@ TAO_ORB_Core::_refcnt () const
 }
 
 ACE_INLINE unsigned long
-TAO_ORB_Core::_decr_refcnt (void)
+TAO_ORB_Core::_decr_refcnt ()
 {
   unsigned long const count = --this->refcount_;
   if (count != 0)
@@ -34,7 +34,7 @@ TAO_ORB_Core::_decr_refcnt (void)
 }
 
 ACE_INLINE ACE_Lock *
-TAO_ORB_Core::locking_strategy (void)
+TAO_ORB_Core::locking_strategy ()
 {
   if (this->resource_factory ()->use_locked_data_blocks ())
     return &this->data_block_lock_;
@@ -43,7 +43,7 @@ TAO_ORB_Core::locking_strategy (void)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::bidir_giop_policy (void)
+TAO_ORB_Core::bidir_giop_policy ()
 {
   return this->bidir_giop_policy_;
 }
@@ -55,31 +55,31 @@ TAO_ORB_Core::bidir_giop_policy (CORBA::Boolean val)
 }
 
 ACE_INLINE TAO_Object_Ref_Table &
-TAO_ORB_Core::object_ref_table (void)
+TAO_ORB_Core::object_ref_table ()
 {
   return this->object_ref_table_;
 }
 
 ACE_INLINE TAO::ObjectKey_Table &
-TAO_ORB_Core::object_key_table (void)
+TAO_ORB_Core::object_key_table ()
 {
   return this->object_key_table_;
 }
 
 ACE_INLINE TAO_Flushing_Strategy *
-TAO_ORB_Core::flushing_strategy (void)
+TAO_ORB_Core::flushing_strategy ()
 {
   return this->flushing_strategy_;
 }
 
 ACE_INLINE TAO_Protocols_Hooks *
-TAO_ORB_Core::get_protocols_hooks (void)
+TAO_ORB_Core::get_protocols_hooks ()
 {
   return this->protocols_hooks_;
 }
 
 ACE_INLINE TAO_Network_Priority_Protocols_Hooks *
-TAO_ORB_Core::get_network_priority_protocols_hooks (void)
+TAO_ORB_Core::get_network_priority_protocols_hooks ()
 {
   return this->network_priority_protocols_hooks_;
 }
@@ -142,43 +142,43 @@ TAO_ORB_Core::hash_service (TAO_Profile *p, CORBA::ULong m)
 }
 
 ACE_INLINE TAO_Fault_Tolerance_Service &
-TAO_ORB_Core::fault_tolerance_service (void)
+TAO_ORB_Core::fault_tolerance_service ()
 {
   return this->ft_service_;
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::ft_send_extended_sc (void)
+TAO_ORB_Core::ft_send_extended_sc ()
 {
   return this->ft_send_extended_sc_;
 }
 
 ACE_INLINE ACE_Thread_Manager *
-TAO_ORB_Core::thr_mgr (void)
+TAO_ORB_Core::thr_mgr ()
 {
   return &this->tm_;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-TAO_ORB_Core::orb (void)
+TAO_ORB_Core::orb ()
 {
   return this->orb_;
 }
 
 ACE_INLINE TAO_Adapter_Registry &
-TAO_ORB_Core::adapter_registry (void)
+TAO_ORB_Core::adapter_registry ()
 {
   return this->adapter_registry_;
 }
 
 ACE_INLINE TAO_Request_Dispatcher *
-TAO_ORB_Core::request_dispatcher (void)
+TAO_ORB_Core::request_dispatcher ()
 {
   return this->request_dispatcher_;
 }
 
 ACE_INLINE TAO_ORB_Core::InitRefMap *
-TAO_ORB_Core::init_ref_map (void)
+TAO_ORB_Core::init_ref_map ()
 {
   return &this->init_ref_map_;
 }
@@ -228,7 +228,7 @@ TAO_ORB_Core::get_collocation_strategy () const
 }
 
 ACE_INLINE TAO_ORB_Parameters *
-TAO_ORB_Core::orb_params(void)
+TAO_ORB_Core::orb_params()
 {
   return &(this->orb_params_);
 }
@@ -239,13 +239,13 @@ TAO_ORB_Core::orb_params(void)
   : (this->member##_))
 
 ACE_INLINE TAO_ProtocolFactorySet *
-TAO_ORB_Core::protocol_factories (void)
+TAO_ORB_Core::protocol_factories ()
 {
   return TAO_OC_RETRIEVE (protocol_factories);
 }
 
 ACE_INLINE TAO_Parser_Registry *
-TAO_ORB_Core::parser_registry (void)
+TAO_ORB_Core::parser_registry ()
 {
   return &this->parser_registry_;
 }
@@ -255,7 +255,7 @@ TAO_ORB_Core::parser_registry (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 ACE_INLINE TAO_Policy_Manager *
-TAO_ORB_Core::policy_manager (void)
+TAO_ORB_Core::policy_manager ()
 {
   return this->policy_manager_;
 }
@@ -263,7 +263,7 @@ TAO_ORB_Core::policy_manager (void)
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 ACE_INLINE TAO_ORB_Core_TSS_Resources*
-TAO_ORB_Core::get_tss_resources (void)
+TAO_ORB_Core::get_tss_resources ()
 {
   return ACE_TSS_GET (&this->tss_resources_,TAO_ORB_Core_TSS_Resources);
 }
@@ -353,19 +353,19 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::use_implrepo (void)
+TAO_ORB_Core::use_implrepo ()
 {
   return use_implrepo_;
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::imr_endpoints_in_ior (void)
+TAO_ORB_Core::imr_endpoints_in_ior ()
 {
   return imr_endpoints_in_ior_;
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_typecodefactory (void)
+TAO_ORB_Core::resolve_typecodefactory ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -379,7 +379,7 @@ TAO_ORB_Core::resolve_typecodefactory (void)
 #if TAO_HAS_INTERCEPTORS == 1
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_picurrent (void)
+TAO_ORB_Core::resolve_picurrent ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -393,7 +393,7 @@ TAO_ORB_Core::resolve_picurrent (void)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_codecfactory (void)
+TAO_ORB_Core::resolve_codecfactory ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -405,7 +405,7 @@ TAO_ORB_Core::resolve_codecfactory (void)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_compression_manager (void)
+TAO_ORB_Core::resolve_compression_manager ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -464,7 +464,7 @@ TAO_ORB_Core::orbinitializer_registry ()
 }
 
 ACE_INLINE TAO_Service_Context_Registry &
-TAO_ORB_Core::service_context_registry (void)
+TAO_ORB_Core::service_context_registry ()
 {
   return this->service_context_registry_;
 }
@@ -482,7 +482,7 @@ TAO_ORB_Core::policy_factory_registry ()
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_dynanyfactory (void)
+TAO_ORB_Core::resolve_dynanyfactory ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -494,7 +494,7 @@ TAO_ORB_Core::resolve_dynanyfactory (void)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_manipulation (void)
+TAO_ORB_Core::resolve_ior_manipulation ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -506,7 +506,7 @@ TAO_ORB_Core::resolve_ior_manipulation (void)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_table (void)
+TAO_ORB_Core::resolve_ior_table ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -518,7 +518,7 @@ TAO_ORB_Core::resolve_ior_table (void)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_async_ior_table (void)
+TAO_ORB_Core::resolve_async_ior_table ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -530,7 +530,7 @@ TAO_ORB_Core::resolve_async_ior_table (void)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_monitor (void)
+TAO_ORB_Core::resolve_monitor ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -546,7 +546,7 @@ TAO_ORB_Core::resolve_monitor (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 ACE_INLINE TAO_Policy_Current &
-TAO_ORB_Core::policy_current (void)
+TAO_ORB_Core::policy_current ()
 {
   return *this->policy_current_;
 }
@@ -554,7 +554,7 @@ TAO_ORB_Core::policy_current (void)
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_poa_current (void)
+TAO_ORB_Core::resolve_poa_current ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
@@ -568,7 +568,7 @@ TAO_ORB_Core::resolve_poa_current (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 ACE_INLINE  TAO_Policy_Set *
-TAO_ORB_Core::get_default_policies (void)
+TAO_ORB_Core::get_default_policies ()
 {
   return this->default_policies_;
 }
@@ -577,7 +577,7 @@ TAO_ORB_Core::get_default_policies (void)
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_orb (void)
+TAO_ORB_Core::resolve_rt_orb ()
 {
   if (CORBA::is_nil (this->rt_orb_.in ()))
     {
@@ -598,7 +598,7 @@ TAO_ORB_Core::resolve_rt_orb (void)
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::pi_current (void)
+TAO_ORB_Core::pi_current ()
 {
   // A pointer/reference to PICurrent is cached in the ORB Core since
   // it is accessed in the critical path (i.e. the request invocation
@@ -616,13 +616,13 @@ TAO_ORB_Core::pi_current (CORBA::Object_ptr current)
 }
 
 ACE_INLINE TAO::ClientRequestInterceptor_Adapter *
-TAO_ORB_Core::clientrequestinterceptor_adapter (void)
+TAO_ORB_Core::clientrequestinterceptor_adapter ()
 {
   return this->client_request_interceptor_adapter_;
 }
 
 ACE_INLINE TAO::ServerRequestInterceptor_Adapter *
-TAO_ORB_Core::serverrequestinterceptor_adapter (void)
+TAO_ORB_Core::serverrequestinterceptor_adapter ()
 {
   return this->server_request_interceptor_adapter_;
 }
@@ -657,7 +657,7 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook)
 
 ACE_INLINE
 Messaging::SyncScope
-TAO_ORB_Core::default_sync_scope (void)
+TAO_ORB_Core::default_sync_scope ()
 {
   return this->default_sync_scope_;
 }
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl
index a44313f7874..5381056e570 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.inl
+++ b/TAO/tao/ORB_Core_Auto_Ptr.inl
@@ -15,7 +15,7 @@ TAO_ORB_Core_Auto_Ptr::get () const
 }
 
 ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Core_Auto_Ptr::release (void)
+TAO_ORB_Core_Auto_Ptr::release ()
 {
   TAO_ORB_Core *old = this->p_;
   this->p_ = 0;
diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h
index 01e5a60de9c..922b827db7f 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.h
+++ b/TAO/tao/ORB_Core_TSS_Resources.h
@@ -39,7 +39,6 @@ class TAO_ORB_Core;
 class TAO_Export TAO_ORB_Core_TSS_Resources
 {
 public:
-
   /// Constructor
   TAO_ORB_Core_TSS_Resources ();
 
@@ -50,13 +49,11 @@ public:
   void fini ();
 
 private:
-
   /// The ORB Core TSS resources should not be copied
   TAO_ORB_Core_TSS_Resources (const TAO_ORB_Core_TSS_Resources&);
   void operator= (const TAO_ORB_Core_TSS_Resources&);
 
 public:
-
   /**
    * @todo
    * The rest of the resources are not currently in use, just a plan
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 8841c8d34a3..3d5b0415120 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -61,7 +61,6 @@ namespace TAO
   class TAO_Export ORB_Table
   {
   public:
-
     /// Constructor
     /**
      * @note See the note in the class description for an explanation
@@ -119,7 +118,6 @@ namespace TAO
     TAO_SYNCH_MUTEX & lock ();
 
   private:
-
     // Prevent copying
     ORB_Table (const ORB_Table &);
     void operator= (const ORB_Table &);
@@ -129,7 +127,6 @@ namespace TAO
     ::TAO_ORB_Core * find_i (char const * orb_id);
 
   private:
-
     /// Lock used to synchronize access to the internal state.
     ::TAO_SYNCH_MUTEX lock_;
 
@@ -156,7 +153,6 @@ namespace TAO
   class ORB_Core_Ref_Counter
   {
   public:
-
     /// Constructor.
     ORB_Core_Ref_Counter ();
 
@@ -178,7 +174,6 @@ namespace TAO
   private:
     ::TAO_ORB_Core * core_;
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index 8994755cbb4..cb896f50cf6 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -6,32 +6,32 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ::TAO_ORB_Core *
-TAO::ORB_Table::first_orb (void)
+TAO::ORB_Table::first_orb ()
 {
   return this->first_orb_;
 }
 
 ACE_INLINE TAO::ORB_Table::iterator
-TAO::ORB_Table::begin (void)
+TAO::ORB_Table::begin ()
 {
   return this->table_.begin ();
 }
 
 ACE_INLINE TAO::ORB_Table::iterator
-TAO::ORB_Table::end (void)
+TAO::ORB_Table::end ()
 {
   return this->table_.end ();
 }
 
 /// Accessor to the underlying table_
 ACE_INLINE TAO::ORB_Table::Table *
-TAO::ORB_Table::table (void)
+TAO::ORB_Table::table ()
 {
   return &this->table_;
 }
 
 ACE_INLINE TAO_SYNCH_MUTEX &
-TAO::ORB_Table::lock (void)
+TAO::ORB_Table::lock ()
 {
   return this->lock_;
 }
@@ -39,7 +39,7 @@ TAO::ORB_Table::lock (void)
 // ****************************************************************
 
 ACE_INLINE
-TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (void)
+TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter ()
   : core_ (0)
 {
 }
@@ -58,7 +58,7 @@ TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (::TAO_ORB_Core * core)
 }
 
 ACE_INLINE
-TAO::ORB_Core_Ref_Counter::~ORB_Core_Ref_Counter (void)
+TAO::ORB_Core_Ref_Counter::~ORB_Core_Ref_Counter ()
 {
   if (this->core_)
     (void) this->core_->_decr_refcnt (); // Should never throw.
diff --git a/TAO/tao/ORB_Time_Policy.h b/TAO/tao/ORB_Time_Policy.h
index 9c8a8ee4fe7..716144fa011 100644
--- a/TAO/tao/ORB_Time_Policy.h
+++ b/TAO/tao/ORB_Time_Policy.h
@@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class ORB_Time_Policy
    *
@@ -43,7 +42,7 @@ namespace TAO
     ACE_Time_Value operator() () const;
 
     static void set_time_policy (ACE_Dynamic_Time_Policy_Base const * pol);
-    static void reset_time_policy (void);
+    static void reset_time_policy ();
 
   private:
     static ACE_Time_Policy_T<ACE_Default_Time_Policy> default_policy_;
@@ -52,7 +51,6 @@ namespace TAO
 
   // Declare a countdown timer type based on ORB time policy
   typedef ACE_Countdown_Time_T<ORB_Time_Policy> ORB_Countdown_Time;
-
 } // TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index fa7b87bf276..74c4e0893cd 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -25,7 +25,7 @@ namespace TAO
   }
 
   int
-  ORT_Adapter_Factory_Impl::Initializer (void)
+  ORT_Adapter_Factory_Impl::Initializer ()
   {
     TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory");
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index 2be657f40e6..bb706f1b024 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -47,7 +47,7 @@ namespace TAO
     virtual void destroy (TAO::ORT_Adapter * adapter);
 
     /// Used to force the initialization of the code.
-    static int Initializer (void);
+    static int Initializer ();
   };
 }
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index f37408a2986..ecdfb1afed6 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -7,21 +7,21 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
-TAO::ORT_Adapter_Impl::tao_server_id (void)
+TAO::ORT_Adapter_Impl::tao_server_id ()
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->server_id ();
 }
 
 char *
-TAO::ORT_Adapter_Impl::tao_orb_id (void)
+TAO::ORT_Adapter_Impl::tao_orb_id ()
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->orb_id ();
 }
 
 PortableInterceptor::AdapterName *
-TAO::ORT_Adapter_Impl::tao_adapter_name (void)
+TAO::ORT_Adapter_Impl::tao_adapter_name ()
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->adapter_name ();
@@ -35,7 +35,7 @@ TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
-TAO::ORT_Adapter_Impl::get_adapter_template (void)
+TAO::ORT_Adapter_Impl::get_adapter_template ()
 {
   CORBA::add_ref (this->ort_template_.in ());
 
@@ -43,7 +43,7 @@ TAO::ORT_Adapter_Impl::get_adapter_template (void)
 }
 
 PortableInterceptor::ObjectReferenceFactory *
-TAO::ORT_Adapter_Impl::get_obj_ref_factory (void)
+TAO::ORT_Adapter_Impl::get_obj_ref_factory ()
 {
   CORBA::add_ref (this->ort_factory_.in ());
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index 76ed5d7908f..e447c6fb066 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -44,10 +44,10 @@ namespace TAO
                           PortableServer::POA_ptr poa);
 
     /// Accessor methods to ObjectReferenceTemplate template
-    virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
+    virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template ();
 
     /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-    virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
+    virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory ();
 
     /// Set a different ort_factory to be used.
     virtual int set_obj_ref_factory (
@@ -63,11 +63,11 @@ namespace TAO
      * Methods
      */
     //@{
-    virtual char * tao_server_id (void);
+    virtual char * tao_server_id ();
 
-    virtual char * tao_orb_id (void);
+    virtual char * tao_orb_id ();
 
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (void);
+    virtual PortableInterceptor::AdapterName * tao_adapter_name ();
     //@}
 
     /**
@@ -83,7 +83,6 @@ namespace TAO
     //@}
 
   private:
-
     /// The ORT Template, this is the factory and its identity.
     PortableInterceptor::ObjectReferenceTemplate_var ort_template_;
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index f056136bd08..ca21f06d662 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -20,12 +20,12 @@ namespace TAO
   {
   }
 
-  ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+  ObjectReferenceTemplate::~ObjectReferenceTemplate ()
   {
   }
 
   ::CORBA::ValueBase *
-  ObjectReferenceTemplate::_copy_value (void)
+  ObjectReferenceTemplate::_copy_value ()
   {
     ::CORBA::ValueBase *ret_val= 0;
     ACE_NEW_THROW_EX (
@@ -42,19 +42,19 @@ namespace TAO
   }
 
   char *
-  ObjectReferenceTemplate::server_id (void)
+  ObjectReferenceTemplate::server_id ()
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
-  ObjectReferenceTemplate::orb_id (void)
+  ObjectReferenceTemplate::orb_id ()
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
-  ObjectReferenceTemplate::adapter_name (void)
+  ObjectReferenceTemplate::adapter_name ()
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index ac8a30f5e59..ce424be95cb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -58,7 +58,7 @@ namespace TAO
                              const char *orb_id,
                              PortableInterceptor::AdapterName *adapter_name,
                              PortableServer::POA_ptr poa);
-    ::CORBA::ValueBase *_copy_value (void);
+    ::CORBA::ValueBase *_copy_value ();
 
     /**
      * @name PortableInterceptor::ObjectReferenceTemplate Methods
@@ -67,11 +67,11 @@ namespace TAO
      * PortableInterceptor::ObjectReferenceTemplate ValueType.
      */
     //@{
-    virtual char * server_id (void);
+    virtual char * server_id ();
 
-    virtual char * orb_id (void);
+    virtual char * orb_id ();
 
-    virtual PortableInterceptor::AdapterName * adapter_name (void);
+    virtual PortableInterceptor::AdapterName * adapter_name ();
     //@}
 
     /**
@@ -92,7 +92,7 @@ namespace TAO
      * Protected destructor to enforce proper memory management via
      * reference counting.
      */
-    ~ObjectReferenceTemplate (void);
+    ~ObjectReferenceTemplate ();
 
   private:
     const char *server_id_;
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index b6c5474b37f..9d00c62275c 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -34,7 +34,6 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
 TAO::ObjectKey_Table::ObjectKey_Table ()
   : table_ ()
 {
-
 }
 
 TAO::ObjectKey_Table::~ObjectKey_Table ()
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index cda65442d17..2928beea0e4 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -30,7 +30,6 @@ class TAO_ORB_Core;
 
 namespace TAO
 {
-
   // Forward declarations within the namespace..
   class Refcounted_ObjectKey;
   class ObjectKey;
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index 85db86a0193..e4a318e7db2 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -51,7 +51,7 @@ TAO::In_Object_Argument_Cloner_T<S_ptr>::release (S_ptr objref)
 
 template<typename S_ptr,
          template <typename> class Insert_Policy>
-TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Argument_T (void)
+TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -62,7 +62,7 @@ TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::~In_Object_Clonable_Arg
 template<typename S_ptr,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::clone (void)
+TAO::In_Object_Clonable_Argument_T<S_ptr,Insert_Policy>::clone ()
 {
   In_Object_Argument_Cloner_T<S_ptr>::duplicate (this->x_);
 
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index a2e2937c869..bfb8af789da 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -136,7 +136,6 @@ namespace TAO
   class Ret_Object_Argument_T : public RetArgument
   {
   public:
-
     Ret_Object_Argument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl
index 06bb71e0764..f54fa40f739 100644
--- a/TAO/tao/Object_Argument_T.inl
+++ b/TAO/tao/Object_Argument_T.inl
@@ -42,7 +42,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -62,7 +62,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_out
-TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -73,7 +73,7 @@ template<typename S_ptr,
          typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T ()
 {}
 
 template<typename S_ptr,
@@ -81,7 +81,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -91,7 +91,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp ()
 {
   return this->x_.ptr ();
 }
@@ -101,7 +101,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn ()
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 3ad8a251c09..f7654d0916d 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -56,7 +56,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl
index 1f053542e9d..c69c8fbf510 100644
--- a/TAO/tao/Object_Ref_Table.inl
+++ b/TAO/tao/Object_Ref_Table.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
+TAO_Object_Ref_Table::TAO_Object_Ref_Table ()
   : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
   , lock_ ()
 {
@@ -21,7 +21,7 @@ TAO_Object_Ref_Table::find_i (const char *id)
 }
 
 ACE_INLINE void
-TAO_Object_Ref_Table::destroy (void)
+TAO_Object_Ref_Table::destroy ()
 {
   Table tmp;
 
@@ -33,13 +33,13 @@ TAO_Object_Ref_Table::destroy (void)
 }
 
 ACE_INLINE TAO_Object_Ref_Table::iterator
-TAO_Object_Ref_Table::begin (void)
+TAO_Object_Ref_Table::begin ()
 {
   return this->table_.begin ();
 }
 
 ACE_INLINE TAO_Object_Ref_Table::iterator
-TAO_Object_Ref_Table::end (void)
+TAO_Object_Ref_Table::end ()
 {
   return this->table_.end ();
 }
diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
index 31f3aa3226e..8b9b5b4c9eb 100644
--- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
+++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
@@ -16,7 +16,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename obj_ref_traits>
 class object_reference_const_sequence_element
 {
@@ -75,7 +74,6 @@ private:
   value_type const * const element_;
   CORBA::Boolean const release_;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h
index 08e283e91e7..5f1830bd955 100644
--- a/TAO/tao/Object_Reference_Sequence_Element_T.h
+++ b/TAO/tao/Object_Reference_Sequence_Element_T.h
@@ -18,7 +18,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename obj_ref_traits>
 class object_reference_sequence_element
 {
@@ -126,7 +125,6 @@ private:
   value_type * element_;
   CORBA::Boolean release_;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/Object_Reference_Traits_Base_T.h b/TAO/tao/Object_Reference_Traits_Base_T.h
index 74b1f4dd490..22be2aea432 100644
--- a/TAO/tao/Object_Reference_Traits_Base_T.h
+++ b/TAO/tao/Object_Reference_Traits_Base_T.h
@@ -16,7 +16,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename object_t, typename object_t_var>
 struct object_reference_traits_base
 {
@@ -45,7 +44,6 @@ struct object_reference_traits_base
     return nil();
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h
index 8e30e2ed591..7f5d85519aa 100644
--- a/TAO/tao/Object_Reference_Traits_T.h
+++ b/TAO/tao/Object_Reference_Traits_T.h
@@ -20,7 +20,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<class object_t, class object_t_var, class derived>
 struct object_reference_traits_decorator
 {
@@ -83,7 +82,6 @@ struct object_reference_traits
   typedef object_type const * const_value_type;
   typedef object_t_var object_type_var;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h
index a695f89f735..4005603e825 100644
--- a/TAO/tao/On_Demand_Fragmentation_Strategy.h
+++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h
@@ -46,7 +46,7 @@ public:
   TAO_On_Demand_Fragmentation_Strategy (TAO_Transport * transport,
                                         ACE_CDR::ULong max_message_size);
 
-  virtual ~TAO_On_Demand_Fragmentation_Strategy (void);
+  virtual ~TAO_On_Demand_Fragmentation_Strategy ();
   virtual int fragment (TAO_OutputCDR & cdr,
                         ACE_CDR::ULong pending_alignment,
                         ACE_CDR::ULong pending_length);
diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl
index 04a89167a0d..2e55e442c79 100644
--- a/TAO/tao/PI/ClientRequestDetails.inl
+++ b/TAO/tao/PI/ClientRequestDetails.inl
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   ACE_INLINE
-  ClientRequestDetails::ClientRequestDetails (void)
+  ClientRequestDetails::ClientRequestDetails ()
     : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE)
   {
   }
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
index c8e3770dccd..561aa6c284e 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   ACE_INLINE
-  ClientRequestInterceptor_Adapter_Impl::ClientRequestInterceptor_Adapter_Impl (void)
+  ClientRequestInterceptor_Adapter_Impl::ClientRequestInterceptor_Adapter_Impl ()
   {
   }
 }
diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
index 306e088b265..b6ede5251ec 100644
--- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
+++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
@@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
   /**
    * @class DLL_Resident_ORB_Initializer
    *
@@ -76,4 +75,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 
 
-
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 1fd298a8791..929797f21c1 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   template <typename InterceptorType, typename DetailsType>
-  Interceptor_List<InterceptorType,DetailsType>::Interceptor_List (void)
+  Interceptor_List<InterceptorType,DetailsType>::Interceptor_List ()
   {
   }
 
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 9e64004cea7..f8bf10cca54 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -55,7 +55,6 @@ class TAO_PI_Export TAO_ORBInitInfo
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
                    int argc,
@@ -241,7 +240,6 @@ private:
 
   /// The number of allocated slots.
   PortableInterceptor::SlotId slot_count_;
-
 };
 
 // Traits specializations.
diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl
index 6dbf4a37bdf..9a4e71b5a58 100644
--- a/TAO/tao/PI/ORBInitInfo.inl
+++ b/TAO/tao/PI/ORBInitInfo.inl
@@ -9,7 +9,7 @@ TAO_ORBInitInfo::orb_core () const
 }
 
 ACE_INLINE void
-TAO_ORBInitInfo::invalidate (void)
+TAO_ORBInitInfo::invalidate ()
 {
   this->orb_core_ = 0;
 }
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index addfd85df07..51460d65a4c 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_PI_Export TAO_PI_Init
 {
 public:
-
   /// Used to force the initialization of the ORB code.
   static int Initializer ();
 };
diff --git a/TAO/tao/PI/PolicyFactoryA.h b/TAO/tao/PI/PolicyFactoryA.h
index 861f812f98d..e957c8ba187 100644
--- a/TAO/tao/PI/PolicyFactoryA.h
+++ b/TAO/tao/PI/PolicyFactoryA.h
@@ -41,7 +41,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
 
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index f97f52df981..4c6b401933f 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -54,7 +54,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
@@ -112,7 +111,6 @@ namespace PortableInterceptor
     }
 
 
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
@@ -166,7 +164,6 @@ namespace PortableInterceptor
 // Traits specializations.
 namespace TAO
 {
-
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_
 
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index 252e0f9f1cf..38164a13173 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -19,10 +19,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO::PolicyFactory_Registry_Adapter*
 TAO_PolicyFactory_Loader::create ()
 {
-  TAO::PolicyFactory_Registry_Adapter* obj = 0;
+  TAO::PolicyFactory_Registry_Adapter* obj = nullptr;
   ACE_NEW_RETURN (obj,
                   TAO_PolicyFactory_Registry,
-                  0);
+                  nullptr);
   return obj;
 }
 
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h
index 16014c78dca..3f26e0f8604 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.h
+++ b/TAO/tao/PI_Server/PICurrent_Guard.h
@@ -48,7 +48,6 @@ namespace TAO
   class PICurrent_Guard
   {
   public:
-
     /// Constructor
     /**
      * This constructor sets up this guard to copy the data held in a
@@ -75,7 +74,6 @@ namespace TAO
     ~PICurrent_Guard ();
 
   private:
-
     /// The PICurrent implementation whose slot table will be copied.
     PICurrent_Impl *src_;
 
diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h
index f38922a5209..b7f7d0985e9 100644
--- a/TAO/tao/PI_Server/PI_Server.h
+++ b/TAO/tao/PI_Server/PI_Server.h
@@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_PI_Server_Export TAO_PI_Server_Init
 {
 public:
-
   /// Used to force the initialization of the ORB code.
   static int Initializer ();
 };
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl
index 741f4e88481..bc039b36ffe 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.inl
+++ b/TAO/tao/PI_Server/ServerRequestDetails.inl
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   ACE_INLINE
-  ServerRequestDetails::ServerRequestDetails (void)
+  ServerRequestDetails::ServerRequestDetails ()
     : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE)
   {
   }
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index 279a231b79c..47b36ca9678 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -107,7 +107,7 @@ namespace TAO
     /// Return the @c sync_scope policy value for the current one-way
     /// operation.  If the operation is not a one-way, a
     /// @c CORBA::BAD_INV_ORDER exception is thrown.
-    virtual Messaging::SyncScope sync_scope ();
+    virtual ::Messaging::SyncScope sync_scope ();
 
     /// Return the reply status for the current request.
     /**
@@ -188,7 +188,6 @@ namespace TAO
      * @name Helper methods specific to TAO.
      */
     //@{
-
     /// Extract the forward object reference from the
     /// @c PortableInterceptor::ForwardRequest exception, and set the
     /// reply status flag accordingly.
@@ -239,7 +238,6 @@ namespace TAO
     /// The number of elements in the @c exceptions_ array.
     CORBA::ULong const nexceptions_;
   };
-
 }  // End namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index 836e40c0572..b8fcfc01812 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -44,7 +44,7 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
 }
 
 ACE_INLINE TAO_ServerRequest &
-TAO::ServerRequestInfo::server_request (void)
+TAO::ServerRequestInfo::server_request ()
 {
   return this->server_request_;
 }
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
index c9e7ad47ee1..49505bfa846 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
@@ -44,7 +44,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index 4dce9d6cc6a..46e13639fe3 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -56,7 +56,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
@@ -137,7 +136,6 @@ namespace PortableInterceptor
     }
 
 
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
@@ -232,7 +230,6 @@ namespace PortableInterceptor
 // Traits specializations.
 namespace TAO
 {
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
 
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
index 10495530423..bb7e02348b2 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -60,19 +60,16 @@ public:
   Parser_Iterator end () const;
 
 private:
-
   // The parser registry should not be copied.
   TAO_Parser_Registry (const TAO_Parser_Registry&);
   void operator= (const TAO_Parser_Registry&);
 
 private:
-
   /// List of parsers
   TAO_IOR_Parser **parsers_;
 
   /// Number of parsers
   size_t size_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl
index e067d668d8f..aaef69fee3a 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.inl
+++ b/TAO/tao/Pluggable_Messaging_Utils.inl
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
+TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base ()
   : svc_ctx_ (),
     request_id_ (0),
     is_dsi_ (0),
@@ -47,7 +47,7 @@ TAO_Pluggable_Reply_Params_Base::service_context_notowned (
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_Pluggable_Reply_Params_Base::service_context_notowned (void)
+TAO_Pluggable_Reply_Params_Base::service_context_notowned ()
 {
   return *this->service_context_;
 }
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index 5770b261738..41a4adc1a5d 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -37,7 +37,7 @@ class TAO_Policy_Current
 {
 public:
   /// Constructor
-  TAO_Policy_Current (void);
+  TAO_Policy_Current ();
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl
index 7342464a589..3cb318f2544 100644
--- a/TAO/tao/Policy_Current.inl
+++ b/TAO/tao/Policy_Current.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Policy_Current::TAO_Policy_Current (void)
+TAO_Policy_Current::TAO_Policy_Current ()
 {
 }
 
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h
index d370f8a7255..dcf99e5e5ed 100644
--- a/TAO/tao/Policy_Current_Impl.h
+++ b/TAO/tao/Policy_Current_Impl.h
@@ -35,7 +35,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Policy_Current_Impl
 {
 public:
-
   TAO_Policy_Current_Impl ();
 
   /// Obtain a single policy.
diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl
index b946ea2f974..032654f700e 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
+TAO_Policy_Current_Impl::TAO_Policy_Current_Impl ()
   : manager_impl_ (TAO_POLICY_THREAD_SCOPE)
 {
 }
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 97a2fea0484..382ec780394 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -37,7 +37,7 @@ class TAO_Policy_Manager
 {
 public:
   /// constructor
-  TAO_Policy_Manager (void);
+  TAO_Policy_Manager ();
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl
index 5d1a7f602fa..6b30f704e2c 100644
--- a/TAO/tao/Policy_Manager.inl
+++ b/TAO/tao/Policy_Manager.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Policy_Manager::TAO_Policy_Manager (void)
+TAO_Policy_Manager::TAO_Policy_Manager ()
   : impl_ (TAO_POLICY_ORB_SCOPE)
 {
 }
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 1e415564ecd..04cf7bd28db 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_Policy_Set
 {
 public:
-
   /** Creates a TAO_Policy_Set that has a given scope. The
    * scope is used to determinate whether or not a given policy can
    * be set for the given Policy Manager Implementation.
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index d2580db35b1..f9e7e6ca05a 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -55,7 +55,6 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
     }
 }
 
-
 void
 TAO_Policy_Validator::validate (TAO_Policy_Set &policies)
 {
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index aa81eff08c6..c052494c862 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory(void)
+TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory()
 {
 }
 
@@ -24,7 +24,7 @@ TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& )
 
 
 int
-TAO_Acceptor_Filter_Factory::initialize (void)
+TAO_Acceptor_Filter_Factory::initialize ()
 {
   return ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Acceptor_Filter_Factory);
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index e7e9478d11d..9f626b82f58 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -322,7 +322,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
 #endif /* TAO_HAS_MONITOR_POINTS==1 */
 }
 
-TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
+TAO_Active_Object_Map::~TAO_Active_Object_Map ()
 {
   user_id_map::iterator iterator = this->user_id_map_->begin ();
   user_id_map::iterator end = this->user_id_map_->end ();
@@ -377,7 +377,7 @@ TAO_Active_Object_Map::is_user_id_in_map (
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy (void)
+TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy ()
 {
 }
 
@@ -790,7 +790,7 @@ TAO_Multiple_Id_Strategy::remaining_activations (
 }
 #endif
 
-TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy (void)
+TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy ()
 {
 }
 
@@ -913,7 +913,7 @@ TAO_Active_Object_Map_Entry *&entry)
 }
 #endif
 
-TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy (void)
+TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy ()
 {
 }
 
@@ -1071,7 +1071,7 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy (void)
+TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy ()
 {
 }
 
@@ -1082,7 +1082,7 @@ TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size)
 {
 }
 
-TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy (void)
+TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy ()
 {
 }
 
@@ -1118,7 +1118,7 @@ TAO_Active_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
 }
 
 size_t
-TAO_Active_Hint_Strategy::hint_size (void)
+TAO_Active_Hint_Strategy::hint_size ()
 {
   return ACE_Active_Map_Manager_Key::size ();
 }
@@ -1135,7 +1135,7 @@ TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy (void)
+TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy ()
 {
 }
 
@@ -1172,7 +1172,7 @@ TAO_No_Hint_Strategy::find (const PortableServer::ObjectId &,
 }
 
 size_t
-TAO_No_Hint_Strategy::hint_size (void)
+TAO_No_Hint_Strategy::hint_size ()
 {
   return 0;
 }
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index d2b688d7dd6..b4eb5ef21ea 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -48,7 +48,6 @@ struct TAO_Active_Object_Map_Entry;
 class TAO_Active_Object_Map
 {
 public:
-
   /// Constructor.
   TAO_Active_Object_Map (
     int user_id_policy,
@@ -321,7 +320,6 @@ public:
   set_active_object_map (TAO_Active_Object_Map *active_object_map);
 
 protected:
-
   /// Pointer to the active map.
   TAO_Active_Object_Map *active_object_map_;
 };
@@ -336,7 +334,6 @@ protected:
 class TAO_Unique_Id_Strategy : public TAO_Id_Uniqueness_Strategy
 {
 public:
-
   /// Must be used with UNIQUE_ID policy.
   virtual int
   is_servant_in_map (PortableServer::Servant servant,
@@ -385,7 +382,6 @@ public:
 class TAO_Multiple_Id_Strategy : public TAO_Id_Uniqueness_Strategy
 {
 public:
-
   /// Must be used with UNIQUE_ID policy.
   virtual int
   is_servant_in_map (PortableServer::Servant servant,
@@ -435,7 +431,6 @@ public:
 class TAO_Lifespan_Strategy
 {
 public:
-
   /// Virtual destructor.
   virtual ~TAO_Lifespan_Strategy ();
 
@@ -452,7 +447,6 @@ public:
   set_active_object_map (TAO_Active_Object_Map *active_object_map);
 
 protected:
-
   /// Pointer to the active map.
   TAO_Active_Object_Map *active_object_map_;
 };
@@ -522,7 +516,6 @@ public:
   set_active_object_map (TAO_Active_Object_Map *active_object_map);
 
 protected:
-
   /// Pointer to the active map.
   TAO_Active_Object_Map *active_object_map_;
 };
diff --git a/TAO/tao/PortableServer/Active_Object_Map.inl b/TAO/tao/PortableServer/Active_Object_Map.inl
index fad3a561bd3..079939283d5 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.inl
+++ b/TAO/tao/PortableServer/Active_Object_Map.inl
@@ -275,14 +275,14 @@ TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant)
 }
 
 ACE_INLINE size_t
-TAO_Active_Object_Map::current_size (void)
+TAO_Active_Object_Map::current_size ()
 {
   return this->user_id_map_->current_size ();
 }
 
 /* static */
 ACE_INLINE size_t
-TAO_Active_Object_Map::system_id_size (void)
+TAO_Active_Object_Map::system_id_size ()
 {
   return TAO_Active_Object_Map::system_id_size_;
 }
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index 84d938be575..1baf0f276a8 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
+TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry ()
   : user_id_ (),
     system_id_ (),
     servant_ (0),
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index c67e751dd84..cbb9434cf71 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -38,7 +38,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    Active_Policy_Strategies::Active_Policy_Strategies (void)
+    Active_Policy_Strategies::Active_Policy_Strategies ()
       : thread_strategy_ (0),
         request_processing_strategy_ (0),
         id_assignment_strategy_ (0),
@@ -123,8 +123,6 @@ namespace TAO
 
       /**/
 
-// @todo, check if all pointers are != 0
-
       if (this->lifespan_strategy_ != 0)
         {
           this->lifespan_strategy_->strategy_init (poa);
@@ -162,9 +160,8 @@ namespace TAO
     }
 
     void
-    Active_Policy_Strategies::cleanup (void)
+    Active_Policy_Strategies::cleanup ()
     {
-
       if (this->lifespan_strategy_ != 0)
         {
           this->lifespan_strategy_factory_->destroy (lifespan_strategy_);
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
index 61d2bb711a6..b28b53ea4a5 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -63,7 +63,7 @@ namespace TAO
 
     ACE_INLINE
     Active_Policy_Strategies_Cleanup_Guard
-      ::~Active_Policy_Strategies_Cleanup_Guard (void)
+      ::~Active_Policy_Strategies_Cleanup_Guard ()
     {
       if (this->ptr_)
         {
@@ -73,7 +73,7 @@ namespace TAO
 
     ACE_INLINE
     Active_Policy_Strategies *
-    Active_Policy_Strategies_Cleanup_Guard::_retn (void)
+    Active_Policy_Strategies_Cleanup_Guard::_retn ()
     {
       Active_Policy_Strategies *temp = this->ptr_;
       this->ptr_ = 0;
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index 9b682bd4bbd..1dbd80cbcb7 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -39,7 +39,7 @@ namespace TAO
   class In_BD_String_SArgument_T : public InArgument
   {
   public:
-    In_BD_String_SArgument_T (void);
+    In_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
@@ -63,14 +63,14 @@ namespace TAO
   class Inout_BD_String_SArgument_T : public InoutArgument
   {
   public:
-    Inout_BD_String_SArgument_T (void);
+    Inout_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     S_var x_;
@@ -88,13 +88,13 @@ namespace TAO
   class Out_BD_String_SArgument_T : public OutArgument
   {
   public:
-    Out_BD_String_SArgument_T (void);
+    Out_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     S_var x_;
@@ -112,13 +112,13 @@ namespace TAO
   class Ret_BD_String_SArgument_T : public RetArgument
   {
   public:
-    Ret_BD_String_SArgument_T (void);
+    Ret_BD_String_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_var::s_traits::char_type *& arg (void);
+    typename S_var::s_traits::char_type *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
index 6616af35a12..def47e46280 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
@@ -6,7 +6,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-In_BD_String_SArgument_T (void)
+In_BD_String_SArgument_T ()
 {}
 
 template<typename S_var,
@@ -27,7 +27,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-Inout_BD_String_SArgument_T (void)
+Inout_BD_String_SArgument_T ()
 {}
 
 template<typename S_var,
@@ -36,7 +36,7 @@ template<typename S_var,
 ACE_INLINE
 typename S_var::s_traits::char_type *&
 TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-arg (void)
+arg ()
 {
   return this->x_.inout ();
 }
@@ -48,7 +48,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-Out_BD_String_SArgument_T (void)
+Out_BD_String_SArgument_T ()
 {}
 
 template<typename S_var,
@@ -57,7 +57,7 @@ template<typename S_var,
 ACE_INLINE
 typename S_var::s_traits::char_type *&
 TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-arg (void)
+arg ()
 {
   return this->x_.out ();
 }
@@ -69,7 +69,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-Ret_BD_String_SArgument_T (void)
+Ret_BD_String_SArgument_T ()
 {}
 
 template<typename S_var,
@@ -78,7 +78,7 @@ template<typename S_var,
 ACE_INLINE
 typename S_var::s_traits::char_type *&
 TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>::
-arg (void)
+arg ()
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl
index b9d5f96a1f4..b508d924a29 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T ()
 {}
 
 template<typename S,
@@ -21,14 +21,14 @@ TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg () const
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T (void)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T ()
 {}
 
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -38,14 +38,14 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T (void)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T ()
 {}
 
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -55,14 +55,14 @@ TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T (void)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T ()
 {}
 
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
index fedd66c3afc..f916b637c00 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -36,10 +36,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<void>
   {
   public:
-
     typedef void        ret_type;
     typedef RetArgument ret_val;
-
   };
 
   /**
diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
index c0624954643..8d5105e2d01 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
@@ -5,8 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
-Collocated_Arguments_Converter::~Collocated_Arguments_Converter (void)
+Collocated_Arguments_Converter::~Collocated_Arguments_Converter ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h
index 656de9a53d2..84a8e0e7e78 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h
@@ -40,7 +40,6 @@ class TAO_PortableServer_Export Collocated_Arguments_Converter :
   public ACE_Service_Object
 {
 public:
-
   virtual ~Collocated_Arguments_Converter ();
 
   virtual void convert_request (TAO_ServerRequest & server_request,
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
index 4b13c32be55..a3bfc8e440a 100644
--- a/TAO/tao/PortableServer/Creation_Time.h
+++ b/TAO/tao/PortableServer/Creation_Time.h
@@ -52,7 +52,6 @@ namespace TAO
       bool operator!= (const Temporary_Creation_Time &rhs) const;
 
     protected:
-
       enum
       {
         SEC_FIELD = 0,
@@ -61,7 +60,6 @@ namespace TAO
 
       /// Timestamp
       CORBA::ULong time_stamp_[2];
-
     };
 
     /**
@@ -75,7 +73,6 @@ namespace TAO
     class Temporary_Creation_Time
     {
     public:
-
       Temporary_Creation_Time ();
 
       void creation_time (const void *creation_time);
@@ -85,7 +82,6 @@ namespace TAO
       bool operator!= (const Creation_Time &rhs) const;
 
     protected:
-
       void *time_stamp_;
     };
   }
diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl
index 7308e632c6f..5a4785c550c 100644
--- a/TAO/tao/PortableServer/Creation_Time.inl
+++ b/TAO/tao/PortableServer/Creation_Time.inl
@@ -9,7 +9,7 @@ namespace TAO
   namespace Portable_Server
   {
     ACE_INLINE CORBA::ULong
-    Creation_Time::creation_time_length (void)
+    Creation_Time::creation_time_length ()
     {
       return 2 * sizeof (CORBA::ULong);
     }
@@ -22,7 +22,7 @@ namespace TAO
     }
 
     ACE_INLINE
-    Creation_Time::Creation_Time (void)
+    Creation_Time::Creation_Time ()
     {
       this->time_stamp_[Creation_Time::SEC_FIELD]  = 0;
       this->time_stamp_[Creation_Time::USEC_FIELD] = 0;
@@ -107,7 +107,7 @@ namespace TAO
     }
 
     ACE_INLINE
-    Temporary_Creation_Time::Temporary_Creation_Time (void)
+    Temporary_Creation_Time::Temporary_Creation_Time ()
       : time_stamp_ (0)
     {
     }
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 84c6d9f06a2..40f93a288a6 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -12,10 +12,6 @@ TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator (
 {
 }
 
-TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator ()
-{
-}
-
 void
 TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies)
 {
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index e0f17e71dd4..f185890c747 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -30,12 +30,11 @@ class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator
   : public TAO_Policy_Validator
 {
 public:
-
   /// Constructor.
   TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_POA_Default_Policy_Validator ();
+  ~TAO_POA_Default_Policy_Validator () = default;
 
 protected:
   /**
@@ -55,7 +54,6 @@ protected:
    * validate () routine, and these need to be caught.
    */
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
index 7d80c642ebf..2cec9553697 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
@@ -60,7 +60,6 @@ namespace TAO
       size_t op_len,
       TAO::Collocation_Strategy strategy);
   };
-
 }  // End namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
index 11e778ca6a9..3147aefa654 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -5,7 +5,7 @@ template<typename S_forany,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_Fixed_Array_SArgument_T<S_forany,
-                                Insert_Policy>::In_Fixed_Array_SArgument_T (void)
+                                Insert_Policy>::In_Fixed_Array_SArgument_T ()
 {
 }
 
@@ -27,7 +27,7 @@ template<typename S_forany,
 ACE_INLINE
 TAO::Inout_Fixed_Array_SArgument_T<S_forany,
                                    Insert_Policy>::
-Inout_Fixed_Array_SArgument_T (void)
+Inout_Fixed_Array_SArgument_T ()
 {
 }
 
@@ -36,7 +36,7 @@ template<typename S_forany,
 ACE_INLINE
 typename S_forany::_slice_type *
 TAO::Inout_Fixed_Array_SArgument_T<S_forany,
-                                   Insert_Policy>::arg (void)
+                                   Insert_Policy>::arg ()
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -49,7 +49,7 @@ template<typename S_forany,
 ACE_INLINE
 TAO::Out_Fixed_Array_SArgument_T<S_forany,
                                  Insert_Policy>::
-Out_Fixed_Array_SArgument_T (void)
+Out_Fixed_Array_SArgument_T ()
 {
 }
 
@@ -58,7 +58,7 @@ template<typename S_forany,
 ACE_INLINE
 typename S_forany::_slice_type *
 TAO::Out_Fixed_Array_SArgument_T<S_forany,
-                                 Insert_Policy>::arg (void)
+                                 Insert_Policy>::arg ()
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -73,7 +73,7 @@ ACE_INLINE
 TAO::Ret_Fixed_Array_SArgument_T<S_var,
                                  S_forany,
                                  Insert_Policy>::
-Ret_Fixed_Array_SArgument_T (void)
+Ret_Fixed_Array_SArgument_T ()
 {
 }
 
@@ -84,7 +84,7 @@ ACE_INLINE
 typename S_forany::_slice_type *&
 TAO::Ret_Fixed_Array_SArgument_T<S_var,
                                  S_forany,
-                                 Insert_Policy>::arg (void)
+                                 Insert_Policy>::arg ()
 {
   return this->x_._retn_arg ();
 }
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index 44889cf37be..575c22be156 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -38,7 +38,6 @@ namespace TAO
   class In_Fixed_Size_SArgument_T : public InArgument
   {
   public:
-
     /**
      * @name @c TAO::Argument Method Overrides
      *
@@ -59,10 +58,8 @@ namespace TAO
     S const & arg () const;
 
   private:
-
     /// Reference to the "IN" argument.
     S x_;
-
   };
 
   // ------------------------------------------------------------
@@ -77,7 +74,6 @@ namespace TAO
   class Inout_Fixed_Size_SArgument_T : public InoutArgument
   {
   public:
-
     /// Constructor.
     Inout_Fixed_Size_SArgument_T ();
 
@@ -100,7 +96,6 @@ namespace TAO
     S & arg ();
 
   private:
-
     S x_;
   };
 
@@ -116,7 +111,6 @@ namespace TAO
   class Out_Fixed_Size_SArgument_T : public OutArgument
   {
   public:
-
     /// Constructor.
     Out_Fixed_Size_SArgument_T ();
 
@@ -138,9 +132,7 @@ namespace TAO
     S & arg ();
 
   private:
-
     S x_;
-
   };
 
   // ------------------------------------------------------------
@@ -155,7 +147,6 @@ namespace TAO
   class Ret_Fixed_Size_SArgument_T : public RetArgument
   {
   public:
-
     /// Constructor.
     Ret_Fixed_Size_SArgument_T ();
 
@@ -177,9 +168,7 @@ namespace TAO
     S & arg ();
 
   private:
-
     S x_;
-
   };
 
   // ------------------------------------------------------------
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
index c93447fbe10..59e21f17e74 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
@@ -16,7 +16,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::
-Inout_Fixed_Size_SArgument_T (void)
+Inout_Fixed_Size_SArgument_T ()
 {
 }
 
@@ -24,7 +24,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -36,14 +36,14 @@ template<typename S,
 ACE_INLINE
 TAO::Out_Fixed_Size_SArgument_T<S,
                                 Insert_Policy>::
-Out_Fixed_Size_SArgument_T (void)
+Out_Fixed_Size_SArgument_T ()
 {}
 
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -53,14 +53,14 @@ TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T (void)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T ()
 {}
 
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->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/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index 9bbc42e51ea..5c6e9fbfd45 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -39,13 +39,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Incremental_Key_Generator
 {
 public:
-
   TAO_Incremental_Key_Generator ();
 
   int operator() (PortableServer::ObjectId &id);
 
 protected:
-
   CORBA::ULong counter_;
 };
 
@@ -61,7 +59,6 @@ protected:
 class TAO_PortableServer_Export TAO_ObjectId_Hash
 {
 public:
-
   /// Returns hash value.
   u_long operator () (const PortableServer::ObjectId &id) const;
 };
@@ -80,7 +77,6 @@ public:
 class TAO_Ignore_Original_Key_Adapter
 {
 public:
-
   int encode (const PortableServer::ObjectId &original_key,
               const ACE_Active_Map_Manager_Key &active_key,
               PortableServer::ObjectId &modified_key);
@@ -106,7 +102,6 @@ public:
 class TAO_Preserve_Original_Key_Adapter
 {
 public:
-
   int encode (const PortableServer::ObjectId &original_key,
               const ACE_Active_Map_Manager_Key &active_key,
               PortableServer::ObjectId &modified_key);
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/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h
index 29e4cfb2834..7145904a1c5 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.h
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.h
@@ -50,7 +50,6 @@ public:
 
   /// Static initializer ensures the factory is loaded
   static int initialize ();
-
 };
 
 
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h
index 75041660593..3bf8925033f 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h
@@ -48,7 +48,6 @@ namespace TAO
     class TAO_PortableServer_Export Non_Servant_Upcall
     {
     public:
-
       /// Constructor.
       Non_Servant_Upcall (::TAO_Root_POA &poa);
 
@@ -58,7 +57,6 @@ namespace TAO
       ::TAO_Root_POA &poa () const;
 
     protected:
-
       TAO_Object_Adapter &object_adapter_;
       TAO_Root_POA &poa_;
       Non_Servant_Upcall *previous_;
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index ed4e5f5d052..181c9ef5102 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -93,7 +93,6 @@ namespace TAO
 
  typedef
   ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> ORT_Array;
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
index d2d1df23f1e..1d4a1e5a1d5 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
@@ -46,7 +46,6 @@ namespace TAO
     : public ACE_Service_Object
   {
   public:
-
     /// Destructor.
     /**
      * @note Even though this class only defines an interface, a
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 62415aefec9..c041333d425 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -73,7 +73,6 @@ class TAO_PortableServer_Export TAO_Object_Adapter
   : public TAO_Adapter
 {
 public:
-
   friend class TAO_Root_POA;
 
   typedef PortableServer::ObjectId poa_name;
@@ -164,7 +163,6 @@ public:
   virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
 
 protected:
-
   int locate_servant_i (const TAO::ObjectKey &key);
 
   TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key,
@@ -202,7 +200,6 @@ protected:
                             TAO::Portable_Server::Servant_Upcall& upcall);
 
 public:
-
   /**
    * @class Hint_Strategy
    *
@@ -214,7 +211,6 @@ public:
   class TAO_PortableServer_Export Hint_Strategy
   {
   public:
-
     virtual ~Hint_Strategy ();
 
     virtual int find_persistent_poa (const poa_name &system_name,
@@ -230,7 +226,6 @@ public:
     void object_adapter (TAO_Object_Adapter *oa);
 
   protected:
-
     TAO_Object_Adapter *object_adapter_;
   };
 
@@ -246,7 +241,6 @@ public:
   class TAO_PortableServer_Export Active_Hint_Strategy : public Hint_Strategy
   {
   public:
-
     Active_Hint_Strategy (CORBA::ULong map_size);
 
     virtual ~Active_Hint_Strategy ();
@@ -262,7 +256,6 @@ public:
                                        const poa_name &system_name);
 
   protected:
-
     typedef ACE_Active_Map_Manager_Adapter<
     poa_name,
       TAO_Root_POA *,
@@ -285,7 +278,6 @@ public:
   class TAO_PortableServer_Export No_Hint_Strategy : public Hint_Strategy
   {
   public:
-
     virtual ~No_Hint_Strategy ();
 
     virtual int find_persistent_poa (const poa_name &system_name,
@@ -297,13 +289,11 @@ public:
 
     virtual int unbind_persistent_poa (const poa_name &folded_name,
                                        const poa_name &system_name);
-
   };
 
   friend class No_Hint_Strategy;
 
 protected:
-
   Hint_Strategy *hint_strategy_;
 
   /// Base class of the id map.
@@ -366,7 +356,6 @@ protected:
   transient_poa_map *transient_poa_map_;
 
 protected:
-
   static CORBA::ULong transient_poa_name_size_;
 
   static void set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
@@ -380,7 +369,6 @@ protected:
   ACE_Reverse_Lock<ACE_Lock> reverse_lock_;
 
 public:
-
   /**
    * @class poa_name_iterator
    *
@@ -389,7 +377,6 @@ public:
   class poa_name_iterator
   {
   public:
-
     /// Constructor.
     poa_name_iterator (int begin,
                        CORBA::ULong size,
@@ -406,7 +393,6 @@ public:
     poa_name_iterator &operator++ ();
 
   protected:
-
     CORBA::ULong size_;
     CORBA::ULong position_;
     const CORBA::Octet *folded_buffer_;
@@ -421,7 +407,6 @@ public:
   class iteratable_poa_name
   {
   public:
-
     typedef poa_name_iterator iterator;
 
     iteratable_poa_name (const poa_name &folded_name);
@@ -430,7 +415,6 @@ public:
     iterator end () const;
 
   protected:
-
     const poa_name &folded_name_;
   };
 
@@ -439,13 +423,11 @@ public:
   friend class TAO::Portable_Server::Servant_Upcall;
 
 public:
-
   /// Pointer to the non-servant upcall in progress.  If no non-servant
   /// upcall is in progress, this pointer is zero.
   TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress () const;
 
 private:
-
   /// Helper method to get collocated servant
   TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp);
 
@@ -453,7 +435,6 @@ private:
   static void release_poa_manager_factory (TAO_POAManager_Factory *factory);
 #endif
 private:
-
   /// Condition variable for waiting on non-servant upcalls to end.
   TAO_SYNCH_CONDITION non_servant_upcall_condition_;
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl
index 603fac7b612..7acba182498 100644
--- a/TAO/tao/PortableServer/Object_Adapter.inl
+++ b/TAO/tao/PortableServer/Object_Adapter.inl
@@ -5,31 +5,31 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Policy_Validator &
-TAO_Object_Adapter::validator (void)
+TAO_Object_Adapter::validator ()
 {
   return this->default_validator_;
 }
 
 ACE_INLINE TAO_POA_Policy_Set &
-TAO_Object_Adapter::default_poa_policies (void)
+TAO_Object_Adapter::default_poa_policies ()
 {
   return this->default_poa_policies_;
 }
 
 ACE_INLINE ACE_Lock &
-TAO_Object_Adapter::lock (void)
+TAO_Object_Adapter::lock ()
 {
   return *this->lock_;
 }
 
 ACE_INLINE TAO_SYNCH_MUTEX &
-TAO_Object_Adapter::thread_lock (void)
+TAO_Object_Adapter::thread_lock ()
 {
   return this->thread_lock_;
 }
 
 ACE_INLINE ACE_Reverse_Lock<ACE_Lock> &
-TAO_Object_Adapter::reverse_lock (void)
+TAO_Object_Adapter::reverse_lock ()
 {
   return this->reverse_lock_;
 }
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h
index e496c9e79de..80e05802d96 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h
@@ -28,7 +28,6 @@ class TAO_PortableServer_Export TAO_Object_Adapter_Factory
   : public TAO_Adapter_Factory
 {
 public:
-
   // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   // details.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index 56563f63655..a11c4181d79 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -41,7 +41,6 @@ namespace TAO
   class In_Object_SArgument_T : public InArgument
   {
   public:
-
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl
index d7e8a6fa572..86b4ff3497e 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Object_SArgument_T.inl
@@ -19,7 +19,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::
-Inout_Object_SArgument_T (void)
+Inout_Object_SArgument_T ()
 {
 }
 
@@ -28,7 +28,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_ptr&
-TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg ()
 {
   return this->x_.inout ();
 }
@@ -41,7 +41,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::
-Out_Object_SArgument_T (void)
+Out_Object_SArgument_T ()
 {
 }
 
@@ -51,7 +51,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_out
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void)
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -63,7 +63,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::
-Ret_Object_SArgument_T (void)
+Ret_Object_SArgument_T ()
 {
 }
 
@@ -72,7 +72,7 @@ template<typename S_ptr,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
index fa04e2fd156..0d45423ff0d 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
@@ -38,7 +38,6 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable
   : public TAO_Operation_Table
 {
 public:
-
   /// Do nothing destructor.
   virtual ~TAO_Binary_Search_OpTable ();
 
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
index 60979b541f7..76c883f72f4 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
@@ -39,7 +39,6 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable
   : public TAO_Operation_Table
 {
 public:
-
   /// Do nothing destructor.
   virtual ~TAO_Perfect_Hash_OpTable ();
 
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index 05fc7d21eb6..ed6f6683457 100644
--- a/TAO/tao/PortableServer/POAManager.inl
+++ b/TAO/tao/PortableServer/POAManager.inl
@@ -5,13 +5,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Lock &
-TAO_POA_Manager::lock (void)
+TAO_POA_Manager::lock ()
 {
   return this->lock_;
 }
 
 ACE_INLINE void
-TAO_POA_Manager::activate (void)
+TAO_POA_Manager::activate ()
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
@@ -52,13 +52,13 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state_i (void)
+TAO_POA_Manager::get_state_i ()
 {
   return this->state_;
 }
 
 ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (void)
+TAO_POA_Manager::get_state ()
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_);
@@ -113,7 +113,7 @@ TAO_POA_Manager::generate_manager_id () const
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 ACE_INLINE
-CORBA::PolicyList& TAO_POA_Manager::get_policies (void)
+CORBA::PolicyList& TAO_POA_Manager::get_policies ()
 {
   return this->policies_;
 }
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 4b3ac88f9c4..04c49144bb8 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -53,7 +53,6 @@ namespace TAO
     void
     Cached_Policies::update_policy (const CORBA::Policy_ptr policy)
     {
-
     #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
       ::PortableServer::ThreadPolicy_var thread
         = ::PortableServer::ThreadPolicy::_narrow (policy);
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 491b9833d83..3465c355dc4 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -40,7 +40,6 @@ namespace TAO
     class TAO_PortableServer_Export Cached_Policies
     {
     public:
-
       enum PriorityModel
       {
         CLIENT_PROPAGATED,
@@ -113,7 +112,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Helper method to update a particular policy.
       void update_policy (const CORBA::Policy_ptr policy);
 
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h
index 11b84f83535..13948e1eca9 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.h
+++ b/TAO/tao/PortableServer/POA_Current_Factory.h
@@ -28,7 +28,6 @@ class TAO_PortableServer_Export TAO_POA_Current_Factory
   : public TAO_Object_Loader
 {
 public:
-
   /// Creates a PICurrent and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl
index 26a39c0ec81..8b01c32593b 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.inl
+++ b/TAO/tao/PortableServer/POA_Policy_Set.inl
@@ -39,7 +39,7 @@ TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy)
 }
 
 ACE_INLINE TAO_Policy_Set &
-TAO_POA_Policy_Set::policies (void)
+TAO_POA_Policy_Set::policies ()
 {
   return this->impl_;
 }
diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h
index 6da547b0892..07b10640902 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.h
+++ b/TAO/tao/PortableServer/PS_ForwardA.h
@@ -42,7 +42,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableServer
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
 
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
index 7be5db2b0a2..73727ad3843 100644
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -4,7 +4,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_Regular_POA::the_parent (void)
+TAO_Regular_POA::the_parent ()
 {
   return PortableServer::POA::_duplicate (this->parent_);
 }
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 901ff5ca5a9..a2ea413e806 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -528,7 +528,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const TAO_POA_Policy_Set &policies)
 {
-  // This operaton creates a new POA as a child of the target POA. The
+  // This operation creates a new POA as a child of the target POA. The
   // specified name identifies the new POA with respect to other POAs
   // with the same parent POA. If the target POA already has a child
   // POA with the specified name, the AdapterAlreadyExists exception
@@ -1499,7 +1499,6 @@ TAO_Root_POA::cleanup_servant (
 PortableServer::Servant
 TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id)
 {
-
   PortableServer::Servant servant =
     this->active_policy_strategies_.request_processing_strategy()->
       id_to_servant (id);
@@ -1972,7 +1971,6 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
                                             collocated,
                                             servant),
                         CORBA::INTERNAL ());
-
     }
   else
     {
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index 37521aad56c..317e4ce67f5 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -467,7 +467,6 @@ public:
                                  const PortableServer::ObjectId& oid);
 
 protected:
-
 #if (TAO_HAS_MINIMUM_POA == 0)
   int enter ();
 
@@ -637,7 +636,6 @@ public:
   invoke_key_to_object_helper_i (const char * repository_id,
                                  const PortableServer::ObjectId & id);
 protected:
-
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one and hold the POA lock
   TAO::ORT_Adapter *ORT_adapter ();
@@ -795,7 +793,6 @@ public:
 class TAO_PortableServer_Export TAO_POA_Static_Resources
 {
 public:
-
   /// Return the singleton instance.
   static TAO_POA_Static_Resources* instance ();
 
@@ -803,7 +800,6 @@ public:
   static void fini () ACE_GCC_DESTRUCTOR_ATTRIBUTE;
 
 public:
-
   /**
    * Name of the factory object used to adapt function calls on the
    * PortableInterceptor interfaces ORT. The default value is
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index e3dabccb7ac..8e7290de43d 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -2,37 +2,37 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
-TAO_Root_POA::cleanup_in_progress (void)
+TAO_Root_POA::cleanup_in_progress ()
 {
   return this->cleanup_in_progress_;
 }
 
 ACE_INLINE ACE_Lock &
-TAO_Root_POA::lock (void)
+TAO_Root_POA::lock ()
 {
   return this->lock_;
 }
 
 ACE_INLINE TAO_POA_Policy_Set &
-TAO_Root_POA::policies (void)
+TAO_Root_POA::policies ()
 {
   return this->policies_;
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_Root_POA::the_parent (void)
+TAO_Root_POA::the_parent ()
 {
   return PortableServer::POA::_nil ();
 }
 
 ACE_INLINE PortableInterceptor::AdapterName *
-TAO_Root_POA::adapter_name (void)
+TAO_Root_POA::adapter_name ()
 {
   return this->adapter_name_i ();
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_Root_POA::get_adapter_template (void)
+TAO_Root_POA::get_adapter_template ()
 {
   TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
@@ -56,7 +56,7 @@ TAO_Root_POA::get_adapter_template_i ()
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
-TAO_Root_POA::get_obj_ref_factory (void)
+TAO_Root_POA::get_obj_ref_factory ()
 {
   TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
@@ -69,13 +69,13 @@ TAO_Root_POA::get_obj_ref_factory (void)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Root_POA::system_id (void)
+TAO_Root_POA::system_id ()
 {
   return (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Root_POA::persistent (void)
+TAO_Root_POA::persistent ()
 {
   return (this->cached_policies_.lifespan () == PortableServer::PERSISTENT);
 }
@@ -87,7 +87,7 @@ TAO_Root_POA::name () const
 }
 
 ACE_INLINE char *
-TAO_Root_POA::the_name (void)
+TAO_Root_POA::the_name ()
 {
   return CORBA::string_dup (this->name_.c_str ());
 }
@@ -105,73 +105,73 @@ TAO_Root_POA::system_name () const
 }
 
 ACE_INLINE char
-TAO_Root_POA::name_separator (void)
+TAO_Root_POA::name_separator ()
 {
   return '\0';
 }
 
 ACE_INLINE CORBA::ULong
-TAO_Root_POA::name_separator_length (void)
+TAO_Root_POA::name_separator_length ()
 {
   return sizeof (char);
 }
 
 ACE_INLINE char
-TAO_Root_POA::persistent_key_char (void)
+TAO_Root_POA::persistent_key_char ()
 {
   return 'P';
 }
 
 ACE_INLINE char
-TAO_Root_POA::transient_key_char (void)
+TAO_Root_POA::transient_key_char ()
 {
   return 'T';
 }
 
 ACE_INLINE CORBA::ULong
-TAO_Root_POA::persistent_key_type_length (void)
+TAO_Root_POA::persistent_key_type_length ()
 {
   return sizeof (char);
 }
 
 ACE_INLINE char
-TAO_Root_POA::system_id_key_char (void)
+TAO_Root_POA::system_id_key_char ()
 {
   return 'S';
 }
 
 ACE_INLINE char
-TAO_Root_POA::user_id_key_char (void)
+TAO_Root_POA::user_id_key_char ()
 {
   return 'U';
 }
 
 ACE_INLINE CORBA::ULong
-TAO_Root_POA::system_id_key_type_length (void)
+TAO_Root_POA::system_id_key_type_length ()
 {
   return sizeof (char);
 }
 
 ACE_INLINE char
-TAO_Root_POA::root_key_char (void)
+TAO_Root_POA::root_key_char ()
 {
   return 'R';
 }
 
 ACE_INLINE char
-TAO_Root_POA::non_root_key_char (void)
+TAO_Root_POA::non_root_key_char ()
 {
   return 'N';
 }
 
 ACE_INLINE char
-TAO_Root_POA::root_key_type (void)
+TAO_Root_POA::root_key_type ()
 {
   return TAO_Root_POA::root_key_char ();
 }
 
 ACE_INLINE CORBA::ULong
-TAO_Root_POA::root_key_type_length (void)
+TAO_Root_POA::root_key_type_length ()
 {
   return sizeof (char);
 }
@@ -183,13 +183,13 @@ TAO_Root_POA::outstanding_requests () const
 }
 
 ACE_INLINE CORBA::ULong
-TAO_Root_POA::increment_outstanding_requests (void)
+TAO_Root_POA::increment_outstanding_requests ()
 {
   return ++this->outstanding_requests_;
 }
 
 ACE_INLINE CORBA::ULong
-TAO_Root_POA::decrement_outstanding_requests (void)
+TAO_Root_POA::decrement_outstanding_requests ()
 {
   return --this->outstanding_requests_;
 }
@@ -207,7 +207,7 @@ TAO_Root_POA::orb_core () const
 }
 
 ACE_INLINE PortableInterceptor::AdapterState
-TAO_Root_POA::get_adapter_state (void)
+TAO_Root_POA::get_adapter_state ()
 {
   return this->adapter_state_;
 }
@@ -219,7 +219,7 @@ TAO_Root_POA::thread_pool () const
 }
 
 ACE_INLINE TAO_SYNCH_CONDITION &
-TAO_Root_POA::servant_deactivation_condition (void)
+TAO_Root_POA::servant_deactivation_condition ()
 {
   return servant_deactivation_condition_;
 }
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/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index b92e56025cc..efcd7935078 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -47,7 +47,7 @@ namespace TAO
                                                poa->orb_core().server_factory ()->active_object_map_creation_parameters ()
                                               ), CORBA::NO_MEMORY ());
 
-      ACE_auto_ptr_reset (this->active_object_map_, active_object_map);
+      this->active_object_map_.reset (active_object_map);
 
 #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1)
       ACE_CString name_str ("Active_Object_Map_");
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 531be3b10f4..54d5cff2d9d 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -350,7 +350,6 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request,
 # endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
 
-
 void
 TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request,
                                       TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index e77ac5fb31a..ecad0576c2e 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -241,7 +241,7 @@ namespace TAO
           // Unlock servant (if appropriate).
           this->single_threaded_poa_cleanup ();
 
-          /* FALLTHRU */
+          ACE_FALLTHROUGH;
 
         case OBJECT_ADAPTER_LOCK_RELEASED:
           // Cleanup servant locator related state.  Note that because
@@ -265,7 +265,7 @@ namespace TAO
           // Cleanup servant related state.
           this->servant_cleanup ();
 
-          /* FALLTHRU */
+          ACE_FALLTHROUGH;
 
         case POA_CURRENT_SETUP:
           // Cleanup POA related state.
@@ -274,14 +274,14 @@ namespace TAO
           // Teardown current for this request.
           this->current_context_.teardown ();
 
-          /* FALLTHRU */
+          ACE_FALLTHROUGH;
 
         case OBJECT_ADAPTER_LOCK_ACQUIRED:
           // Finally, since the object adapter lock was acquired, we must
           // release it.
           this->object_adapter_->lock ().release ();
 
-          /* FALLTHRU */
+          ACE_FALLTHROUGH;
 
         case INITIAL_STAGE:
         default:
@@ -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/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
index 319a6074389..1f28b6d106e 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -179,7 +179,6 @@ namespace TAO
       void increment_servant_refcount ();
 
     protected:
-
       void post_invoke_servant_cleanup ();
       void single_threaded_poa_setup ();
       void single_threaded_poa_cleanup ();
@@ -190,7 +189,6 @@ namespace TAO
       void upcall_cleanup ();
 
     protected:
-
       TAO_Object_Adapter *object_adapter_;
 
       ::TAO_Root_POA *poa_;
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index 7786d181e32..3b1a63f7512 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -31,7 +31,7 @@ PortableServer::Servant_var<T>::_duplicate (T * p)
 }
 
 template <class T>
-PortableServer::Servant_var<T>::~Servant_var (void)  /* throw () */
+PortableServer::Servant_var<T>::~Servant_var ()  /* throw () */
 {
   // Unfortunately, there is no throw spec on _remove_ref, so we
   // can't assume that it will not throw.  If it does, then we are in
diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h
index 24f66407de2..ae34add8165 100644
--- a/TAO/tao/PortableServer/Servant_var.h
+++ b/TAO/tao/PortableServer/Servant_var.h
@@ -118,7 +118,6 @@ namespace PortableServer
   /// Compare two Servant_vars for non-equivalence.
   template <class X, class Y>
   bool operator!=(Servant_var<X> const & x, Servant_var<Y> const & y);
-
 } // namespace PortableServer
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl
index 8b27ee076d7..c3a78412637 100644
--- a/TAO/tao/PortableServer/Servant_var.inl
+++ b/TAO/tao/PortableServer/Servant_var.inl
@@ -88,14 +88,14 @@ PortableServer::Servant_var<T>::in () const
 
 template <class T>
 ACE_INLINE T *&
-PortableServer::Servant_var<T>::inout (void)
+PortableServer::Servant_var<T>::inout ()
 {
   return this->ptr_;
 }
 
 template <class T>
 ACE_INLINE T *&
-PortableServer::Servant_var<T>::out (void)
+PortableServer::Servant_var<T>::out ()
 {
   PortableServer::Servant_var<T> tmp;
   this->swap (tmp);
@@ -104,7 +104,7 @@ PortableServer::Servant_var<T>::out (void)
 
 template <class T>
 ACE_INLINE T *
-PortableServer::Servant_var<T>::_retn (void)
+PortableServer::Servant_var<T>::_retn ()
 {
   T * const rval = ptr_;
   this->ptr_ = 0;
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index 3e217820af9..d8ea769573f 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -152,7 +152,6 @@ namespace TAO
     typedef inout_type                                      inout_arg_type;
     typedef out_type                                        out_arg_type;
     typedef out_type                                        ret_arg_type;
-
   };
 }
 
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
index e08e74db721..96bbee514b6 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
@@ -7,7 +7,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
-In_Special_Basic_SArgument_T (void)
+In_Special_Basic_SArgument_T ()
 {
 }
 
@@ -30,7 +30,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
-Inout_Special_Basic_SArgument_T (void)
+Inout_Special_Basic_SArgument_T ()
 {
 }
 
@@ -40,7 +40,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -53,7 +53,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
-Out_Special_Basic_SArgument_T (void)
+Out_Special_Basic_SArgument_T ()
 {
 }
 
@@ -62,7 +62,7 @@ template<typename S,
          typename from_S,
          template <typename> class Insert_Policy>
 S &
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -75,7 +75,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
-Ret_Special_Basic_SArgument_T (void)
+Ret_Special_Basic_SArgument_T ()
 {
 }
 
@@ -85,7 +85,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index 14488287a2b..289c9dcd214 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -35,9 +35,9 @@ namespace TAO
 
       virtual int exit () = 0;
 
-      virtual void strategy_init (TAO_Root_POA *poa);
+      void strategy_init (TAO_Root_POA *poa) override;
 
-      virtual void strategy_cleanup();
+      void strategy_cleanup() override;
 
       virtual ::PortableServer::ThreadPolicyValue type() const = 0;
     };
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index 03673db270e..908513d3cb4 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -22,8 +22,10 @@ namespace TAO
           ThreadStrategyFactory *strategy_factory =
             ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategySingleFactory");
 
-          if (strategy_factory != 0)
-            strategy = strategy_factory->create (value);
+          if (strategy_factory)
+            {
+              strategy = strategy_factory->create (value);
+            }
           else
             TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
@@ -37,7 +39,7 @@ namespace TAO
           strategy =
             ACE_Dynamic_Service<ThreadStrategy>::instance ("ThreadStrategyORBControl");
 
-          if (strategy == 0)
+          if (!strategy)
             TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
                         ACE_TEXT ("ERROR, Unable to get ")
@@ -61,7 +63,7 @@ namespace TAO
           ThreadStrategyFactory *strategy_factory =
             ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategySingleFactory");
 
-          if (strategy_factory != 0)
+          if (strategy_factory)
             {
               strategy_factory->destroy (strategy);
             }
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
index a968b63d4ef..666793af2fd 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
@@ -32,9 +32,9 @@ namespace TAO
     {
     public:
       /// Create a new servant retention strategy
-      virtual ThreadStrategy* create (::PortableServer::ThreadPolicyValue value);
+      ThreadStrategy* create (::PortableServer::ThreadPolicyValue value) override;
 
-      virtual void destroy (ThreadStrategy *strategy);
+      void destroy (ThreadStrategy *strategy) override;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
index 5f267f045d3..1bf7c0cf336 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
@@ -33,11 +33,11 @@ namespace TAO
        : public ThreadStrategy
     {
     public:
-      virtual int enter ();
+      int enter () override;
 
-      virtual int exit ();
+      int exit () override;
 
-      virtual ::PortableServer::ThreadPolicyValue type() const;
+      ::PortableServer::ThreadPolicyValue type() const override;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
index 6d3b9bdbac0..87962311eb7 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -42,11 +42,11 @@ namespace TAO
        public ThreadStrategy
     {
     public:
-      virtual int enter ();
+      int enter () override;
 
-      virtual int exit ();
+      int exit () override;
 
-      virtual ::PortableServer::ThreadPolicyValue type() const;
+      ::PortableServer::ThreadPolicyValue type() const override;
     private:
       TAO_SYNCH_RECURSIVE_MUTEX lock_;
     };
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index bd3f0fc4f95..2dbf0a018bc 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -34,9 +34,9 @@ namespace TAO
     {
     public:
       /// Create a new thread strategy
-      virtual ThreadStrategy* create (::PortableServer::ThreadPolicyValue value);
+      ThreadStrategy* create (::PortableServer::ThreadPolicyValue value) override;
 
-      virtual void destroy (ThreadStrategy *strategy);
+      void destroy (ThreadStrategy *strategy) override;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index 457e761bf06..89792b2d9e7 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -137,7 +137,6 @@ namespace TAO
     typedef inout_type                                  inout_arg_type;
     typedef inout_type                                  out_arg_type;
     typedef inout_type                                  ret_arg_type;
-
   };
 }
 
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
index 1dca942a25d..20ad47f1a84 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
@@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename S_var>
 ACE_INLINE
-TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void)
+TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T ()
 {}
 
 template<typename S, typename S_var>
@@ -17,13 +17,13 @@ TAO::In_UB_String_SArgument_T<S,S_var>::arg () const
 
 template<typename S, typename S_var>
 ACE_INLINE
-TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T (void)
+TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T ()
 {}
 
 template<typename S, typename S_var>
 ACE_INLINE
 S *&
-TAO::Inout_UB_String_SArgument_T<S,S_var>::arg (void)
+TAO::Inout_UB_String_SArgument_T<S,S_var>::arg ()
 {
   return this->x_.inout ();
 }
@@ -40,7 +40,7 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::Out_UB_String_SArgument_T (
 template<typename S, typename S_var>
 ACE_INLINE
 S *&
-TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void)
+TAO::Out_UB_String_SArgument_T<S,S_var>::arg ()
 {
   return this->x_.out ();
 }
@@ -49,12 +49,12 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void)
 
 template<typename S, typename S_var>
 ACE_INLINE
-TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T (void)
+TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T ()
 {}
 
 template<typename S, typename S_var>
 S *&
-TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void)
+TAO::Ret_UB_String_SArgument_T<S,S_var>::arg ()
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index afcc4f5b253..d2585c5ba66 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -55,7 +55,6 @@ namespace TAO
   class TAO_PortableServer_Export Upcall_Wrapper
   {
   public:
-
     /**
      * @note The TAO::Argument corresponding to the return value is
      *       always the first element in the array, regardless of
@@ -90,8 +89,6 @@ namespace TAO
                 );
 
   private:
-
-
     /// Perform pre-upcall operations.
     /**
      * Perform pre-upcall operations, including operation @c IN and
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index 0242a21f24a..2f501c27f54 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -34,7 +34,6 @@ namespace TAO
   class In_Var_Array_SArgument_T : public InArgument
   {
   public:
-
     In_Var_Array_SArgument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
index c4655848d33..fa47a64f158 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
@@ -5,7 +5,7 @@ template<typename S_forany,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_Var_Array_SArgument_T<S_forany,
-                              Insert_Policy>::In_Var_Array_SArgument_T (void)
+                              Insert_Policy>::In_Var_Array_SArgument_T ()
 {}
 
 template<typename S_forany,
@@ -26,7 +26,7 @@ template<typename S_forany,
 ACE_INLINE
 TAO::Inout_Var_Array_SArgument_T<S_forany,
                                  Insert_Policy>::
-Inout_Var_Array_SArgument_T (void)
+Inout_Var_Array_SArgument_T ()
 {
 }
 
@@ -34,7 +34,7 @@ template<typename S_forany,
          template <typename> class Insert_Policy>
 typename S_forany::_slice_type *
 TAO::Inout_Var_Array_SArgument_T<S_forany,
-                                 Insert_Policy>::arg (void)
+                                 Insert_Policy>::arg ()
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -49,7 +49,7 @@ ACE_INLINE
 TAO::Out_Var_Array_SArgument_T<S_var,
                                S_forany,
                                Insert_Policy>::
-Out_Var_Array_SArgument_T (void)
+Out_Var_Array_SArgument_T ()
 {
 }
 
@@ -59,7 +59,7 @@ template<typename S_var,
 typename S_forany::_slice_type *&
 TAO::Out_Var_Array_SArgument_T<S_var,
                                S_forany,
-                               Insert_Policy>::arg (void)
+                               Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -73,7 +73,7 @@ ACE_INLINE
 TAO::Ret_Var_Array_SArgument_T<S_var,
                                S_forany,
                                Insert_Policy>::
-Ret_Var_Array_SArgument_T (void)
+Ret_Var_Array_SArgument_T ()
 {
 }
 
@@ -84,7 +84,7 @@ ACE_INLINE
 typename S_forany::_slice_type *&
 TAO::Ret_Var_Array_SArgument_T<S_var,
                                S_forany,
-                               Insert_Policy>::arg (void)
+                               Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index 07773260e03..d86ccc57770 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -33,7 +33,6 @@ namespace TAO
   class In_Var_Size_SArgument_T : public InArgument
   {
   public:
-
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
index 015c9c1c053..fb2426aeb5b 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
@@ -14,14 +14,14 @@ TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg () const
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T (void)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T ()
 {
 }
 
 template<typename S,
          template <typename> class Insert_Policy>
 S &
-TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -31,14 +31,14 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T (void)
+TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T ()
 {
 }
 
 template<typename S,
          template <typename> class Insert_Policy>
 S *&
-TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -48,7 +48,7 @@ TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T (void)
+TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T ()
 {
 }
 
@@ -56,7 +56,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h
index e72993a27d4..caf6aecabe8 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.h
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.h
@@ -56,14 +56,14 @@ namespace TAO
   class Inout_Vector_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Vector_SArgument_T (void);
+    Inout_Vector_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S x_;
@@ -81,13 +81,13 @@ namespace TAO
   class Out_Vector_SArgument_T : public OutArgument
   {
   public:
-    Out_Vector_SArgument_T (void);
+    Out_Vector_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S x_;
@@ -105,13 +105,13 @@ namespace TAO
   class Ret_Vector_SArgument_T : public RetArgument
   {
   public:
-    Ret_Vector_SArgument_T (void);
+    Ret_Vector_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S x_;
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.inl b/TAO/tao/PortableServer/Vector_SArgument_T.inl
index 1ade6aa3b16..5b77b5f3272 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.inl
@@ -14,14 +14,14 @@ TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg () const
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::Inout_Vector_SArgument_T (void)
+TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::Inout_Vector_SArgument_T ()
 {
 }
 
 template<typename S,
          template <typename> class Insert_Policy>
 S &
-TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -31,14 +31,14 @@ TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Out_Vector_SArgument_T<S,Insert_Policy>::Out_Vector_SArgument_T (void)
+TAO::Out_Vector_SArgument_T<S,Insert_Policy>::Out_Vector_SArgument_T ()
 {
 }
 
 template<typename S,
          template <typename> class Insert_Policy>
 S &
-TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -48,7 +48,7 @@ TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::Ret_Vector_SArgument_T (void)
+TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::Ret_Vector_SArgument_T ()
 {
 }
 
@@ -56,7 +56,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 0b7fe0cc9cc..673f8ebf8a8 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -74,16 +74,14 @@ namespace CORBA
     typedef Principal_var _var_type;
 
   protected:
-
     /// Destructor
     /**
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~Principal (void);
+    ~Principal ();
 
   private:
-
     // = Prevent copying
     Principal &operator = (const CORBA::Principal_ptr &);
     Principal (const CORBA::Principal_ptr &);
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 45de2e87c27..9bc48cb6352 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -868,7 +868,6 @@ TAO_Unknown_Profile::create_profile_body (TAO_OutputCDR &) const
 }
 
 
-
 // *************************************************************
 // Operators for TAO_opaque encoding and decoding
 // *************************************************************
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 8bb9ccdcdcc..86486eab854 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -325,7 +325,6 @@ protected:
   CORBA::ULong hash_service_i (CORBA::ULong m);
 
 private:
-
   /// This object keeps ownership of this object
   TAO_MProfile *forward_to_i ();
 
diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl
index 733cb9d93c8..b2ba7477f99 100644
--- a/TAO/tao/Profile.inl
+++ b/TAO/tao/Profile.inl
@@ -26,13 +26,13 @@ TAO_Profile::forward_to (TAO_MProfile *mprofiles)
 }
 
 ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to (void)
+TAO_Profile::forward_to ()
 {
   return this->forward_to_;
 }
 
 ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to_i (void)
+TAO_Profile::forward_to_i ()
 {
   return this->forward_to_;
 }
@@ -44,7 +44,7 @@ TAO_Profile::tagged_components () const
 }
 
 ACE_INLINE TAO_Tagged_Components&
-TAO_Profile::tagged_components (void)
+TAO_Profile::tagged_components ()
 {
   return this->tagged_components_;
 }
@@ -62,13 +62,13 @@ TAO_Profile::object_key () const
 }
 
 ACE_INLINE unsigned long
-TAO_Profile::_incr_refcnt (void)
+TAO_Profile::_incr_refcnt ()
 {
   return ++this->refcount_;
 }
 
 ACE_INLINE unsigned long
-TAO_Profile::_decr_refcnt (void)
+TAO_Profile::_decr_refcnt ()
 {
   unsigned long count = --this->refcount_;
   if (count == 0)
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 860a3283295..98fd6be0558 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -27,7 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   Profile_Transport_Resolver::~Profile_Transport_Resolver ()
   {
     if (this->profile_)
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 8af90de85c9..39f619dcb60 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -149,7 +149,6 @@ namespace TAO
 
     CORBA::PolicyList *steal_inconsistent_policies ();
   private:
-
     /// Helper method to access get the connection timeout from the
     /// ORB.
     bool get_connection_timeout (ACE_Time_Value &max_wait_time);
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 4b066ac14f1..285a59014d0 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -62,7 +62,7 @@ namespace TAO
   }
 
   ACE_INLINE CORBA::PolicyList *
-  Profile_Transport_Resolver::steal_inconsistent_policies (void)
+  Profile_Transport_Resolver::steal_inconsistent_policies ()
   {
     CORBA::PolicyList *tmp = this->inconsistent_policies_;
     this->inconsistent_policies_ = 0;
diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h
index 9a54afb1e17..2a74074622a 100644
--- a/TAO/tao/Protocol_Factory.h
+++ b/TAO/tao/Protocol_Factory.h
@@ -33,7 +33,7 @@ class TAO_Export TAO_Protocol_Factory : public ACE_Service_Object
 {
 public:
   TAO_Protocol_Factory (CORBA::ULong tag);
-  virtual ~TAO_Protocol_Factory (void);
+  virtual ~TAO_Protocol_Factory ();
 
   /// Initialization hook.
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
@@ -54,10 +54,10 @@ public:
 
   // Factory methods
   /// Create an acceptor
-  virtual TAO_Acceptor *make_acceptor (void) = 0;
+  virtual TAO_Acceptor *make_acceptor () = 0;
 
   /// Create a connector
-  virtual TAO_Connector *make_connector  (void) = 0;
+  virtual TAO_Connector *make_connector  () = 0;
 
   /**
    * Some protocols should not create a default endpoint unless the
@@ -69,10 +69,8 @@ public:
   virtual int requires_explicit_endpoint () const = 0;
 
 private:
-
   /// IOP protocol tag.
   CORBA::ULong const tag_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 3a8c76a844f..d629e049354 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -39,7 +39,6 @@ class TAO_Stub;
 class TAO_Export TAO_IIOP_Protocol_Properties
 {
 public:
-
   TAO_IIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
@@ -54,7 +53,6 @@ public:
 class TAO_Export TAO_UIOP_Protocol_Properties
 {
 public:
-
   TAO_UIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
@@ -64,7 +62,6 @@ public:
 class TAO_Export TAO_SHMIOP_Protocol_Properties
 {
 public:
-
   TAO_SHMIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
@@ -80,7 +77,6 @@ public:
 class TAO_Export TAO_DIOP_Protocol_Properties
 {
 public:
-
   TAO_DIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
@@ -93,7 +89,6 @@ public:
 class TAO_Export TAO_SCIOP_Protocol_Properties
 {
 public:
-
   TAO_SCIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 92d2bc07ca1..761414716cb 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -80,7 +80,6 @@ public:
   // TAO extension.
   _retn_type    ptr () const;
 private:
-
   // Unimplemented - prevents widening assignment.
   TAO_Pseudo_Var_T (const TAO_Base_var &);
   void operator= (const TAO_Base_var &);
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
index b311939f02a..3590f7f53ae 100644
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 ACE_INLINE
-TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void)
+TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T ()
   : ptr_ (T::_nil ())
 {}
 
@@ -24,7 +24,7 @@ TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> & p)
 
 template <typename T>
 ACE_INLINE
-TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void)
+TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T ()
 {
   CORBA::release (this->ptr_);
 }
@@ -72,7 +72,7 @@ TAO_Pseudo_Var_T<T>::in () const
 template <typename T>
 ACE_INLINE
 typename T::_ptr_type &
-TAO_Pseudo_Var_T<T>::inout (void)
+TAO_Pseudo_Var_T<T>::inout ()
 {
   return this->ptr_;
 }
@@ -80,7 +80,7 @@ TAO_Pseudo_Var_T<T>::inout (void)
 template <typename T>
 ACE_INLINE
 typename T::_ptr_type &
-TAO_Pseudo_Var_T<T>::out (void)
+TAO_Pseudo_Var_T<T>::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = T::_nil ();
@@ -90,7 +90,7 @@ TAO_Pseudo_Var_T<T>::out (void)
 template <typename T>
 ACE_INLINE
 typename T::_ptr_type
-TAO_Pseudo_Var_T<T>::_retn (void)
+TAO_Pseudo_Var_T<T>::_retn ()
 {
   typename T::_ptr_type val = this->ptr_;
   this->ptr_ = T::_nil ();
@@ -152,7 +152,7 @@ TAO_Pseudo_Out_T<T>::operator= (typename T::_ptr_type p)
 template <typename T>
 ACE_INLINE
 typename T::_ptr_type &
-TAO_Pseudo_Out_T<T>::ptr (void)
+TAO_Pseudo_Out_T<T>::ptr ()
 {
   return this->ptr_;
 }
@@ -167,7 +167,7 @@ TAO_Pseudo_Out_T<T>::operator typename T::_ptr_type & ()
 template <typename T>
 ACE_INLINE
 typename T::_ptr_type
-TAO_Pseudo_Out_T<T>::operator-> (void)
+TAO_Pseudo_Out_T<T>::operator-> ()
 {
   return this->ptr_;
 }
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index b65474c89fa..237cbfcc168 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -13,7 +13,7 @@ namespace TAO
   }
 
   ACE_Reactor_Impl *
-  QtResource_Factory::reactor_impl (void)
+  QtResource_Factory::reactor_impl ()
   {    // synchronized by external locks
     if (this->qapp_ == 0)
       {
diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
index 6540d2a70c8..2e830608688 100644
--- a/TAO/tao/QtResource/QtResource_Factory.h
+++ b/TAO/tao/QtResource/QtResource_Factory.h
@@ -44,7 +44,7 @@ namespace TAO
 
   protected:
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
index 284077df372..8d542cc3f56 100644
--- a/TAO/tao/QtResource/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
@@ -16,7 +16,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory (tmp);
   }
 
-  QtResource_Loader::~QtResource_Loader (void)
+  QtResource_Loader::~QtResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/QtResource/QtResource_Loader.h b/TAO/tao/QtResource/QtResource_Loader.h
index 807fa57f301..da86625cfdc 100644
--- a/TAO/tao/QtResource/QtResource_Loader.h
+++ b/TAO/tao/QtResource/QtResource_Loader.h
@@ -52,7 +52,7 @@ namespace TAO
   {
   public:
     QtResource_Loader (QApplication *qapp);
-    virtual ~QtResource_Loader (void);
+    virtual ~QtResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp
index 438f9d8a5c4..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
     {
@@ -131,23 +130,25 @@ TAO_Queued_Data::release (TAO_Queued_Data *qd)
 
   if (qd->allocator_)
     {
+      // Store the allocator first on the stack, destructor of
+      // qd will be called first, fixes gcc warning
+      ACE_Allocator *alloc = qd->allocator_;
       ACE_DES_FREE (qd,
-                    qd->allocator_->free,
+                    alloc->free,
                     TAO_Queued_Data);
-
-      return;
     }
-
-  // @todo: Need to be removed at some point of time!
-  if (TAO_debug_level == 4)
+  else
     {
-      // This debug is for testing purposes!
-      TAOLIB_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Queued_Data[%d]::release\n",
-                  "Using global pool for releasing\n"));
+      // @todo: Need to be removed at some point of time!
+      if (TAO_debug_level == 4)
+        {
+          // This debug is for testing purposes!
+          TAOLIB_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Queued_Data[%d]::release\n",
+                      "Using global pool for releasing\n"));
+        }
+      delete qd;
     }
-  delete qd;
-
 }
 
 
diff --git a/TAO/tao/Queued_Data.h b/TAO/tao/Queued_Data.h
index ee3b6969cc2..c13e1a97b48 100644
--- a/TAO/tao/Queued_Data.h
+++ b/TAO/tao/Queued_Data.h
@@ -108,9 +108,8 @@ public:
   const TAO_GIOP_Message_State& state () const;
 
 private:
-
   /// The message block that contains the message.
-  ACE_Message_Block *msg_block_;
+  ACE_Message_Block *msg_block_ {};
 
   /*!
     @name Missing Data details
@@ -122,21 +121,21 @@ private:
   /*! Data missing in the above message that hasn't been read or processed yet,
       the value TAO_MISSING_DATA_UNDEFINED indicates it hasn't been processed yet,
       otherwise greater or equal zero. */
-  size_t missing_data_;
+  size_t missing_data_ {};
   //@}
 
   /// State of this queued data
   TAO_GIOP_Message_State state_;
 
   /// Pounter to the next element in the queue.
-  TAO_Queued_Data *next_;
+  TAO_Queued_Data *next_ {};
 
   /// Replace the datablock with a one allocated on the heap or
   /// allocator
   static void replace_data_block (ACE_Message_Block &mb);
 
   /// The allocator used to allocate this class.
-  ACE_Allocator *allocator_;
+  ACE_Allocator *allocator_ {};
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Queued_Data.inl b/TAO/tao/Queued_Data.inl
index c90cb50c2e1..18f1e227486 100644
--- a/TAO/tao/Queued_Data.inl
+++ b/TAO/tao/Queued_Data.inl
@@ -6,11 +6,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE void
 TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb)
 {
-  size_t const newsize =
-    ACE_CDR::total_length (&mb, 0) + ACE_CDR::MAX_ALIGNMENT;
+  size_t const newsize = ACE_CDR::total_length (&mb, 0) + ACE_CDR::MAX_ALIGNMENT;
 
-  ACE_Data_Block *db =
-    mb.data_block ()->clone_nocopy ();
+  ACE_Data_Block *db = mb.data_block ()->clone_nocopy ();
 
   if (db->size (newsize) == -1)
     return;
@@ -30,10 +28,7 @@ TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb)
 
 ACE_INLINE
 TAO_Queued_Data::TAO_Queued_Data (ACE_Allocator *alloc)
-  : msg_block_ (0),
-    missing_data_ (0),
-    state_ (),
-    next_ (0),
+  : state_ (),
     allocator_ (alloc)
 {
 }
@@ -42,9 +37,7 @@ ACE_INLINE
 TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb,
                                   ACE_Allocator *alloc)
   : msg_block_ (mb),
-    missing_data_ (0),
     state_ (),
-    next_ (0),
     allocator_ (alloc)
 {
 }
@@ -54,12 +47,10 @@ TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd)
   : msg_block_ (qd.msg_block_->duplicate ()),
     missing_data_ (qd.missing_data_),
     state_ (qd.state_),
-    next_ (0),
     allocator_ (qd.allocator_)
 {
 }
 
-
 ACE_INLINE size_t
 TAO_Queued_Data::missing_data () const
 {
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index 2decc9345f5..037c3a1ca0e 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -78,7 +78,7 @@ public:
                       bool is_heap_allocated = false);
 
   /// Destructor
-  virtual ~TAO_Queued_Message (void);
+  virtual ~TAO_Queued_Message ();
 
   /** @name Intrusive list manipulation
    *
@@ -127,7 +127,6 @@ public:
   /** @name Template Methods
    */
   //@{
-
   /// Return the length of the message
   /**
    * If the message has been partially sent it returns the number of
@@ -191,7 +190,7 @@ public:
    * Asynchronous (SYNC_NONE) messages are allocated from the heap (or
    * a pool), they need to be reclaimed explicitly.
    */
-  virtual void destroy (void) = 0;
+  virtual void destroy () = 0;
 
   /// Check for timeout
   /**
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 18856e3bcaa..549c2423320 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -13,7 +13,7 @@ TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
 {
 }
 
-TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping (void)
+TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping ()
 {
 }
 
@@ -79,7 +79,6 @@ CORBA::Boolean
 TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
                                            RTCORBA::Priority &corba_priority)
 {
-
 #if defined (ACE_WIN32)
 
   int current_native_priority = this->min_;
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
index ebea5fae814..1e4e0ae1ece 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -53,7 +53,7 @@ public:
   TAO_Continuous_Priority_Mapping (int policy = ACE_SCHED_OTHER);
 
   /// Destructor.
-  ~TAO_Continuous_Priority_Mapping (void);
+  ~TAO_Continuous_Priority_Mapping ();
 
   /// Convert CORBA priority to native priority.
   CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index 5c48e423064..1544d4cefcb 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -11,7 +11,7 @@ TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
 {
 }
 
-TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping (void)
+TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index 3d6137a8583..0e3ba63cac4 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -40,7 +40,7 @@ public:
   TAO_Direct_Priority_Mapping (long);
 
   /// The destructor
-  virtual ~TAO_Direct_Priority_Mapping (void);
+  virtual ~TAO_Direct_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index 102c44a7c35..f88834ace70 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -16,7 +16,7 @@ TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
 {
 }
 
-TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
+TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index f8656457b86..dc8216294f2 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -47,7 +47,7 @@ public:
   TAO_Linear_Priority_Mapping (long policy);
 
   /// The destructor
-  virtual ~TAO_Linear_Priority_Mapping (void);
+  virtual ~TAO_Linear_Priority_Mapping ();
 
   virtual CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
                                     RTCORBA::NativePriority &native_priority);
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index 2e0736adb61..9cb022112f0 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -62,7 +62,7 @@ TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (
     }
 }
 
-TAO_Multi_Priority_Mapping::~TAO_Multi_Priority_Mapping (void)
+TAO_Multi_Priority_Mapping::~TAO_Multi_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
index f45eec78ef2..a80c533cb50 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -59,7 +59,7 @@ public:
                               int policy = ACE_SCHED_FIFO);
 
   /// The destructor
-  virtual ~TAO_Multi_Priority_Mapping (void);
+  virtual ~TAO_Multi_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (RTCORBA::Priority corba_priority,
@@ -69,7 +69,6 @@ public:
                 RTCORBA::Priority &corba_priority);
 
 private:
-
   /// The base settings
   int base_native_priority_;
   int base_corba_priority_;
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
index 725fccc42bd..a950f69fee3 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping (void)
+TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
index cfd886b6fe6..1e25f8d2c27 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
@@ -39,7 +39,7 @@ class TAO_RTCORBA_Export TAO_Network_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_Network_Priority_Mapping (void);
+  virtual ~TAO_Network_Priority_Mapping ();
 
   virtual CORBA::Boolean
     to_network (RTCORBA::Priority corba_priority,
@@ -58,4 +58,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 
 
-
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index 31ad3d13eaa..f0a06efa705 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -45,7 +45,6 @@ namespace RTCORBA
 class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager :
   public virtual ::CORBA::LocalObject
 {
-
 public:
   /// Constructor.
   TAO_Network_Priority_Mapping_Manager (RTCORBA::NetworkPriorityMapping * mapping);
@@ -54,7 +53,7 @@ public:
   void mapping (RTCORBA::NetworkPriorityMapping * mapping);
 
   ///
-  RTCORBA::NetworkPriorityMapping *mapping (void);
+  RTCORBA::NetworkPriorityMapping *mapping ();
 
 public:
   typedef TAO_Network_Priority_Mapping_Manager_ptr _ptr_type;
@@ -74,18 +73,15 @@ public:
   virtual const char* _interface_repository_id () const;
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  ~TAO_Network_Priority_Mapping_Manager (void);
+  ~TAO_Network_Priority_Mapping_Manager ();
 
 private:
-
   TAO_Network_Priority_Mapping_Manager (const TAO_Network_Priority_Mapping_Manager &);
   void operator= (const TAO_Network_Priority_Mapping_Manager &);
 
 private:
-
   TAO_Network_Priority_Mapping *mapping_;
 };
 
@@ -93,10 +89,10 @@ class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var
   : private TAO_Base_var
 {
 public:
-  TAO_Network_Priority_Mapping_Manager_var (void); // default constructor
+  TAO_Network_Priority_Mapping_Manager_var (); // default constructor
   TAO_Network_Priority_Mapping_Manager_var (TAO_Network_Priority_Mapping_Manager_ptr);
   TAO_Network_Priority_Mapping_Manager_var (const TAO_Network_Priority_Mapping_Manager_var &); // copy constructor
-  ~TAO_Network_Priority_Mapping_Manager_var (void); // destructor
+  ~TAO_Network_Priority_Mapping_Manager_var (); // destructor
 
   TAO_Network_Priority_Mapping_Manager_var &operator= (TAO_Network_Priority_Mapping_Manager_ptr);
   TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Network_Priority_Mapping_Manager_var &);
@@ -106,16 +102,16 @@ public:
   operator const TAO_Network_Priority_Mapping_Manager_ptr &() const;
   operator TAO_Network_Priority_Mapping_Manager_ptr &();
   TAO_Network_Priority_Mapping_Manager_ptr in () const;
-  TAO_Network_Priority_Mapping_Manager_ptr &inout (void);
-  TAO_Network_Priority_Mapping_Manager_ptr &out (void);
-  TAO_Network_Priority_Mapping_Manager_ptr _retn (void);
+  TAO_Network_Priority_Mapping_Manager_ptr &inout ();
+  TAO_Network_Priority_Mapping_Manager_ptr &out ();
+  TAO_Network_Priority_Mapping_Manager_ptr _retn ();
   TAO_Network_Priority_Mapping_Manager_ptr ptr () const;
 
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static TAO_Network_Priority_Mapping_Manager_ptr duplicate (TAO_Network_Priority_Mapping_Manager_ptr);
   static void release (TAO_Network_Priority_Mapping_Manager_ptr);
-  static TAO_Network_Priority_Mapping_Manager_ptr nil (void);
+  static TAO_Network_Priority_Mapping_Manager_ptr nil ();
   static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
@@ -135,8 +131,8 @@ public:
   TAO_Network_Priority_Mapping_Manager_out &operator= (const TAO_Network_Priority_Mapping_Manager_var &);
   TAO_Network_Priority_Mapping_Manager_out &operator= (TAO_Network_Priority_Mapping_Manager_ptr);
   operator TAO_Network_Priority_Mapping_Manager_ptr &();
-  TAO_Network_Priority_Mapping_Manager_ptr &ptr (void);
-  TAO_Network_Priority_Mapping_Manager_ptr operator-> (void);
+  TAO_Network_Priority_Mapping_Manager_ptr &ptr ();
+  TAO_Network_Priority_Mapping_Manager_ptr operator-> ();
 
 private:
   TAO_Network_Priority_Mapping_Manager_ptr &ptr_;
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
index fc1de165745..4480f599715 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // *************************************************************
 
 ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (void) // default constructor
+TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var () // default constructor
   : ptr_ (TAO_Network_Priority_Mapping_Manager::_nil ())
 {}
 
@@ -28,7 +28,7 @@ TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_v
 {}
 
 ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var (void) // destructor
+TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var () // destructor
 {
   CORBA::release (this->ptr_);
 }
@@ -77,13 +77,13 @@ TAO_Network_Priority_Mapping_Manager_var::in () const
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_var::inout (void)
+TAO_Network_Priority_Mapping_Manager_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_var::out (void)
+TAO_Network_Priority_Mapping_Manager_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil ();
@@ -91,7 +91,7 @@ TAO_Network_Priority_Mapping_Manager_var::out (void)
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::_retn (void)
+TAO_Network_Priority_Mapping_Manager_var::_retn ()
 {
   // yield ownership of managed obj reference
   ::TAO_Network_Priority_Mapping_Manager_ptr val = this->ptr_;
@@ -112,7 +112,7 @@ TAO_Network_Priority_Mapping_Manager_var::release (TAO_Network_Priority_Mapping_
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::nil (void)
+TAO_Network_Priority_Mapping_Manager_var::nil ()
 {
   return ::TAO_Network_Priority_Mapping_Manager::_nil ();
 }
@@ -187,13 +187,13 @@ TAO_Network_Priority_Mapping_Manager_out::operator ::TAO_Network_Priority_Mappin
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_out::ptr (void) // ptr
+TAO_Network_Priority_Mapping_Manager_out::ptr () // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_out::operator-> (void)
+TAO_Network_Priority_Mapping_Manager_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -206,7 +206,7 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO
 }
 
 ACE_INLINE RTCORBA::NetworkPriorityMapping *
-TAO_Network_Priority_Mapping_Manager::mapping (void)
+TAO_Network_Priority_Mapping_Manager::mapping ()
 {
   return this->mapping_;
 }
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index c44c70f710f..8e19cbae2a4 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
+TAO_Priority_Mapping::~TAO_Priority_Mapping ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h
index ded2cf34df0..3dad6c4742c 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping.h
@@ -38,7 +38,7 @@ class TAO_RTCORBA_Export TAO_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_Priority_Mapping (void);
+  virtual ~TAO_Priority_Mapping ();
 
   virtual CORBA::Boolean
       to_native (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index cc64c8f81cd..6e275c7aee0 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
+TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager ()
 {
   delete this->mapping_;
 }
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 5ce01aa483c..a0652c6cbf4 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -42,7 +42,6 @@ typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr;
 class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager :
   public virtual ::CORBA::LocalObject
 {
-
 public:
   /// Constructor.
   TAO_Priority_Mapping_Manager (RTCORBA::PriorityMapping * mapping);
@@ -51,7 +50,7 @@ public:
   void mapping (RTCORBA::PriorityMapping * mapping);
 
   ///
-  RTCORBA::PriorityMapping *mapping (void);
+  RTCORBA::PriorityMapping *mapping ();
 
 public:
   typedef TAO_Priority_Mapping_Manager_ptr _ptr_type;
@@ -85,10 +84,10 @@ class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var
   : private TAO_Base_var
 {
 public:
-  TAO_Priority_Mapping_Manager_var (void); // default constructor
+  TAO_Priority_Mapping_Manager_var (); // default constructor
   TAO_Priority_Mapping_Manager_var (TAO_Priority_Mapping_Manager_ptr);
   TAO_Priority_Mapping_Manager_var (const TAO_Priority_Mapping_Manager_var &); // copy constructor
-  ~TAO_Priority_Mapping_Manager_var (void); // destructor
+  ~TAO_Priority_Mapping_Manager_var (); // destructor
 
   TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr);
   TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &);
@@ -98,16 +97,16 @@ public:
   operator const TAO_Priority_Mapping_Manager_ptr &() const;
   operator TAO_Priority_Mapping_Manager_ptr &();
   TAO_Priority_Mapping_Manager_ptr in () const;
-  TAO_Priority_Mapping_Manager_ptr &inout (void);
-  TAO_Priority_Mapping_Manager_ptr &out (void);
-  TAO_Priority_Mapping_Manager_ptr _retn (void);
+  TAO_Priority_Mapping_Manager_ptr &inout ();
+  TAO_Priority_Mapping_Manager_ptr &out ();
+  TAO_Priority_Mapping_Manager_ptr _retn ();
   TAO_Priority_Mapping_Manager_ptr ptr () const;
 
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr);
   static void release (TAO_Priority_Mapping_Manager_ptr);
-  static TAO_Priority_Mapping_Manager_ptr nil (void);
+  static TAO_Priority_Mapping_Manager_ptr nil ();
   static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
@@ -127,8 +126,8 @@ public:
   TAO_Priority_Mapping_Manager_out &operator= (const TAO_Priority_Mapping_Manager_var &);
   TAO_Priority_Mapping_Manager_out &operator= (TAO_Priority_Mapping_Manager_ptr);
   operator TAO_Priority_Mapping_Manager_ptr &();
-  TAO_Priority_Mapping_Manager_ptr &ptr (void);
-  TAO_Priority_Mapping_Manager_ptr operator-> (void);
+  TAO_Priority_Mapping_Manager_ptr &ptr ();
+  TAO_Priority_Mapping_Manager_ptr operator-> ();
 
 private:
   TAO_Priority_Mapping_Manager_ptr &ptr_;
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
index dffaea89b8e..00c8e79465d 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // *************************************************************
 
 ACE_INLINE
-TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (void) // default constructor
+TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var () // default constructor
   : ptr_ (TAO_Priority_Mapping_Manager::_nil ())
 {}
 
@@ -28,7 +28,7 @@ TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (const ::TAO_
 {}
 
 ACE_INLINE
-TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var (void) // destructor
+TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var () // destructor
 {
   CORBA::release (this->ptr_);
 }
@@ -77,13 +77,13 @@ TAO_Priority_Mapping_Manager_var::in () const
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_var::inout (void)
+TAO_Priority_Mapping_Manager_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_var::out (void)
+TAO_Priority_Mapping_Manager_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil ();
@@ -91,7 +91,7 @@ TAO_Priority_Mapping_Manager_var::out (void)
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::_retn (void)
+TAO_Priority_Mapping_Manager_var::_retn ()
 {
   // yield ownership of managed obj reference
   ::TAO_Priority_Mapping_Manager_ptr val = this->ptr_;
@@ -112,7 +112,7 @@ TAO_Priority_Mapping_Manager_var::release (TAO_Priority_Mapping_Manager_ptr p)
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::nil (void)
+TAO_Priority_Mapping_Manager_var::nil ()
 {
   return ::TAO_Priority_Mapping_Manager::_nil ();
 }
@@ -187,13 +187,13 @@ TAO_Priority_Mapping_Manager_out::operator ::TAO_Priority_Mapping_Manager_ptr &(
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_out::ptr (void) // ptr
+TAO_Priority_Mapping_Manager_out::ptr () // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_out::operator-> (void)
+TAO_Priority_Mapping_Manager_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -206,7 +206,7 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap
 }
 
 ACE_INLINE RTCORBA::PriorityMapping *
-TAO_Priority_Mapping_Manager::mapping (void)
+TAO_Priority_Mapping_Manager::mapping ()
 {
   return this->mapping_;
 }
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index 3cb27c57f13..26884e809a2 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
+TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader);
 }
diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
index a4815f7f130..6a1cbcd8ddb 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -32,7 +32,7 @@ class TAO_RTCORBA_Export TAO_RTCORBA_Initializer
 {
 public:
   // Constructor.
-  TAO_RTCORBA_Initializer (void);
+  TAO_RTCORBA_Initializer ();
 };
 
 static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 3a639f5b55c..b38ba801416 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -18,12 +18,12 @@ TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_RT_Current::~TAO_RT_Current (void)
+TAO_RT_Current::~TAO_RT_Current ()
 {
 }
 
 RTCORBA::Priority
-TAO_RT_Current::the_priority (void)
+TAO_RT_Current::the_priority ()
 {
   TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
@@ -47,7 +47,6 @@ TAO_RT_Current::the_priority (void)
 void
 TAO_RT_Current::the_priority (RTCORBA::Priority the_priority)
 {
-
   TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
   if (tph->set_thread_CORBA_priority (the_priority) == -1)
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 299777e0af8..5c2b2991336 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -43,25 +43,21 @@ class TAO_RTCORBA_Export TAO_RT_Current
   , public ::CORBA::LocalObject
 {
 public:
-
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
-  virtual RTCORBA::Priority the_priority (void);
+  virtual RTCORBA::Priority the_priority ();
 
   virtual void the_priority (RTCORBA::Priority the_priority);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_RT_Current (void);
+  virtual ~TAO_RT_Current ();
 
 private:
-
   /// ORB Core that owns us.
   TAO_ORB_Core * const orb_core_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index b4bdd788a0f..1b7deda9394 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -12,19 +12,19 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
+RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory ()
 {
   ACE_NEW (this->rt_invocation_endpoint_selector_,
            TAO_RT_Invocation_Endpoint_Selector);
 }
 
-RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
+RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory ()
 {
   delete this->rt_invocation_endpoint_selector_;
 }
 
 TAO_Invocation_Endpoint_Selector *
-RT_Endpoint_Selector_Factory::get_selector (void)
+RT_Endpoint_Selector_Factory::get_selector ()
 {
   return this->rt_invocation_endpoint_selector_;
 }
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index c3caeb1125b..6f57d85ffd8 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -52,12 +52,12 @@ class TAO_RTCORBA_Export RT_Endpoint_Selector_Factory
 {
 public:
   /// Constructor.
-  RT_Endpoint_Selector_Factory (void);
+  RT_Endpoint_Selector_Factory ();
 
   /// Destructor.
-  virtual ~RT_Endpoint_Selector_Factory (void);
+  virtual ~RT_Endpoint_Selector_Factory ();
 
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
   void operator= (const RT_Endpoint_Selector_Factory &);
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index ece8bd20950..7ae293e3450 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -124,7 +124,6 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
       CORBA::PolicyList *p = r.inconsistent_policies ();
       if (p)
         {
-
           p->length (1);
           (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy);
         }
@@ -176,7 +175,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
           CORBA::PolicyList *p = r.inconsistent_policies ();
           if (p)
             {
-
               p->length (1);
               (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
             }
@@ -228,13 +226,11 @@ 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.
               if (bands_policy.ptr () == 0)
                 {
-
                   // Match the priority of the client thread with the
                   // endpoint.
                   match_priority = true;
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index 8a4bd965ddb..9be25588f29 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -45,7 +45,6 @@ class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector
   : public TAO_Invocation_Endpoint_Selector
 {
 public:
-
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val);
 
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 157b5747100..5bc6f820f21 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -8,19 +8,19 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Mutex::~TAO_RT_Mutex (void)
+TAO_RT_Mutex::~TAO_RT_Mutex ()
 {
 }
 
 void
-TAO_RT_Mutex::lock (void)
+TAO_RT_Mutex::lock ()
 {
   if (this->mu_.acquire () != 0)
     throw ::CORBA::INTERNAL ();
 }
 
 void
-TAO_RT_Mutex::unlock (void)
+TAO_RT_Mutex::unlock ()
 {
   if (this->mu_.release () != 0)
     throw ::CORBA::INTERNAL ();
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index b17cf860b16..4e74854dc3f 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -50,12 +50,11 @@ class TAO_RTCORBA_Export TAO_RT_Mutex
     public ::CORBA::LocalObject
 {
 public:
-
   /// Acquire the lock.
-  virtual void lock (void);
+  virtual void lock ();
 
   /// Release the lock.
-  virtual void unlock (void);
+  virtual void unlock ();
 
   /**
    * Acquire the lock, but only wait up to @a max_wait time.  Note
@@ -69,7 +68,7 @@ public:
   virtual const char *name () const;
 
   /// Destructor.
-  virtual ~TAO_RT_Mutex (void);
+  virtual ~TAO_RT_Mutex ();
 
 protected:
   /// Synchronization lock.
@@ -92,7 +91,6 @@ public:
   virtual const char *name () const;
 
 protected:
-
   /// My name.
   ACE_CString name_;
 };
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 3a2229b58e3..5fccc10a95f 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -36,12 +36,12 @@ TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
     &rt_thread_lane_resources_manager->tp_manager ();
 }
 
-TAO_RT_ORB::~TAO_RT_ORB (void)
+TAO_RT_ORB::~TAO_RT_ORB ()
 {
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_mutex (void)
+TAO_RT_ORB::create_mutex ()
 {
   return this->mutex_mgr_.create_mutex ();
 }
@@ -68,16 +68,16 @@ TAO_RT_ORB::open_named_mutex (const char *name)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager (void)
+TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager ()
 {
 }
 
-TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
+TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager ()
 {
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (void)
+TAO_Named_RT_Mutex_Manager::create_mutex ()
 {
   TAO_RT_Mutex *mutex = 0;
   ACE_NEW_THROW_EX (mutex,
@@ -390,7 +390,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO_RT_ORB::create_private_connection_policy (void)
+TAO_RT_ORB::create_private_connection_policy ()
 {
   TAO_PrivateConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 12fd4afb9ec..5dde632573c 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -46,15 +46,14 @@ class TAO_Thread_Pool_Manager;
  */
 class TAO_RTCORBA_Export TAO_Named_RT_Mutex_Manager
 {
-
 public:
   /// Constructor.
-  TAO_Named_RT_Mutex_Manager (void);
+  TAO_Named_RT_Mutex_Manager ();
 
   /// Destructor.
-  ~TAO_Named_RT_Mutex_Manager (void);
+  ~TAO_Named_RT_Mutex_Manager ();
 
-  RTCORBA::Mutex_ptr create_mutex (void);
+  RTCORBA::Mutex_ptr create_mutex ();
 
   void destroy_mutex (RTCORBA::Mutex_ptr the_mutex);
 
@@ -64,7 +63,6 @@ public:
   RTCORBA::Mutex_ptr open_named_mutex (const char * name);
 
 private:
-
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
   /// Hash map for named RT Mutexes
   ACE_Hash_Map_Manager_Ex<
@@ -92,7 +90,6 @@ class TAO_RTCORBA_Export TAO_RT_ORB
     public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_RT_ORB (TAO_ORB_Core *orb_core,
               TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan,
@@ -104,7 +101,7 @@ public:
    * consistant priority inheritance/piority ceiling semantics
    * can be guaranteed.
    */
-  virtual RTCORBA::Mutex_ptr create_mutex (void);
+  virtual RTCORBA::Mutex_ptr create_mutex ();
 
   /**
    * Destroy a mutex.  Currently this is a no-op since RTCORBA::Mutex
@@ -211,7 +208,7 @@ public:
    * to the server.
    */
   virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (void);
+  create_private_connection_policy ();
 
   /**
    * Create a ServerProtocolPolicy instance to select and configure
@@ -251,13 +248,11 @@ public:
   static int modify_thread_scheduling_policy (CORBA::ORB_ptr orb);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_RT_ORB (void);
+  virtual ~TAO_RT_ORB ();
 
 protected:
-
   /// Reference to our creating ORB Core.
   TAO_ORB_Core * const orb_core_;
 
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 73d9c8e4196..6f1e3d9208e 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -84,7 +84,6 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register RTCORBA policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 5e2f2cc3ff2..d42b9b2a339 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -13,12 +13,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
+TAO_RT_ORB_Loader::TAO_RT_ORB_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
+TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
index e4b9f3db0c8..712f777ea17 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h
@@ -33,12 +33,11 @@ class TAO_ORB_Core;
 class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object
 {
 public:
-
   /// Constructor.
-  TAO_RT_ORB_Loader (void);
+  TAO_RT_ORB_Loader ();
 
   /// Destructor.
-  virtual ~TAO_RT_ORB_Loader (void);
+  virtual ~TAO_RT_ORB_Loader ();
 
   /// Initialize the RT ORB loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 453572829f9..ebe65f7c2eb 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -35,13 +35,13 @@ TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy
 {
 }
 
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (void)
+TAO_PriorityModelPolicy::TAO_PriorityModelPolicy ()
   : priority_model_ (RTCORBA::SERVER_DECLARED),
     server_priority_ (0)
 {
 }
 
-TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
+TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy ()
 {
 }
 
@@ -57,31 +57,31 @@ TAO_PriorityModelPolicy::create (const CORBA::Any &)
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::get_priority_model (void)
+TAO_PriorityModelPolicy::get_priority_model ()
 {
   return this->priority_model_;
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::priority_model (void)
+TAO_PriorityModelPolicy::priority_model ()
 {
   return this->priority_model_;
 }
 
 RTCORBA::Priority
-TAO_PriorityModelPolicy::server_priority (void)
+TAO_PriorityModelPolicy::server_priority ()
 {
   return this->server_priority_;
 }
 
 CORBA::PolicyType
-TAO_PriorityModelPolicy::policy_type (void)
+TAO_PriorityModelPolicy::policy_type ()
 {
   return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::copy (void)
+TAO_PriorityModelPolicy::copy ()
 {
   TAO_PriorityModelPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -93,7 +93,7 @@ TAO_PriorityModelPolicy::copy (void)
 }
 
 void
-TAO_PriorityModelPolicy::destroy (void)
+TAO_PriorityModelPolicy::destroy ()
 {
 }
 
@@ -151,7 +151,7 @@ TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs)
 {
 }
 
-TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
+TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy ()
 {
 }
 
@@ -172,19 +172,19 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::ThreadpoolId
-TAO_ThreadpoolPolicy::threadpool (void)
+TAO_ThreadpoolPolicy::threadpool ()
 {
   return this->id_;
 }
 
 CORBA::PolicyType
-TAO_ThreadpoolPolicy::policy_type (void)
+TAO_ThreadpoolPolicy::policy_type ()
 {
   return RTCORBA::THREADPOOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::copy (void)
+TAO_ThreadpoolPolicy::copy ()
 {
   TAO_ThreadpoolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -196,7 +196,7 @@ TAO_ThreadpoolPolicy::copy (void)
 }
 
 void
-TAO_ThreadpoolPolicy::destroy (void)
+TAO_ThreadpoolPolicy::destroy ()
 {
 }
 
@@ -215,7 +215,7 @@ TAO_ThreadpoolPolicy::_tao_scope () const
 
 // ****************************************************************
 
-TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void)
+TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , RTCORBA::PrivateConnectionPolicy ()
@@ -231,7 +231,7 @@ TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConne
 {
 }
 
-TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
+TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy ()
 {
 }
 
@@ -248,13 +248,13 @@ TAO_PrivateConnectionPolicy::create (const CORBA::Any &)
 }
 
 CORBA::PolicyType
-TAO_PrivateConnectionPolicy::policy_type (void)
+TAO_PrivateConnectionPolicy::policy_type ()
 {
   return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::copy (void)
+TAO_PrivateConnectionPolicy::copy ()
 {
   TAO_PrivateConnectionPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -266,7 +266,7 @@ TAO_PrivateConnectionPolicy::copy (void)
 }
 
 void
-TAO_PrivateConnectionPolicy::destroy (void)
+TAO_PrivateConnectionPolicy::destroy ()
 {
 }
 
@@ -304,11 +304,11 @@ TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TA
 {
 }
 
-TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (void)
+TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy ()
 {
 }
 
-TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void)
+TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy ()
 {
 }
 
@@ -329,7 +329,7 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::PriorityBands *
-TAO_PriorityBandedConnectionPolicy::priority_bands (void)
+TAO_PriorityBandedConnectionPolicy::priority_bands ()
 {
   RTCORBA::PriorityBands *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -341,13 +341,13 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (void)
 }
 
 CORBA::PolicyType
-TAO_PriorityBandedConnectionPolicy::policy_type (void)
+TAO_PriorityBandedConnectionPolicy::policy_type ()
 {
   return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::copy (void)
+TAO_PriorityBandedConnectionPolicy::copy ()
 {
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -359,7 +359,7 @@ TAO_PriorityBandedConnectionPolicy::copy (void)
 }
 
 void
-TAO_PriorityBandedConnectionPolicy::destroy (void)
+TAO_PriorityBandedConnectionPolicy::destroy ()
 {
 }
 
@@ -389,7 +389,7 @@ TAO_PriorityBandedConnectionPolicy::_tao_scope () const
 }
 
 RTCORBA::PriorityBands &
-TAO_PriorityBandedConnectionPolicy::priority_bands_rep (void)
+TAO_PriorityBandedConnectionPolicy::priority_bands_rep ()
 {
   return this->priority_bands_;
 }
@@ -414,7 +414,7 @@ TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPoli
 {
 }
 
-TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void)
+TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy ()
 {
 }
 
@@ -435,7 +435,7 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::ProtocolList *
-TAO_ServerProtocolPolicy::protocols (void)
+TAO_ServerProtocolPolicy::protocols ()
 {
   RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -447,13 +447,13 @@ TAO_ServerProtocolPolicy::protocols (void)
 }
 
 CORBA::PolicyType
-TAO_ServerProtocolPolicy::policy_type (void)
+TAO_ServerProtocolPolicy::policy_type ()
 {
   return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::copy (void)
+TAO_ServerProtocolPolicy::copy ()
 {
   TAO_ServerProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -465,7 +465,7 @@ TAO_ServerProtocolPolicy::copy (void)
 }
 
 void
-TAO_ServerProtocolPolicy::destroy (void)
+TAO_ServerProtocolPolicy::destroy ()
 {
 }
 
@@ -483,14 +483,14 @@ TAO_ServerProtocolPolicy::_tao_scope () const
 }
 
 RTCORBA::ProtocolList &
-TAO_ServerProtocolPolicy::protocols_rep (void)
+TAO_ServerProtocolPolicy::protocols_rep ()
 {
   return protocols_;
 }
 
 // ****************************************************************
 
-TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (void)
+TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy ()
 {
 }
 
@@ -534,7 +534,7 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val)
 }
 
 RTCORBA::ProtocolList *
-TAO_ClientProtocolPolicy::protocols (void)
+TAO_ClientProtocolPolicy::protocols ()
 {
   RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -546,13 +546,13 @@ TAO_ClientProtocolPolicy::protocols (void)
 }
 
 CORBA::PolicyType
-TAO_ClientProtocolPolicy::policy_type (void)
+TAO_ClientProtocolPolicy::policy_type ()
 {
   return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::copy (void)
+TAO_ClientProtocolPolicy::copy ()
 {
   TAO_ClientProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -564,7 +564,7 @@ TAO_ClientProtocolPolicy::copy (void)
 }
 
 void
-TAO_ClientProtocolPolicy::destroy (void)
+TAO_ClientProtocolPolicy::destroy ()
 {
 }
 
@@ -630,14 +630,13 @@ 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;
 }
 
 RTCORBA::ProtocolList &
-TAO_ClientProtocolPolicy::protocols_rep (void)
+TAO_ClientProtocolPolicy::protocols_rep ()
 {
   return protocols_;
 }
@@ -659,12 +658,12 @@ TAO_TCP_Protocol_Properties::TAO_TCP_Protocol_Properties (CORBA::Long send_buffe
 {
 }
 
-TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
+TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties ()
 {
 }
 
 CORBA::Long
-TAO_TCP_Protocol_Properties::send_buffer_size (void)
+TAO_TCP_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -676,7 +675,7 @@ TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size)
 }
 
 CORBA::Long
-TAO_TCP_Protocol_Properties::recv_buffer_size (void)
+TAO_TCP_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -688,7 +687,7 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size)
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::keep_alive (void)
+TAO_TCP_Protocol_Properties::keep_alive ()
 {
   return this->keep_alive_;
 }
@@ -700,7 +699,7 @@ TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive)
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::dont_route (void)
+TAO_TCP_Protocol_Properties::dont_route ()
 {
   return this->dont_route_;
 }
@@ -711,7 +710,7 @@ TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route)
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
+CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay ()
 {
   return this->no_delay_;
 }
@@ -723,7 +722,7 @@ TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay)
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::enable_network_priority (void)
+TAO_TCP_Protocol_Properties::enable_network_priority ()
 {
   return this->enable_network_priority_;
 }
@@ -772,12 +771,12 @@ TAO_UnixDomain_Protocol_Properties::TAO_UnixDomain_Protocol_Properties
 {
 }
 
-TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
+TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties ()
 {
 }
 
 CORBA::Long
-TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
+TAO_UnixDomain_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -789,7 +788,7 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_si
 }
 
 CORBA::Long
-TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
+TAO_UnixDomain_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -835,13 +834,13 @@ TAO_SharedMemory_Protocol_Properties::TAO_SharedMemory_Protocol_Properties (CORB
 {
 }
 
-TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (void)
+TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties ()
 {
 }
 
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
+TAO_SharedMemory_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -853,7 +852,7 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_
 }
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
+TAO_SharedMemory_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -865,7 +864,7 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::keep_alive (void)
+TAO_SharedMemory_Protocol_Properties::keep_alive ()
 {
   return this->keep_alive_;
 }
@@ -877,7 +876,7 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive)
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::dont_route (void)
+TAO_SharedMemory_Protocol_Properties::dont_route ()
 {
   return this->dont_route_;
 }
@@ -889,7 +888,7 @@ TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route)
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::no_delay (void)
+TAO_SharedMemory_Protocol_Properties::no_delay ()
 {
   return this->no_delay_;
 }
@@ -901,7 +900,7 @@ TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay)
 }
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
+TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size ()
 {
   return this->preallocate_buffer_size_;
 }
@@ -913,7 +912,7 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preal
 }
 
 char *
-TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
+TAO_SharedMemory_Protocol_Properties::mmap_filename ()
 {
   return this->mmap_filename_.rep ();
 }
@@ -925,7 +924,7 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename)
 }
 
 char *
-TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
+TAO_SharedMemory_Protocol_Properties::mmap_lockname ()
 {
   return this->mmap_lockname_.rep ();
 }
@@ -988,12 +987,12 @@ TAO_UserDatagram_Protocol_Properties::TAO_UserDatagram_Protocol_Properties (
 {
 }
 
-TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (void)
+TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties ()
 {
 }
 
 CORBA::Boolean
-TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
+TAO_UserDatagram_Protocol_Properties::enable_network_priority ()
 {
   return this->enable_network_priority_;
 }
@@ -1005,7 +1004,7 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean en
 }
 
 CORBA::Long
-TAO_UserDatagram_Protocol_Properties::send_buffer_size (void)
+TAO_UserDatagram_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -1017,7 +1016,7 @@ TAO_UserDatagram_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_
 }
 
 CORBA::Long
-TAO_UserDatagram_Protocol_Properties::recv_buffer_size (void)
+TAO_UserDatagram_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -1057,12 +1056,12 @@ TAO_StreamControl_Protocol_Properties::TAO_StreamControl_Protocol_Properties (CO
 {
 }
 
-TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (void)
+TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties ()
 {
 }
 
 CORBA::Long
-TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
+TAO_StreamControl_Protocol_Properties::send_buffer_size ()
 {
   return this->send_buffer_size_;
 }
@@ -1074,7 +1073,7 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer
 }
 
 CORBA::Long
-TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
+TAO_StreamControl_Protocol_Properties::recv_buffer_size ()
 {
   return this->recv_buffer_size_;
 }
@@ -1086,7 +1085,7 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::keep_alive (void)
+TAO_StreamControl_Protocol_Properties::keep_alive ()
 {
   return this->keep_alive_;
 }
@@ -1098,7 +1097,7 @@ TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive)
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::dont_route (void)
+TAO_StreamControl_Protocol_Properties::dont_route ()
 {
   return this->dont_route_;
 }
@@ -1109,7 +1108,7 @@ TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route)
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
+CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay ()
 {
   return this->no_delay_;
 }
@@ -1121,7 +1120,7 @@ TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay)
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
+TAO_StreamControl_Protocol_Properties::enable_network_priority ()
 {
   return this->enable_network_priority_;
 }
@@ -1162,11 +1161,11 @@ TAO_StreamControl_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 
 // ****************************************************************
 
-TAO_GIOP_Protocol_Properties::TAO_GIOP_Protocol_Properties (void)
+TAO_GIOP_Protocol_Properties::TAO_GIOP_Protocol_Properties ()
 {
 }
 
-TAO_GIOP_Protocol_Properties::~TAO_GIOP_Protocol_Properties (void)
+TAO_GIOP_Protocol_Properties::~TAO_GIOP_Protocol_Properties ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index b145bb51e29..a17f5b4a917 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -60,17 +60,17 @@ public:
    * (non-virtual, no exception handling) relative of the idl interface
    * implementation <priority_model> below.
    */
-  RTCORBA::PriorityModel get_priority_model (void);
+  RTCORBA::PriorityModel get_priority_model ();
 
-  RTCORBA::PriorityModel priority_model (void);
+  RTCORBA::PriorityModel priority_model ();
 
-  RTCORBA::Priority server_priority (void);
+  RTCORBA::Priority server_priority ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   /// This method writes a CDR representation of the object state.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -89,18 +89,16 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_PriorityModelPolicy (void);
+  virtual ~TAO_PriorityModelPolicy ();
 
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
-  TAO_PriorityModelPolicy (void);
+  TAO_PriorityModelPolicy ();
 
 private:
-
   /// Attributes.
   RTCORBA::PriorityModel priority_model_;
   RTCORBA::Priority server_priority_;
@@ -126,13 +124,13 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
-  RTCORBA::ThreadpoolId threadpool (void);
+  RTCORBA::ThreadpoolId threadpool ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -145,13 +143,11 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_ThreadpoolPolicy (void);
+  virtual ~TAO_ThreadpoolPolicy ();
 
 private:
-
   /// Attribute.
   RTCORBA::ThreadpoolId id_;
 };
@@ -173,16 +169,16 @@ class TAO_RTCORBA_Export TAO_PrivateConnectionPolicy
 {
 public:
   /// Constructor.
-  TAO_PrivateConnectionPolicy (void);
+  TAO_PrivateConnectionPolicy ();
 
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -195,11 +191,9 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_PrivateConnectionPolicy (void);
-
+  virtual ~TAO_PrivateConnectionPolicy ();
 };
 
 //*************************************************************************
@@ -231,15 +225,15 @@ public:
    * make a copy like the idl accessor <priority_bands> implementation
    * below.)
    */
-  RTCORBA::PriorityBands &priority_bands_rep (void);
+  RTCORBA::PriorityBands &priority_bands_rep ();
 
-  RTCORBA::PriorityBands *priority_bands (void);
+  RTCORBA::PriorityBands *priority_bands ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   /// This method writes a CDR representation of the current object.
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -258,18 +252,16 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_PriorityBandedConnectionPolicy (void);
+  virtual ~TAO_PriorityBandedConnectionPolicy ();
 
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
-  TAO_PriorityBandedConnectionPolicy (void);
+  TAO_PriorityBandedConnectionPolicy ();
 
 private:
-
   /// Attribute.
   RTCORBA::PriorityBands priority_bands_;
 };
@@ -300,15 +292,15 @@ public:
    * make a copy like the idl accessor <protocols> implementation
    * below.)
    */
-  RTCORBA::ProtocolList & protocols_rep (void);
+  RTCORBA::ProtocolList & protocols_rep ();
 
-  RTCORBA::ProtocolList *protocols (void);
+  RTCORBA::ProtocolList *protocols ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -321,13 +313,11 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_ServerProtocolPolicy (void);
+  virtual ~TAO_ServerProtocolPolicy ();
 
 private:
-
   /// Attribute.
   RTCORBA::ProtocolList protocols_;
 };
@@ -358,15 +348,15 @@ public:
    * make a copy like the idl accessor <protocols> implementation
    * below.)
    */
-  RTCORBA::ProtocolList & protocols_rep (void);
+  RTCORBA::ProtocolList & protocols_rep ();
 
-  RTCORBA::ProtocolList *protocols (void);
+  RTCORBA::ProtocolList *protocols ();
 
-  CORBA::PolicyType policy_type (void);
+  CORBA::PolicyType policy_type ();
 
-  CORBA::Policy_ptr copy (void);
+  CORBA::Policy_ptr copy ();
 
-  void destroy (void);
+  void destroy ();
 
   // = CDR Encoder/Decoder.
 
@@ -387,18 +377,16 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_ClientProtocolPolicy (void);
+  virtual ~TAO_ClientProtocolPolicy ();
 
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
-  TAO_ClientProtocolPolicy (void);
+  TAO_ClientProtocolPolicy ();
 
 private:
-
   /// Attribute.
   RTCORBA::ProtocolList protocols_;
 };
@@ -425,27 +413,27 @@ public:
                                CORBA::Boolean no_delay,
                                CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void);
+  CORBA::Boolean keep_alive ();
 
   void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void);
+  CORBA::Boolean dont_route ();
 
   void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void);
+  CORBA::Boolean no_delay ();
 
   void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
   void enable_network_priority (CORBA::Boolean enable);
 
@@ -456,10 +444,9 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_TCP_Protocol_Properties (void);
+  virtual ~TAO_TCP_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -487,16 +474,15 @@ class TAO_RTCORBA_Export TAO_UnixDomain_Protocol_Properties
     public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor
   TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
                                       CORBA::Long recv_buffer_size);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
@@ -520,13 +506,11 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_UnixDomain_Protocol_Properties (void);
+  virtual ~TAO_UnixDomain_Protocol_Properties ();
 
 private:
-
   // = Attributes.
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -559,37 +543,37 @@ public:
 
   // = IDL interface methods.
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void);
+  CORBA::Boolean keep_alive ();
 
   void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void);
+  CORBA::Boolean dont_route ();
 
   void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void);
+  CORBA::Boolean no_delay ();
 
   void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
-  CORBA::Long preallocate_buffer_size (void);
+  CORBA::Long preallocate_buffer_size ();
 
   void preallocate_buffer_size (CORBA::Long preallocate_buffer_size);
 
-  char *mmap_filename (void);
+  char *mmap_filename ();
 
   void mmap_filename (const char *mmap_filename);
 
-  char *mmap_lockname (void);
+  char *mmap_lockname ();
 
   void mmap_lockname (const char *mmap_lockname);
 
@@ -612,13 +596,11 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_SharedMemory_Protocol_Properties (void);
+  virtual ~TAO_SharedMemory_Protocol_Properties ();
 
 private:
-
   // = Attributes.
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -649,15 +631,15 @@ public:
                                         CORBA::Long recv_buffer_size,
                                         CORBA::Boolean enable_network_priority);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
   void enable_network_priority (CORBA::Boolean enable);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
@@ -668,10 +650,9 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_UserDatagram_Protocol_Properties (void);
+  virtual ~TAO_UserDatagram_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -703,27 +684,27 @@ public:
                                          CORBA::Boolean no_delay,
                                          CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (void);
+  CORBA::Long send_buffer_size ();
 
   void send_buffer_size (CORBA::Long send_buffer_size);
 
-  CORBA::Long recv_buffer_size (void);
+  CORBA::Long recv_buffer_size ();
 
   void recv_buffer_size (CORBA::Long recv_buffer_size);
 
-  CORBA::Boolean keep_alive (void);
+  CORBA::Boolean keep_alive ();
 
   void keep_alive (CORBA::Boolean keep_alive);
 
-  CORBA::Boolean dont_route (void);
+  CORBA::Boolean dont_route ();
 
   void dont_route (CORBA::Boolean dont_route);
 
-  CORBA::Boolean no_delay (void);
+  CORBA::Boolean no_delay ();
 
   void no_delay (CORBA::Boolean no_delay);
 
-  CORBA::Boolean enable_network_priority (void);
+  CORBA::Boolean enable_network_priority ();
 
   void enable_network_priority (CORBA::Boolean enable);
 
@@ -734,10 +715,9 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_StreamControl_Protocol_Properties (void);
+  virtual ~TAO_StreamControl_Protocol_Properties ();
 
 private:
   // = Attributes.
@@ -757,19 +737,17 @@ class TAO_RTCORBA_Export TAO_GIOP_Protocol_Properties
     public ::CORBA::LocalObject
 {
 public:
-
   // = CDR encoding methods
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
   virtual ~TAO_GIOP_Protocol_Properties ();
 
   friend class TAO_Protocol_Properties_Factory;
-  TAO_GIOP_Protocol_Properties (void);
+  TAO_GIOP_Protocol_Properties ();
 };
 
 //*************************************************************************
@@ -777,7 +755,6 @@ protected:
 class TAO_RTCORBA_Export TAO_Protocol_Properties_Factory
 {
 public:
-
   /**
    * Creates the proper transport ProtocolProperties subclass that matches
    * the IOP::ProfileId.
@@ -799,8 +776,7 @@ public:
   static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id);
 
 private:
-
-  TAO_Protocol_Properties_Factory (void);
+  TAO_Protocol_Properties_Factory ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
index 3ce86837710..bbb61423afd 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
@@ -34,7 +34,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -52,16 +51,9 @@ namespace RTCORBA
 }
 
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:51
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
 
 namespace TAO
 {
@@ -91,68 +83,9 @@ namespace TAO
     return false;
   }
 }
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-
-#if defined (ACE_ANY_OPS_USE_NAMESPACE)
-
-namespace RTCORBA
-{
-
-
-  /// Copying insertion.
-  void
-  operator<<= (
-      ::CORBA::Any &_tao_any,
-      ProtocolProperties_ptr _tao_elem)
-  {
-    ProtocolProperties_ptr _tao_objptr =
-      ProtocolProperties::_duplicate (_tao_elem);
-    _tao_any <<= &_tao_objptr;
-  }
-
-  /// Non-copying insertion.
-  void
-  operator<<= (
-      ::CORBA::Any &_tao_any,
-      ProtocolProperties_ptr *_tao_elem)
-  {
-    TAO::Any_Impl_T<ProtocolProperties>::insert (
-        _tao_any,
-        ProtocolProperties::_tao_any_destructor,
-        _tc_ProtocolProperties,
-        *_tao_elem);
-  }
-
-  ::CORBA::Boolean
-  operator>>= (
-      const ::CORBA::Any &_tao_any,
-      ProtocolProperties_ptr &_tao_elem)
-  {
-    return
-      TAO::Any_Impl_T<ProtocolProperties>::extract (
-          _tao_any,
-          ProtocolProperties::_tao_any_destructor,
-          _tc_ProtocolProperties,
-          _tao_elem);
-  }
-}
-
-#else
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 
 
+namespace CORBA {
 /// Copying insertion.
 void
 operator<<= (
@@ -190,16 +123,6 @@ operator>>= (
         _tao_elem);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-
-#endif
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
-
-
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
index b96446ca92a..cbe34fe82c0 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
@@ -39,13 +39,11 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
 namespace RTCORBA
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
 
@@ -61,42 +59,14 @@ namespace RTCORBA
 // be\be_visitor_interface/any_op_ch.cpp:54
 
 
-
-#if defined (ACE_ANY_OPS_USE_NAMESPACE)
-
-namespace RTCORBA
-{
-  TAO_RTCORBA_Export void operator<<= ( ::CORBA::Any &, ProtocolProperties_ptr); // copying
-  TAO_RTCORBA_Export void operator<<= ( ::CORBA::Any &, ProtocolProperties_ptr *); // non-copying
-  TAO_RTCORBA_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ProtocolProperties_ptr &);
-}
-
-#else
-
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+namespace CORBA {
 TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, RTCORBA::ProtocolProperties_ptr &);
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-
-#endif
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
index c7ae47b6ab6..12b4c68489d 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
@@ -33,7 +33,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:72
 
@@ -56,7 +55,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
@@ -77,7 +75,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release (
 }
 
 RTCORBA::ProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil ()
 {
   return RTCORBA::ProtocolProperties::_nil ();
 }
@@ -90,10 +88,10 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-RTCORBA::ProtocolProperties::ProtocolProperties (void)
+RTCORBA::ProtocolProperties::ProtocolProperties ()
 {}
 
-RTCORBA::ProtocolProperties::~ProtocolProperties (void)
+RTCORBA::ProtocolProperties::~ProtocolProperties ()
 {}
 
 void
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
index f32303eb9ba..0689ee90320 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
@@ -53,7 +53,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace RTCORBA
 {
-
   // TAO_IDL - Generated from
   // be\be_interface.cpp:638
 
@@ -118,9 +117,9 @@ namespace RTCORBA
 
   protected:
     // Abstract or local interface only.
-    ProtocolProperties (void);
+    ProtocolProperties ();
 
-    virtual ~ProtocolProperties (void);
+    virtual ~ProtocolProperties ();
 
   private:
     // Private and unimplemented for concrete interfaces.
@@ -148,7 +147,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Traits specializations.
 namespace TAO
 {
-
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_)
 #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_
 
@@ -161,7 +159,7 @@ namespace TAO
     static void release (
         ::RTCORBA::ProtocolProperties_ptr
       );
-    static ::RTCORBA::ProtocolProperties_ptr nil (void);
+    static ::RTCORBA::ProtocolProperties_ptr nil ();
     static ::CORBA::Boolean marshal (
         const ::RTCORBA::ProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
@@ -177,7 +175,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 
-
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1209
 
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 9902218d076..84a8a961326 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -26,14 +26,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
+TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks ()
   : orb_core_ (0)
   , current_ ()
 {
 }
 
 
-TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
+TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks ()
 {
 }
 
@@ -63,7 +63,6 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core)
       TAO_OBJID_RTCURRENT);
 
   this->current_ = RTCORBA::Current::_narrow (object.in ());
-
 }
 
 RTCORBA::ProtocolProperties_ptr
@@ -410,7 +409,7 @@ TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag
 }
 
 CORBA::Long
-TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
+TAO_RT_Protocols_Hooks::get_dscp_codepoint ()
 {
   if (TAO_debug_level)
     TAOLIB_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index 6ed16be8b33..6bd681e035f 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -34,12 +34,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks
 {
 public:
-
   /// Constructor
-  TAO_RT_Protocols_Hooks (void);
+  TAO_RT_Protocols_Hooks ();
 
   /// Destructor
-  virtual ~TAO_RT_Protocols_Hooks (void);
+  virtual ~TAO_RT_Protocols_Hooks ();
 
   /// Initialize the protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core);
@@ -70,7 +69,7 @@ public:
 
   void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties);
 
-  CORBA::Long get_dscp_codepoint (void);
+  CORBA::Long get_dscp_codepoint ();
 
   void get_selector_hook (CORBA::Policy *model_policy,
                           CORBA::Boolean
@@ -137,7 +136,6 @@ protected:
                                        RTCORBA::ProtocolProperties_ptr protocol_properties);
 
 protected:
-
   TAO_ORB_Core *orb_core_;
 
   // Save a reference to the priority mapping manager.
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index e21df158c99..3c31180572c 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -23,7 +23,7 @@ TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
 {
 }
 
-TAO_RT_Stub::~TAO_RT_Stub (void)
+TAO_RT_Stub::~TAO_RT_Stub ()
 {
   if (this->priority_model_policy_.in ())
     this->priority_model_policy_->destroy ();
@@ -36,7 +36,7 @@ TAO_RT_Stub::~TAO_RT_Stub (void)
 }
 
 void
-TAO_RT_Stub::parse_policies (void)
+TAO_RT_Stub::parse_policies ()
 {
   CORBA::PolicyList_var policy_list
     = this->base_profiles_.policy_list ();
@@ -70,7 +70,7 @@ TAO_RT_Stub::parse_policies (void)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_model (void)
+TAO_RT_Stub::exposed_priority_model ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -87,7 +87,7 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_banded_connection (void)
+TAO_RT_Stub::exposed_priority_banded_connection ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -104,7 +104,7 @@ TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_client_protocol (void)
+TAO_RT_Stub::exposed_client_protocol ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -197,7 +197,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::effective_priority_banded_connection (void)
+TAO_RT_Stub::effective_priority_banded_connection ()
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -245,7 +245,7 @@ TAO_RT_Stub::effective_priority_banded_connection (void)
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::effective_client_protocol (void)
+TAO_RT_Stub::effective_client_protocol ()
 {
   // Get effective override.
   CORBA::Policy_var override =
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index fe819b14900..e0b4ee00140 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -45,12 +45,11 @@ class TAO_PrivateConnectionPolicy;
 class TAO_RTCORBA_Export TAO_RT_Stub : public TAO_Stub
 {
 public:
-
   TAO_RT_Stub (const char *repository_id,
                const TAO_MProfile &profiles,
                TAO_ORB_Core *orb_core);
 
-  virtual ~TAO_RT_Stub (void);
+  virtual ~TAO_RT_Stub ();
 
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -70,9 +69,8 @@ public:
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 private:
-
   /// Helper method used to parse the policies.
-  void parse_policies (void);
+  void parse_policies ();
 
   void exposed_priority_model (CORBA::Policy_ptr policy);
 
@@ -83,17 +81,17 @@ private:
   /// Returns the CORBA::Policy (which will be narrowed to be
   /// used as RTCORBA::PriorityModelPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (void);
+  CORBA::Policy_ptr exposed_priority_model ();
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::PriorityBandedConnectionPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (void);
+  CORBA::Policy_ptr exposed_priority_banded_connection ();
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::ClientProtocolPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (void);
+  CORBA::Policy_ptr exposed_client_protocol ();
 
   // = Methods for obtaining effective policies.
   //
@@ -102,8 +100,8 @@ private:
   //   override for a given policy type, and then reconciling it with
   //   the policy value exported in the Object's IOR.
 
-  CORBA::Policy_ptr effective_priority_banded_connection (void);
-  CORBA::Policy_ptr effective_client_protocol (void);
+  CORBA::Policy_ptr effective_priority_banded_connection ();
+  CORBA::Policy_ptr effective_client_protocol ();
 
   // The following attribute are used to cache
   // the different kind of policies and avoid to
@@ -122,7 +120,6 @@ private:
   // = Disallow copying and assignment.
   TAO_RT_Stub (const TAO_RT_Stub &);
   TAO_RT_Stub &operator = (const TAO_RT_Stub &);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 7e3dc469d04..e1923977161 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
+TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory ()
 {
 }
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index a997c5819fc..9cf21b25ecf 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -46,7 +46,7 @@ class TAO_RTCORBA_Export TAO_RT_Stub_Factory : public TAO_Stub_Factory
 {
 public:
   // -- Ctor/Dtor --
-  virtual ~TAO_RT_Stub_Factory (void);
+  virtual ~TAO_RT_Stub_Factory ();
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index fa7a572ad1f..b07e1582c41 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -24,10 +24,9 @@ TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_
   // Create the thread-pool manager.
   ACE_NEW (this->tp_manager_,
            TAO_Thread_Pool_Manager (orb_core));
-
 }
 
-TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (void)
+TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager ()
 {
   // Delete the default resources.
   delete this->default_lane_resources_;
@@ -37,7 +36,7 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi
 }
 
 int
-TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void)
+TAO_RT_Thread_Lane_Resources_Manager::open_default_resources ()
 {
   TAO_ORB_Parameters *params =
     this->orb_core_->orb_params ();
@@ -56,7 +55,7 @@ TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void)
 }
 
 void
-TAO_RT_Thread_Lane_Resources_Manager::finalize (void)
+TAO_RT_Thread_Lane_Resources_Manager::finalize ()
 {
   // Finalize resources managed by the thread-pool manager.
   this->tp_manager_->finalize ();
@@ -66,7 +65,7 @@ TAO_RT_Thread_Lane_Resources_Manager::finalize (void)
 }
 
 void
-TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->shutdown_reactor ();
@@ -76,7 +75,7 @@ TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
 }
 
 void
-TAO_RT_Thread_Lane_Resources_Manager::close_all_transports (void)
+TAO_RT_Thread_Lane_Resources_Manager::close_all_transports ()
 {
   // Shutdown default reactors.
   this->default_lane_resources_->close_all_transports ();
@@ -95,7 +94,7 @@ TAO_RT_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofil
 }
 
 TAO_Thread_Lane_Resources &
-TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
+TAO_RT_Thread_Lane_Resources_Manager::lane_resources ()
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources &tss =
@@ -114,13 +113,13 @@ TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
 }
 
 TAO_Thread_Lane_Resources &
-TAO_RT_Thread_Lane_Resources_Manager::default_lane_resources (void)
+TAO_RT_Thread_Lane_Resources_Manager::default_lane_resources ()
 {
   return *this->default_lane_resources_;
 }
 
 TAO_Thread_Pool_Manager &
-TAO_RT_Thread_Lane_Resources_Manager::tp_manager (void)
+TAO_RT_Thread_Lane_Resources_Manager::tp_manager ()
 {
   return *this->tp_manager_;
 }
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index c5e88fbbcf1..5e7a0efae60 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -40,37 +40,35 @@ class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager :
   public TAO_Thread_Lane_Resources_Manager
 {
 public:
-
   /// Constructor.
   TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_RT_Thread_Lane_Resources_Manager (void);
+  ~TAO_RT_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Open default resources.
-  int open_default_resources (void);
+  int open_default_resources ();
 
   /// Shutdown reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Certain ORB policies such as dropping replies on shutdown
   /// would need cleanup of transports to wake threads up.
-  void close_all_transports (void);
+  void close_all_transports ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
   // @{
+  TAO_Thread_Lane_Resources &lane_resources ();
 
-  TAO_Thread_Lane_Resources &lane_resources (void);
-
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
+  TAO_Thread_Lane_Resources &default_lane_resources ();
 
-  TAO_Thread_Pool_Manager &tp_manager (void);
+  TAO_Thread_Pool_Manager &tp_manager ();
 
   // @}
 
@@ -79,7 +77,6 @@ private:
   TAO_RT_Thread_Lane_Resources_Manager (const TAO_RT_Thread_Lane_Resources_Manager &);
 
 protected:
-
   /// Default lane resources.
   TAO_Thread_Lane_Resources *default_lane_resources_;
 
@@ -99,14 +96,11 @@ class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager_Factory
   : public TAO_Thread_Lane_Resources_Manager_Factory
 {
 public:
-
   /// Factory method.
   TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
-
 };
 
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
index ce87cde295e..78c96423d38 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -30,7 +30,7 @@ TAO_RT_Transport_Descriptor::~TAO_RT_Transport_Descriptor ()
 }
 
 TAO_Transport_Descriptor_Interface *
-TAO_RT_Transport_Descriptor::duplicate (void)
+TAO_RT_Transport_Descriptor::duplicate ()
 {
   // Get a copy of the underlying endpoint
   TAO_Endpoint *endpoint =
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
index 58144c5adc7..ceab8cd7c8a 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
@@ -49,7 +49,7 @@ public:
 
   /// This call allocates and copies the contents of this class and
   /// returns the pointer
-  virtual TAO_Transport_Descriptor_Interface *duplicate (void);
+  virtual TAO_Transport_Descriptor_Interface *duplicate ();
 
   /// Try to determine if this object is same as the <other_prop>.
   virtual CORBA::Boolean is_equivalent (
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
index 0b7150a9c5b..69f8321f9eb 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -8,18 +8,18 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void)
+TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property ()
 {
 }
 
 /*************************************************************************************************/
 
-TAO_RT_Transport_Descriptor_Private_Connection_Property::~TAO_RT_Transport_Descriptor_Private_Connection_Property (void)
+TAO_RT_Transport_Descriptor_Private_Connection_Property::~TAO_RT_Transport_Descriptor_Private_Connection_Property ()
 {
 }
 
 TAO_RT_Transport_Descriptor_Property*
-TAO_RT_Transport_Descriptor_Private_Connection_Property::duplicate (void)
+TAO_RT_Transport_Descriptor_Private_Connection_Property::duplicate ()
 {
   // Construct a copy of our class
   TAO_RT_Transport_Descriptor_Private_Connection_Property *desc_prop = 0;
@@ -47,7 +47,7 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::~TAO_RT_Transport_Descri
 }
 
 TAO_RT_Transport_Descriptor_Property*
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::duplicate (void)
+TAO_RT_Transport_Descriptor_Banded_Connection_Property::duplicate ()
 {
   // Construct a copy of our class
   TAO_RT_Transport_Descriptor_Banded_Connection_Property *desc_prop = 0;
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
index a43e0d6398e..57fabb889fe 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
@@ -34,12 +34,12 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Property
 
 public:
   /// Constructor
-  TAO_RT_Transport_Descriptor_Property (void);
+  TAO_RT_Transport_Descriptor_Property ();
 
   /// Destructor
-  virtual ~TAO_RT_Transport_Descriptor_Property (void);
+  virtual ~TAO_RT_Transport_Descriptor_Property ();
 
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void) = 0;
+  virtual TAO_RT_Transport_Descriptor_Property *duplicate () = 0;
 
   virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) = 0;
 
@@ -67,16 +67,16 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Private_Connection_Property
 {
 public:
   /// Constructor
-  TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
+  TAO_RT_Transport_Descriptor_Private_Connection_Property ();
   TAO_RT_Transport_Descriptor_Private_Connection_Property (long object_id);
 
   /// Destructor
-  ~TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
+  ~TAO_RT_Transport_Descriptor_Private_Connection_Property ();
 
   /// Init
   void init (long object_id);
 
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void);
+  virtual TAO_RT_Transport_Descriptor_Property *duplicate ();
 
   virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop);
 
@@ -87,7 +87,6 @@ private:
    * @c object_id_ is the @c TAO_Stub* of the object.
    */
   long object_id_;
-
 };
 
 /*****************************************************************************/
@@ -104,17 +103,17 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Banded_Connection_Property
 {
 public:
   /// Constructor
-  TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
+  TAO_RT_Transport_Descriptor_Banded_Connection_Property ();
   TAO_RT_Transport_Descriptor_Banded_Connection_Property (CORBA::Short low_priority,
                                                           CORBA::Short high_priority);
 
   /// Destructor
-  ~TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
+  ~TAO_RT_Transport_Descriptor_Banded_Connection_Property ();
 
   /// Init
   void init (CORBA::Short low_priority, CORBA::Short high_priority);
 
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void);
+  virtual TAO_RT_Transport_Descriptor_Property *duplicate ();
 
   virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop);
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
index e2bc9763f4e..f1c575573cf 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
@@ -2,14 +2,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void)
+TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property ()
   : next_ (0)
 {
 }
 
 /*************************************************************************************************/
 ACE_INLINE
-TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property (void)
+TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property ()
   : object_id_ (-1)
 {
 }
@@ -29,7 +29,7 @@ TAO_RT_Transport_Descriptor_Private_Connection_Property::init (long object_id)
 /*************************************************************************************************/
 
 ACE_INLINE
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property (void)
+TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property ()
   : low_priority_ (-1)
   , high_priority_ (-1)
 {
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 241f24e2501..a5255401320 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -27,7 +27,7 @@ TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (
 }
 
 bool
-TAO_RT_New_Leader_Generator::no_leaders_available (void)
+TAO_RT_New_Leader_Generator::no_leaders_available ()
 {
   // Request a new dynamic thread from the Thread Lane
   return this->lane_.new_dynamic_thread ();
@@ -40,7 +40,7 @@ TAO_Thread_Pool_Threads::TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane)
 }
 
 int
-TAO_Thread_Pool_Threads::svc (void)
+TAO_Thread_Pool_Threads::svc ()
 {
   TAO_ORB_Core &orb_core =
     this->lane ().pool ().manager ().orb_core ();
@@ -176,7 +176,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
 }
 
 bool
-TAO_Thread_Lane::new_dynamic_thread (void)
+TAO_Thread_Lane::new_dynamic_thread ()
 {
   // Note that we are checking this condition below without the lock
   // held.
@@ -223,7 +223,7 @@ TAO_Thread_Lane::new_dynamic_thread (void)
 }
 
 void
-TAO_Thread_Lane::shutting_down (void)
+TAO_Thread_Lane::shutting_down ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
@@ -235,7 +235,7 @@ TAO_Thread_Lane::shutting_down (void)
 }
 
 void
-TAO_Thread_Lane::validate_and_map_priority (void)
+TAO_Thread_Lane::validate_and_map_priority ()
 {
   // Make sure that static_threads_number_ is not zero.
   if (this->static_threads_number_ == 0)
@@ -281,7 +281,7 @@ TAO_Thread_Lane::validate_and_map_priority (void)
 }
 
 void
-TAO_Thread_Lane::open (void)
+TAO_Thread_Lane::open ()
 {
   // Validate and map priority.
   this->validate_and_map_priority ();
@@ -353,25 +353,25 @@ TAO_Thread_Lane::open (void)
                  CORBA::COMPLETED_NO);
 }
 
-TAO_Thread_Lane::~TAO_Thread_Lane (void)
+TAO_Thread_Lane::~TAO_Thread_Lane ()
 {
 }
 
 void
-TAO_Thread_Lane::finalize (void)
+TAO_Thread_Lane::finalize ()
 {
   // Finalize resources.
   this->resources_.finalize ();
 }
 
 void
-TAO_Thread_Lane::shutdown_reactor (void)
+TAO_Thread_Lane::shutdown_reactor ()
 {
   this->resources_.shutdown_reactor ();
 }
 
 void
-TAO_Thread_Lane::wait (void)
+TAO_Thread_Lane::wait ()
 {
   this->static_threads_.wait ();
   this->dynamic_threads_.wait ();
@@ -397,7 +397,7 @@ TAO_Thread_Lane::current_threads () const
 
 
 int
-TAO_Thread_Lane::create_static_threads (void)
+TAO_Thread_Lane::create_static_threads ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
@@ -564,7 +564,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
 }
 
 void
-TAO_Thread_Pool::open (void)
+TAO_Thread_Pool::open ()
 {
   // Open all the lanes.
   for (CORBA::ULong i = 0;
@@ -575,7 +575,7 @@ TAO_Thread_Pool::open (void)
     }
 }
 
-TAO_Thread_Pool::~TAO_Thread_Pool (void)
+TAO_Thread_Pool::~TAO_Thread_Pool ()
 {
   // Delete all the lanes.
   for (CORBA::ULong i = 0;
@@ -587,7 +587,7 @@ TAO_Thread_Pool::~TAO_Thread_Pool (void)
 }
 
 void
-TAO_Thread_Pool::finalize (void)
+TAO_Thread_Pool::finalize ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -597,7 +597,7 @@ TAO_Thread_Pool::finalize (void)
 }
 
 void
-TAO_Thread_Pool::shutdown_reactor (void)
+TAO_Thread_Pool::shutdown_reactor ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -607,7 +607,7 @@ TAO_Thread_Pool::shutdown_reactor (void)
 }
 
 void
-TAO_Thread_Pool::shutting_down (void)
+TAO_Thread_Pool::shutting_down ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -618,7 +618,7 @@ TAO_Thread_Pool::shutting_down (void)
 
 
 void
-TAO_Thread_Pool::wait (void)
+TAO_Thread_Pool::wait ()
 {
   // Finalize all the lanes.
   for (CORBA::ULong i = 0;
@@ -646,7 +646,7 @@ TAO_Thread_Pool::is_collocated (const TAO_MProfile &mprofile)
 }
 
 int
-TAO_Thread_Pool::create_static_threads (void)
+TAO_Thread_Pool::create_static_threads ()
 {
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
@@ -683,7 +683,7 @@ TAO_Thread_Pool_Manager::TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager (void)
+TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager ()
 {
   // Delete all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -693,7 +693,7 @@ TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager (void)
 }
 
 void
-TAO_Thread_Pool_Manager::finalize (void)
+TAO_Thread_Pool_Manager::finalize ()
 {
   // Finalize all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -703,7 +703,7 @@ TAO_Thread_Pool_Manager::finalize (void)
 }
 
 void
-TAO_Thread_Pool_Manager::shutdown_reactor (void)
+TAO_Thread_Pool_Manager::shutdown_reactor ()
 {
   // Finalize all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -713,7 +713,7 @@ TAO_Thread_Pool_Manager::shutdown_reactor (void)
 }
 
 void
-TAO_Thread_Pool_Manager::wait (void)
+TAO_Thread_Pool_Manager::wait ()
 {
   // Finalize all the pools.
   for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
@@ -819,7 +819,6 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool)
 
   // Delete the thread pool.
   delete tao_thread_pool;
-
 }
 
 RTCORBA::ThreadpoolId
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 1ce347b00e6..0827cc25574 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -45,16 +45,14 @@ class TAO_RTCORBA_Export TAO_RT_New_Leader_Generator
   : public TAO_New_Leader_Generator
 {
 public:
-
   /// Constructor.
   TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane);
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
-  bool no_leaders_available (void);
+  bool no_leaders_available ();
 
 private:
-
   /// Lane associated with this leader generator.
   TAO_Thread_Lane &lane_;
 };
@@ -70,12 +68,11 @@ private:
 class TAO_Thread_Pool_Threads : public ACE_Task_Base
 {
 public:
-
   /// Constructor.
   TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane);
 
   /// Method executed when a thread is spawned.
-  int svc (void);
+  int svc ();
 
   /// Accessor to the lane to which this thread belongs to.
   TAO_Thread_Lane &lane () const;
@@ -134,31 +131,31 @@ public:
                    ACE_Time_Value const &dynamic_thread_time);
 
   /// Destructor.
-  ~TAO_Thread_Lane (void);
+  ~TAO_Thread_Lane ();
 
   /// Open the lane.
-  void open (void);
+  void open ();
 
   /// Finalize the resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
-  int create_static_threads (void);
+  int create_static_threads ();
 
   /// Mark that this lane is shutting down, we then don't create any
   /// dynamic threads anymore. When the pool is shutting down the leader
   /// follower loop is called which can cause a request to create a
   /// new dynamic thread but we shouldn't create a new one.
-  void shutting_down (void);
+  void shutting_down ();
 
   /// Called by the TAO_RT_New_Leader_Generator to request a new dynamic
   /// thread.
@@ -169,7 +166,7 @@ public:
    * @retval true A new thread is created
    * @retval false No thread could be created
    */
-  bool new_dynamic_thread (void);
+  bool new_dynamic_thread ();
 
   /// @name Accessors
   // @{
@@ -184,7 +181,7 @@ public:
 
   CORBA::Short native_priority () const;
 
-  TAO_Thread_Lane_Resources &resources (void);
+  TAO_Thread_Lane_Resources &resources ();
 
   TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan () const;
 
@@ -192,9 +189,8 @@ public:
   // @}
 
 private:
-
   /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (void);
+  void validate_and_map_priority ();
 
   int create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
                         CORBA::ULong number_of_threads,
@@ -256,7 +252,6 @@ class TAO_Thread_Pool_Manager;
 class TAO_RTCORBA_Export TAO_Thread_Pool
 {
 public:
-
   /// Constructor (for pools without lanes).
   TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                    CORBA::ULong id,
@@ -283,35 +278,34 @@ public:
                    ACE_Time_Value const &dynamic_thread_time);
 
   /// Destructor.
-  ~TAO_Thread_Pool (void);
+  ~TAO_Thread_Pool ();
 
   /// Open the pool.
-  void open (void);
+  void open ();
 
   /// Finalize the resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Mark this thread pool that we are shutting down.
-  void shutting_down (void);
+  void shutting_down ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
-  int create_static_threads (void);
+  int create_static_threads ();
 
   /// Check if this thread pool has (explicit) lanes.
   bool with_lanes () const;
 
   /// @name Accessors
   // @{
-
   TAO_Thread_Pool_Manager &manager () const;
   CORBA::ULong id () const;
 
@@ -321,12 +315,11 @@ public:
   CORBA::ULong max_buffered_requests () const;
   CORBA::ULong max_request_buffer_size () const;
 
-  TAO_Thread_Lane **lanes (void);
+  TAO_Thread_Lane **lanes ();
   CORBA::ULong number_of_lanes () const;
   // @}
 
 private:
-
   TAO_Thread_Pool_Manager &manager_;
   CORBA::ULong id_;
 
@@ -355,21 +348,20 @@ class TAO_ORB_Core;
 class TAO_RTCORBA_Export TAO_Thread_Pool_Manager
 {
 public:
-
   /// Constructor.
   TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_Thread_Pool_Manager (void);
+  ~TAO_Thread_Pool_Manager ();
 
   /// Finalize the resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the reactor.
-  void shutdown_reactor (void);
+  void shutdown_reactor ();
 
   /// Wait for threads to exit.
-  void wait (void);
+  void wait ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
@@ -411,10 +403,8 @@ public:
   // @}
 
 private:
-
   /// @name Helpers
   // @{
-
   RTCORBA::ThreadpoolId
   create_threadpool_i (CORBA::ULong stacksize,
                        CORBA::ULong static_threads,
@@ -441,7 +431,6 @@ private:
   // @}
 
 private:
-
   TAO_ORB_Core &orb_core_;
 
   THREAD_POOLS thread_pools_;
diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl
index a08e0dffc39..8b37bbb0a0b 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.inl
+++ b/TAO/tao/RTCORBA/Thread_Pool.inl
@@ -52,7 +52,7 @@ TAO_Thread_Lane::dynamic_threads () const
 
 ACE_INLINE
 TAO_Thread_Lane_Resources &
-TAO_Thread_Lane::resources (void)
+TAO_Thread_Lane::resources ()
 {
   return this->resources_;
 }
@@ -129,7 +129,7 @@ TAO_Thread_Pool::max_request_buffer_size () const
 
 ACE_INLINE
 TAO_Thread_Lane **
-TAO_Thread_Pool::lanes (void)
+TAO_Thread_Pool::lanes ()
 {
   return this->lanes_;
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
index 039dbad8c6e..00e0c54c25f 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
+TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory);
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h
index 3a9cc80a20f..3a2c7bbd7cb 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer.h
@@ -30,7 +30,7 @@ class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
 {
 public:
   /// Constructor.
-  TAO_RTPortableServer_Initializer (void);
+  TAO_RTPortableServer_Initializer ();
 };
 
 static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
index 5acaf9a65c0..2709e4d3ec6 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
@@ -31,7 +31,6 @@ class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory
   : public TAO_Adapter_Factory
 {
 public:
-
   /// Create adapter.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 7bb648c4e7f..0ead61fa6d7 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -52,7 +52,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
   this->parse_rt_policies (this->policies ());
 }
 
-TAO_RT_POA::~TAO_RT_POA (void)
+TAO_RT_POA::~TAO_RT_POA ()
 {
 }
 
@@ -181,7 +181,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority)
 }
 
 void
-TAO_RT_POA::validate_policies (void)
+TAO_RT_POA::validate_policies ()
 {
   // For each of the above operations, if the POA supports the
   // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then
@@ -389,7 +389,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
 }
 
 size_t
-TAO_RT_POA::endpoint_count (void)
+TAO_RT_POA::endpoint_count ()
 {
   size_t profile_count = 0;
 
@@ -563,25 +563,25 @@ TAO_RT_POA::create_request_processing_policy (
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
 char *
-TAO_RT_POA::the_name (void)
+TAO_RT_POA::the_name ()
 {
   return this->TAO_Regular_POA::the_name ();
 }
 
 PortableServer::POA_ptr
-TAO_RT_POA::the_parent (void)
+TAO_RT_POA::the_parent ()
 {
   return this->TAO_Regular_POA::the_parent ();
 }
 
 PortableServer::POAList *
-TAO_RT_POA::the_children (void)
+TAO_RT_POA::the_children ()
 {
   return this->TAO_Regular_POA::the_children ();
 }
 
 PortableServer::POAManager_ptr
-TAO_RT_POA::the_POAManager (void)
+TAO_RT_POA::the_POAManager ()
 {
   return this->TAO_Regular_POA::the_POAManager ();
 }
@@ -590,9 +590,9 @@ TAO_RT_POA::the_POAManager (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::AdapterActivator_ptr
-TAO_RT_POA::the_activator (void)
+TAO_RT_POA::the_activator ()
 {
-  return this->TAO_Regular_POA::the_activator ();;
+  return this->TAO_Regular_POA::the_activator ();
 }
 
 void
@@ -602,7 +602,7 @@ TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activato
 }
 
 PortableServer::ServantManager_ptr
-TAO_RT_POA::get_servant_manager (void)
+TAO_RT_POA::get_servant_manager ()
 {
   return this->TAO_Regular_POA::get_servant_manager ();
 }
@@ -614,7 +614,7 @@ TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 }
 
 PortableServer::Servant
-TAO_RT_POA::get_servant (void)
+TAO_RT_POA::get_servant ()
 {
   return this->TAO_Regular_POA::get_servant ();
 }
@@ -700,7 +700,7 @@ TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid)
 }
 
 CORBA::OctetSeq *
-TAO_RT_POA::id (void)
+TAO_RT_POA::id ()
 {
   return this->TAO_Regular_POA::id ();
 }
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 97662624749..4c510007cb3 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -48,7 +48,6 @@ class TAO_RTPortableServer_Export TAO_RT_POA
   , public virtual TAO_Regular_POA
 {
 public:
-
   // RTCORBA specific methods
   CORBA::Object_ptr create_reference_with_priority (const char * intf,
                                                     RTCORBA::Priority priority);
@@ -117,25 +116,25 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (void);
+  char * the_name ();
 
-  PortableServer::POA_ptr the_parent (void);
+  PortableServer::POA_ptr the_parent ();
 
-  PortableServer::POAList *the_children (void);
+  PortableServer::POAList *the_children ();
 
-  PortableServer::POAManager_ptr the_POAManager (void);
+  PortableServer::POAManager_ptr the_POAManager ();
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-  PortableServer::AdapterActivator_ptr the_activator (void);
+  PortableServer::AdapterActivator_ptr the_activator ();
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator);
 
-  PortableServer::ServantManager_ptr get_servant_manager (void);
+  PortableServer::ServantManager_ptr get_servant_manager ();
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
-  PortableServer::Servant get_servant (void);
+  PortableServer::Servant get_servant ();
 
   void set_servant (PortableServer::Servant servant);
 
@@ -169,7 +168,7 @@ public:
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
 
-  CORBA::OctetSeq *id (void);
+  CORBA::OctetSeq *id ();
 
   // End standard POA interface methods.
 
@@ -184,12 +183,11 @@ public:
               TAO_ORB_Core &orb_core,
               TAO_Object_Adapter *object_adapter);
 
-  virtual ~TAO_RT_POA (void);
+  virtual ~TAO_RT_POA ();
 
   void *thread_pool () const;
 
 protected:
-
   /// Template method for creating new POA's of this type.
   virtual TAO_Root_POA *new_POA (const String &name,
                                  PortableServer::POAManager_ptr poa_manager,
@@ -206,13 +204,13 @@ protected:
 
   void validate_priority (RTCORBA::Priority priority);
 
-  void validate_policies (void);
+  void validate_policies ();
 
   /// Parse the policy list for RT policies and update our
   /// cached policy instance.
   void parse_rt_policies (TAO_POA_Policy_Set &policies);
 
-  size_t endpoint_count (void);
+  size_t endpoint_count ();
 
   TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index 60d6da68d9b..40e48515c15 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -21,12 +21,6 @@ TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core
   : TAO_Policy_Validator (orb_core),
     thread_pool_ (0)
 {
-  // No-Op.
-}
-
-TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void)
-{
-  // No-Op.
 }
 
 void
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 73b4f777b71..49e445e4dca 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -42,7 +42,7 @@ public:
   TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_POA_RT_Policy_Validator (void);
+  ~TAO_POA_RT_Policy_Validator () = default;
 
   static RTCORBA::ServerProtocolPolicy_ptr server_protocol_policy_from_thread_pool (TAO_Thread_Pool *thread_pool,
                                                                                     TAO_ORB_Core &orb_core);
@@ -55,7 +55,6 @@ public:
                                                TAO_Policy_Set &policies);
 
 protected:
-
   /**
    * Validate that the policies in the specified set
    * are consistent and legal.  Throw an appropriate exception
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index c2723bf3462..c49c6019527 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -24,7 +24,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
+TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher ()
 {
 }
 
@@ -154,7 +154,6 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
         {
           if (TAO_debug_level > 0)
             {
-
     // If we are in a multi-threaded configuration, print out the current
     // thread priority.
     #if defined (ACE_HAS_THREADS)
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 7d48ae05968..dd7df712e50 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -39,7 +39,7 @@ class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher
   : public TAO_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_RT_Servant_Dispatcher (void);
+  virtual ~TAO_RT_Servant_Dispatcher ();
 
   /// Pre_invoke remote request.
   void pre_invoke_remote_request (TAO_Root_POA &poa,
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 2c23be762b7..a2e4eefed07 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -154,7 +154,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
 }
 
 RTScheduling::Current::IdType *
-TAO_RTScheduler_Current::id (void)
+TAO_RTScheduler_Current::id ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -165,9 +165,8 @@ TAO_RTScheduler_Current::id (void)
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current::scheduling_parameter (void)
+TAO_RTScheduler_Current::scheduling_parameter ()
 {
-
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
@@ -177,7 +176,7 @@ TAO_RTScheduler_Current::scheduling_parameter (void)
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current::implicit_scheduling_parameter (void)
+TAO_RTScheduler_Current::implicit_scheduling_parameter ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -188,7 +187,7 @@ TAO_RTScheduler_Current::implicit_scheduling_parameter (void)
 }
 
 RTScheduling::Current::NameList *
-TAO_RTScheduler_Current::current_scheduling_segment_names (void)
+TAO_RTScheduler_Current::current_scheduling_segment_names ()
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -199,7 +198,7 @@ TAO_RTScheduler_Current::current_scheduling_segment_names (void)
 }
 
 RTCORBA::Priority
-TAO_RTScheduler_Current::the_priority (void)
+TAO_RTScheduler_Current::the_priority ()
 {
   return this->rt_current_->the_priority ();
 }
@@ -224,7 +223,7 @@ TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current)
 }
 
 TAO_RTScheduler_Current_i*
-TAO_RTScheduler_Current::implementation (void)
+TAO_RTScheduler_Current::implementation ()
 {
   TAO_TSS_Resources *tss =
     TAO_TSS_Resources::instance ();
@@ -341,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
     {
@@ -427,7 +425,6 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
 
       // A Nested segment.
     } else {
-
       // Inform scheduler of end of nested
       // scheduling segment.
       this->scheduler_->end_nested_scheduling_segment (this->guid_,
@@ -575,7 +572,6 @@ DTTask::svc ()
 {
   try
     {
-
       TAO_TSS_Resources *tss =
         TAO_TSS_Resources::instance ();
 
@@ -602,7 +598,6 @@ DTTask::svc ()
 RTScheduling::Current::IdType *
 TAO_RTScheduler_Current_i::id ()
 {
-
   RTScheduling::Current::IdType_var guid = this->guid_;
   return guid._retn ();
 }
@@ -621,7 +616,7 @@ TAO_RTScheduler_Current_i::implicit_scheduling_parameter ()
 }
 
 RTScheduling::Current::NameList *
-TAO_RTScheduler_Current_i::current_scheduling_segment_names (void)
+TAO_RTScheduler_Current_i::current_scheduling_segment_names ()
 {
   RTScheduling::Current::NameList* name_list;
   ACE_NEW_RETURN (name_list,
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 1361e14572a..9869380f4bc 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -256,7 +256,7 @@ public:
 
   void delete_all_currents ();
 
-  const char* name (void);
+  const char* name ();
   void name (const char *);
 
   TAO_ORB_Core* orb ();
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index a431e8c4be4..81e1b7ae75a 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -114,7 +114,6 @@ TAO_RTScheduler_ORB_Initializer::pre_init (
 void
 TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   // @@ This is busted.  TAO_ORBInitInfo should do proper reference
   //    counting.
   // Narrow to a TAO_ORBInitInfo object to get access to the
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index 2b38b663a46..32e15c52686 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -7,12 +7,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
+TAO_RTScheduler_Loader::TAO_RTScheduler_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
+TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader ()
 {
 }
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index 61bf6f7a8b1..9810a123198 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -72,10 +72,10 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager_var
   : private TAO_Base_var
 {
 public:
-  TAO_RTScheduler_Manager_var (void); // default constructor
+  TAO_RTScheduler_Manager_var (); // default constructor
   TAO_RTScheduler_Manager_var (TAO_RTScheduler_Manager_ptr);
   TAO_RTScheduler_Manager_var (const TAO_RTScheduler_Manager_var &); // copy constructor
-  ~TAO_RTScheduler_Manager_var (void); // destructor
+  ~TAO_RTScheduler_Manager_var (); // destructor
 
   TAO_RTScheduler_Manager_var &operator= (TAO_RTScheduler_Manager_ptr);
   TAO_RTScheduler_Manager_var &operator= (const TAO_RTScheduler_Manager_var &);
@@ -85,16 +85,16 @@ public:
   operator const TAO_RTScheduler_Manager_ptr &() const;
   operator TAO_RTScheduler_Manager_ptr &();
   TAO_RTScheduler_Manager_ptr in () const;
-  TAO_RTScheduler_Manager_ptr &inout (void);
-  TAO_RTScheduler_Manager_ptr &out (void);
-  TAO_RTScheduler_Manager_ptr _retn (void);
+  TAO_RTScheduler_Manager_ptr &inout ();
+  TAO_RTScheduler_Manager_ptr &out ();
+  TAO_RTScheduler_Manager_ptr _retn ();
   TAO_RTScheduler_Manager_ptr ptr () const;
 
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static TAO_RTScheduler_Manager_ptr duplicate (TAO_RTScheduler_Manager_ptr);
   static void release (TAO_RTScheduler_Manager_ptr);
-  static TAO_RTScheduler_Manager_ptr nil (void);
+  static TAO_RTScheduler_Manager_ptr nil ();
   static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
index 7c8698b9c60..cefa3b75997 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
@@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // *************************************************************
 
 ACE_INLINE
-TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (void)
+TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var ()
   : ptr_ (TAO_RTScheduler_Manager::_nil ())
 {}
 
@@ -33,7 +33,7 @@ TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (
 {}
 
 ACE_INLINE
-TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var (void)
+TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var ()
 {
   CORBA::release (this->ptr_);
 }
@@ -83,13 +83,13 @@ TAO_RTScheduler_Manager_var::in () const
 }
 
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr &
-TAO_RTScheduler_Manager_var::inout (void)
+TAO_RTScheduler_Manager_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr &
-TAO_RTScheduler_Manager_var::out (void)
+TAO_RTScheduler_Manager_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_RTScheduler_Manager::_nil ();
@@ -97,7 +97,7 @@ TAO_RTScheduler_Manager_var::out (void)
 }
 
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::_retn (void)
+TAO_RTScheduler_Manager_var::_retn ()
 {
   // yield ownership of managed obj reference
   ::TAO_RTScheduler_Manager_ptr val = this->ptr_;
@@ -118,7 +118,7 @@ TAO_RTScheduler_Manager_var::release (TAO_RTScheduler_Manager_ptr p)
 }
 
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::nil (void)
+TAO_RTScheduler_Manager_var::nil ()
 {
   return ::TAO_RTScheduler_Manager::_nil ();
 }
@@ -192,13 +192,13 @@ TAO_RTScheduler_Manager_out::operator ::TAO_RTScheduler_Manager_ptr &() // cast
 }
 
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr &
-TAO_RTScheduler_Manager_out::ptr (void) // ptr
+TAO_RTScheduler_Manager_out::ptr () // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_out::operator-> (void)
+TAO_RTScheduler_Manager_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -211,7 +211,7 @@ TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (TAO_ORB_Core* orb)
 }
 
 ACE_INLINE RTScheduling::Scheduler_ptr
-TAO_RTScheduler_Manager::rtscheduler (void)
+TAO_RTScheduler_Manager::rtscheduler ()
 {
   return RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in());
 }
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/Range_Checking_T.h b/TAO/tao/Range_Checking_T.h
index 31eead48256..513d80a1d61 100644
--- a/TAO/tao/Range_Checking_T.h
+++ b/TAO/tao/Range_Checking_T.h
@@ -22,7 +22,6 @@ namespace TAO
 {
 namespace details
 {
-
 /**
  * @struct range_checking
  *
@@ -143,7 +142,6 @@ struct range_checking
       throw CORBA::BAD_PARAM ();
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
index ab5ea5c050f..603a2e68f21 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -39,7 +39,7 @@ public:
   TAO_Reactive_Connect_Strategy (TAO_ORB_Core *orb);
 
   /// Destructor
-  ~TAO_Reactive_Connect_Strategy (void);
+  ~TAO_Reactive_Connect_Strategy ();
 
   /*
    * Concrete implementation for this class. Please see
@@ -50,7 +50,6 @@ public:
 
 protected:
   virtual int wait_i (TAO_LF_Event *ch, TAO_Transport *, ACE_Time_Value *val);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl
index aef3dc53236..2b8449f3ec0 100644
--- a/TAO/tao/Refcounted_ObjectKey.inl
+++ b/TAO/tao/Refcounted_ObjectKey.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-TAO::Refcounted_ObjectKey::incr_refcount (void)
+TAO::Refcounted_ObjectKey::incr_refcount ()
 {
   ++this->refcount_;
 }
@@ -14,7 +14,7 @@ TAO::Refcounted_ObjectKey::object_key () const
 }
 
 ACE_INLINE CORBA::ULong
-TAO::Refcounted_ObjectKey::decr_refcount (void)
+TAO::Refcounted_ObjectKey::decr_refcount ()
 {
   if (--this->refcount_ > 0)
     {
diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h
index 708d217e811..8c5861f0dd2 100644
--- a/TAO/tao/Remote_Invocation.h
+++ b/TAO/tao/Remote_Invocation.h
@@ -77,7 +77,6 @@ namespace TAO
     int _tao_byte_order ();
 
   protected:
-
     /// Initialize the @a spec.
     void init_target_spec (TAO_Target_Specification &spec, TAO_OutputCDR& output);
 
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index de3308608ed..31bb1473212 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -62,7 +62,7 @@ namespace TAO
 
 // -----------------------------------------------------
 
-TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker (void);
+TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker ();
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 0b6c39a311d..6b8e940de51 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -54,7 +54,6 @@ class TAO_Pluggable_Reply_Params;
  */
 class TAO_Export TAO_Reply_Dispatcher
 {
-
 public:
   /// Constructor.
   TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0);
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index 7efd9589503..66fd7b984d2 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -46,7 +46,7 @@ class TAO_Export TAO_Request_Dispatcher
 {
 public:
   /// Destructor.
-  virtual ~TAO_Request_Dispatcher (void);
+  virtual ~TAO_Request_Dispatcher ();
 
   /**
    * Dispatch a request.
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index ab672ad3aec..afc7bf8d1eb 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -108,7 +108,6 @@ typedef ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
 class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
 {
 public:
-
   enum Purging_Strategy
   {
     /// Least Recently Used
@@ -262,7 +261,6 @@ protected:
    * without calling unnecessary functions.
    */
   virtual int load_default_protocols ();
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h
index 34ce7fd63d9..a9f863cfc68 100644
--- a/TAO/tao/Resume_Handle.h
+++ b/TAO/tao/Resume_Handle.h
@@ -44,13 +44,12 @@ class TAO_ORB_Core;
  */
 class TAO_Export TAO_Resume_Handle
 {
-
 public:
   /// Constructor.
   TAO_Resume_Handle (TAO_ORB_Core *orb_core = 0,
                      ACE_HANDLE h = ACE_INVALID_HANDLE);
   /// Destructor
-  ~TAO_Resume_Handle (void);
+  ~TAO_Resume_Handle ();
 
   enum TAO_Handle_Resume_Flag
   {
@@ -67,7 +66,7 @@ public:
 
   /// Resume the handle in the reactor only if the ORB uses a TP
   /// reactor. Else we don't resume the handle.
-  void resume_handle (void);
+  void resume_handle ();
 
   /// Hook method called at the end of a connection handler's
   /// handle_input function.  Might override the handle_input
@@ -75,7 +74,6 @@ public:
   void handle_input_return_value_hook (int& return_value);
 
 private:
-
   /// Our ORB Core.
   TAO_ORB_Core *orb_core_;
 
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
index bf3c8e973a2..af1a5ebb158 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -12,7 +12,7 @@ TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core,
 }
 
 ACE_INLINE
-TAO_Resume_Handle::~TAO_Resume_Handle (void)
+TAO_Resume_Handle::~TAO_Resume_Handle ()
 {
   if (this->flag_ == TAO_HANDLE_RESUMABLE)
     this->resume_handle ();
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 88a4491ffa6..e2ada048d39 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -45,7 +45,6 @@ enum TAO_Demux_Strategy
 class TAO_Export TAO_Server_Strategy_Factory : public ACE_Service_Object
 {
 public:
-
   struct Active_Object_Map_Creation_Parameters
   {
     /// Constructor.
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 5eddb99847f..99bf850fa48 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -58,7 +58,6 @@ namespace IOP
 class TAO_Export TAO_Service_Callbacks
 {
 public:
-
   enum Profile_Equivalence
   {
     EQUIVALENT,
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
index f2cb3f6e078..12508008d02 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -2,13 +2,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Service_Context::TAO_Service_Context (void)
+TAO_Service_Context::TAO_Service_Context ()
   : service_context_ ()
 {
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_Service_Context::service_info (void)
+TAO_Service_Context::service_info ()
 {
   return this->service_context_;
 }
diff --git a/TAO/tao/Service_Context_Handler.h b/TAO/tao/Service_Context_Handler.h
index 0dabf427fe6..e38d4a9da50 100644
--- a/TAO/tao/Service_Context_Handler.h
+++ b/TAO/tao/Service_Context_Handler.h
@@ -36,7 +36,7 @@ class TAO_ServerRequest;
 class TAO_Export TAO_Service_Context_Handler
 {
   public:
-    TAO_Service_Context_Handler (void);
+    TAO_Service_Context_Handler ();
     virtual int process_service_context (
       TAO_Transport& transport,
       const IOP::ServiceContext& context,
@@ -49,7 +49,7 @@ class TAO_Export TAO_Service_Context_Handler
       TAO_Target_Specification &spec,
       TAO_OutputCDR &msg) = 0;
 
-    virtual ~TAO_Service_Context_Handler (void);
+    virtual ~TAO_Service_Context_Handler ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index e0ee664366c..b4fc47a288d 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -45,7 +45,7 @@ class TAO_Export TAO_Services_Activate : public ACE_Service_Object
 {
 public:
   /// The destructor
-  virtual ~TAO_Services_Activate (void);
+  virtual ~TAO_Services_Activate ();
 
   /**
    * Create and activate the service callbacks into the orb.
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
index 8b9e0bb343d..ee5a598ebb0 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
+TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base ()
 {
 }
 
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index 5cfc0ce828e..b65fd22fc8c 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -38,11 +38,11 @@ class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
 {
 public:
   /// Destructor
-  virtual ~TAO_Smart_Proxy_Base (void);
+  virtual ~TAO_Smart_Proxy_Base ();
 
 protected:
   /// Constructor.
-  TAO_Smart_Proxy_Base (void);
+  TAO_Smart_Proxy_Base ();
 
   /// Constructor.
   TAO_Smart_Proxy_Base (CORBA::Object_ptr proxy);
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl
index 3b181689cb5..23323281dd5 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void)
+TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base ()
 {
 }
 
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index d4bae6000e7..889bef472c6 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -39,7 +39,7 @@ template<typename S,
          typename to_S,
          typename from_S,
          template <typename> class Insert_Policy>
-TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::~In_Special_Basic_Clonable_Argument_T (void)
+TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::~In_Special_Basic_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -53,7 +53,7 @@ template<typename S,
          typename from_S,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::clone (void)
+TAO::In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>::clone ()
 {
   S* clone_x = new S (this->x_);
   In_Special_Basic_Clonable_Argument_T<S,to_S,from_S,Insert_Policy>* clone_arg
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
index 0fe4c12ecc3..2b64a08c261 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -53,7 +53,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -76,7 +76,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -89,7 +89,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
-Ret_Special_Basic_Argument_T (void)
+Ret_Special_Basic_Argument_T ()
 {
 }
 
@@ -99,7 +99,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -110,7 +110,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp ()
 {
   return this->x_;
 }
@@ -121,7 +121,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/Storable_Base.h b/TAO/tao/Storable_Base.h
index dc5a6422002..bc1e1d351c8 100644
--- a/TAO/tao/Storable_Base.h
+++ b/TAO/tao/Storable_Base.h
@@ -65,7 +65,7 @@ namespace TAO
 
     virtual int funlock (int whence, int start, int len) = 0;
 
-    virtual time_t last_changed(void) = 0;
+    virtual time_t last_changed() = 0;
 
     // Mimic a portion of the std::ios interface.  We need to be able
     // to indicate error states from the extraction operators below.
@@ -91,13 +91,13 @@ namespace TAO
 
     static ACE_CString state_as_string (Storable_State state);
 
-    virtual void rewind (void) = 0;
+    virtual void rewind () = 0;
 
-    virtual bool flush (void) = 0;
+    virtual bool flush () = 0;
 
     /// Force write of storable data to storage.
     /// Returns 0 on success, otherwise EOF
-    virtual int sync (void) = 0;
+    virtual int sync () = 0;
 
     virtual Storable_Base& operator << (const ACE_CString&) = 0;
     virtual Storable_Base& operator >> (ACE_CString&) = 0;
diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp
index 8f595d7de08..583dbbb34e9 100644
--- a/TAO/tao/Storable_File_Guard.cpp
+++ b/TAO/tao/Storable_File_Guard.cpp
@@ -32,7 +32,6 @@ TAO::Storable_File_Guard::
 void
 TAO::Storable_File_Guard::init_no_load(Method_Type method_type)
 {
-
   ACE_CString mode;
   this->rwflags_ = 0;
   switch (method_type)
@@ -230,7 +229,6 @@ TAO::Storable_File_Guard::load ()
       // result of 0 means OK. We should now have a good primary file.
       if (!result)
         {
-
           TAOLIB_ERROR ((LM_INFO,
                          ACE_TEXT ("TAO: (%P|%t) Attempting to restore ")
                          ACE_TEXT ("from backup\n")));
diff --git a/TAO/tao/Storable_File_Guard.h b/TAO/tao/Storable_File_Guard.h
index 7f33ba7c681..89e12059123 100644
--- a/TAO/tao/Storable_File_Guard.h
+++ b/TAO/tao/Storable_File_Guard.h
@@ -39,7 +39,7 @@ namespace TAO
     /// Releases the lock, closes the file, and deletes the I/O stream.
     /// Destructors of derived classes should call this this will
     /// virtual functions are available.
-    void release (void);
+    void release ();
 
     /// Return when the object in memory has last changed
     virtual time_t get_object_last_changed () = 0;
@@ -52,7 +52,6 @@ namespace TAO
     /// the persistent store.
     enum Method_Type
     {
-
       /// Construction with persistent file already existing
       CREATE_WITH_FILE,
 
@@ -80,13 +79,13 @@ namespace TAO
 
     /// Complete the initialization of the containing object, should
     /// be called with lock held after calling init_no_load
-    void reload (void);
+    void reload ();
 
     /// Check if the object is current with the last update.
-    virtual bool object_obsolete (void);
+    virtual bool object_obsolete ();
 
     /// Mark the object as up to date
-    virtual void mark_object_current (void);
+    virtual void mark_object_current ();
 
     /// Indicate when the object in memory has last changed
     virtual void set_object_last_changed (const time_t & time) = 0;
diff --git a/TAO/tao/Storable_FlatFileStream.cpp b/TAO/tao/Storable_FlatFileStream.cpp
index 2cb1951cc3a..08b98a564fe 100644
--- a/TAO/tao/Storable_FlatFileStream.cpp
+++ b/TAO/tao/Storable_FlatFileStream.cpp
@@ -12,7 +12,6 @@
 
 #include "tao/Storable_FlatFileStream.h"
 
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_stat.h"
@@ -25,6 +24,8 @@
 #include <mntent.h>
 #endif /* ACE_HAS_MNTENT */
 
+#include <memory>
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace
@@ -436,8 +437,8 @@ TAO::Storable_FlatFileStream::operator >> (ACE_CString& str)
       this->throw_on_read_error (badbit);
     }
   {
-    int strSize = bufSize + 1; // Account for newline
-    ACE_Auto_Basic_Array_Ptr<char> str_array (new char[strSize]);
+    int const strSize = bufSize + 1; // Account for newline
+    std::unique_ptr<char[]> str_array (new char[strSize]);
     str_array[0] = '\0';
     if (ACE_OS::fgets (str_array.get (),
                        strSize,
diff --git a/TAO/tao/Storable_FlatFileStream.h b/TAO/tao/Storable_FlatFileStream.h
index 9083f558ffc..b5d69b2ee01 100644
--- a/TAO/tao/Storable_FlatFileStream.h
+++ b/TAO/tao/Storable_FlatFileStream.h
@@ -33,7 +33,6 @@ namespace TAO
   class TAO_Export Storable_FlatFileStream : public Storable_Base
   {
   public:
-
     Storable_FlatFileStream(const ACE_CString & file, const char * mode,
                             bool use_backup = Storable_Base::use_backup_default,
                             bool retry_on_ebadf = Storable_Base::retry_on_ebadf_default);
@@ -61,15 +60,15 @@ namespace TAO
     virtual int funlock (int whence, int start, int len);
 
     /// Returns the last time an open file was changed
-    virtual time_t last_changed (void);
+    virtual time_t last_changed ();
 
-    virtual void rewind (void);
+    virtual void rewind ();
 
-    virtual bool flush (void);
+    virtual bool flush ();
 
     /// Force write of storable data to storage.
     /// Returns 0 on success, otherwise EOF
-    virtual int sync (void);
+    virtual int sync ();
 
     virtual Storable_Base& operator << (const ACE_CString&);
     virtual Storable_Base& operator >> (ACE_CString&);
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index 776b0005090..a37e0b9f936 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void)
+TAO_COIOP_Acceptor::TAO_COIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_COIOP_PROFILE),
     uuid_ (*ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ()),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
@@ -23,7 +23,7 @@ TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void)
 {
 }
 
-TAO_COIOP_Acceptor::~TAO_COIOP_Acceptor (void)
+TAO_COIOP_Acceptor::~TAO_COIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -159,7 +159,7 @@ TAO_COIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_COIOP_Acceptor::close (void)
+TAO_COIOP_Acceptor::close ()
 {
   return 0;
 }
@@ -207,7 +207,7 @@ TAO_COIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 }
 
 CORBA::ULong
-TAO_COIOP_Acceptor::endpoint_count (void)
+TAO_COIOP_Acceptor::endpoint_count ()
 {
   return 1;
 }
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.h b/TAO/tao/Strategies/COIOP_Acceptor.h
index 97be5c0184f..f74adc81ded 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.h
+++ b/TAO/tao/Strategies/COIOP_Acceptor.h
@@ -44,10 +44,10 @@ class TAO_Strategies_Export TAO_COIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_COIOP_Acceptor (void);
+  TAO_COIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_COIOP_Acceptor (void);
+  ~TAO_COIOP_Acceptor ();
 
   /**
    * @name The TAO_Acceptor Methods
@@ -66,20 +66,19 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
   //@}
 
 protected:
-
   /// Parse protocol specific options.
   virtual int parse_options (const char *options);
 
@@ -95,7 +94,6 @@ protected:
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 protected:
-
   /**
    * Cache the information about the endpoints serviced by this
    * acceptor.
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
index 9bfb2864ac4..07527f88778 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
@@ -45,7 +45,7 @@ TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_co
 }
 
 
-TAO_COIOP_Connection_Handler::~TAO_COIOP_Connection_Handler (void)
+TAO_COIOP_Connection_Handler::~TAO_COIOP_Connection_Handler ()
 {
   delete this->transport ();
 
@@ -75,13 +75,13 @@ TAO_COIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_COIOP_Connection_Handler::resume_handler (void)
+TAO_COIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_COIOP_Connection_Handler::close_connection (void)
+TAO_COIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.h b/TAO/tao/Strategies/COIOP_Connection_Handler.h
index b65fe1b6092..6b0630ed774 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.h
@@ -44,16 +44,14 @@ class TAO_Strategies_Export TAO_COIOP_Connection_Handler
   : public TAO_COIOP_SVC_HANDLER,
     public TAO_Connection_Handler
 {
-
 public:
-
   TAO_COIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
   TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_COIOP_Connection_Handler (void);
+  ~TAO_COIOP_Connection_Handler ();
 
   /// Called by the <Strategy_Acceptor> when the handler is completely
   /// connected.  Argument is unused.
@@ -73,8 +71,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -83,8 +81,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
+  int add_transport_to_cache ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index 21bbaad9dac..22df8844730 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -13,15 +13,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_COIOP_Connector::TAO_COIOP_Connector (void)
+TAO_COIOP_Connector::TAO_COIOP_Connector ()
   : TAO_Connector (TAO_TAG_COIOP_PROFILE)
 {
 }
 
-TAO_COIOP_Connector::~TAO_COIOP_Connector (void)
-{
-}
-
 int
 TAO_COIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -35,7 +31,7 @@ TAO_COIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_COIOP_Connector::close (void)
+TAO_COIOP_Connector::close ()
 {
   return 0;
 }
@@ -80,7 +76,7 @@ TAO_COIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_COIOP_Connector::make_profile (void)
+TAO_COIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@uuid/object_key
diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h
index 5f6fff50bcf..02a0d52307d 100644
--- a/TAO/tao/Strategies/COIOP_Connector.h
+++ b/TAO/tao/Strategies/COIOP_Connector.h
@@ -46,10 +46,10 @@ class TAO_Strategies_Export TAO_COIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_COIOP_Connector (void);
+  TAO_COIOP_Connector ();
 
   /// Destructor.
-  ~TAO_COIOP_Connector (void);
+  ~TAO_COIOP_Connector () = default;
 
   /**
    * @name The TAO_Connector Methods
@@ -58,7 +58,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -68,7 +68,6 @@ public:
   //@}
 
 protected:
-
   /**
    * @name More TAO_Connector Methods
    *
@@ -81,14 +80,13 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (void);
+  virtual TAO_Profile * make_profile ();
   //@}
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 private:
-
   /// Return the remote endpoint, a helper function
   TAO_COIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 };
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp
index 18290090a03..c8ff7d3cbb9 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp
@@ -24,18 +24,13 @@ TAO_COIOP_Endpoint::TAO_COIOP_Endpoint (const ACE_Utils::UUID& uuid)
 {
 }
 
-TAO_COIOP_Endpoint::TAO_COIOP_Endpoint (void)
+TAO_COIOP_Endpoint::TAO_COIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_COIOP_PROFILE),
     uuid_ (),
     next_ (0)
 {
 }
 
-TAO_COIOP_Endpoint::~TAO_COIOP_Endpoint (void)
-{
-
-}
-
 int
 TAO_COIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 {
@@ -53,13 +48,13 @@ TAO_COIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 }
 
 TAO_Endpoint *
-TAO_COIOP_Endpoint::next (void)
+TAO_COIOP_Endpoint::next ()
 {
   return 0;
 }
 
 TAO_Endpoint *
-TAO_COIOP_Endpoint::duplicate (void)
+TAO_COIOP_Endpoint::duplicate ()
 {
   TAO_COIOP_Endpoint *endpoint = 0;
 
@@ -83,7 +78,7 @@ TAO_COIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_COIOP_Endpoint::hash (void)
+TAO_COIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.h b/TAO/tao/Strategies/COIOP_Endpoint.h
index a6fad6bc309..61ac7a6ad98 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.h
+++ b/TAO/tao/Strategies/COIOP_Endpoint.h
@@ -45,14 +45,14 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_COIOP_Endpoint (void);
+  TAO_COIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
   TAO_COIOP_Endpoint (const ACE_Utils::UUID& uuid);
 
   /// Destructor.
-  ~TAO_COIOP_Endpoint (void);
+  ~TAO_COIOP_Endpoint () = default;
 
   /**
    * @name TAO_Endpoint Methods
@@ -60,16 +60,16 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
   //@}
 
   // = COIOP_Endpoint-specific methods.
diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp
index d239c961daf..e4b25c4bdff 100644
--- a/TAO/tao/Strategies/COIOP_Factory.cpp
+++ b/TAO/tao/Strategies/COIOP_Factory.cpp
@@ -13,15 +13,11 @@ static const char the_prefix[] = "COIOP";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_COIOP_Protocol_Factory::TAO_COIOP_Protocol_Factory (void)
+TAO_COIOP_Protocol_Factory::TAO_COIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_COIOP_PROFILE)
 {
 }
 
-TAO_COIOP_Protocol_Factory::~TAO_COIOP_Protocol_Factory (void)
-{
-}
-
 int
 TAO_COIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
@@ -42,7 +38,7 @@ TAO_COIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_COIOP_Protocol_Factory::make_acceptor (void)
+TAO_COIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -61,7 +57,7 @@ TAO_COIOP_Protocol_Factory::init (int /* argc */,
 }
 
 TAO_Connector *
-TAO_COIOP_Protocol_Factory::make_connector (void)
+TAO_COIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/COIOP_Factory.h b/TAO/tao/Strategies/COIOP_Factory.h
index 19c95335947..c9474204ed9 100644
--- a/TAO/tao/Strategies/COIOP_Factory.h
+++ b/TAO/tao/Strategies/COIOP_Factory.h
@@ -36,10 +36,10 @@ class TAO_Strategies_Export TAO_COIOP_Protocol_Factory
 {
 public:
   /// Constructor.
-  TAO_COIOP_Protocol_Factory (void);
+  TAO_COIOP_Protocol_Factory ();
 
   /// Destructor.
-  virtual ~TAO_COIOP_Protocol_Factory (void);
+  virtual ~TAO_COIOP_Protocol_Factory () = default;
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -61,8 +61,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 };
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index edfcbd0435a..ac5e6d6b0cd 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -46,7 +46,7 @@ TAO_COIOP_Profile::TAO_COIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_COIOP_Profile::~TAO_COIOP_Profile (void)
+TAO_COIOP_Profile::~TAO_COIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -180,7 +180,7 @@ TAO_COIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_COIOP_Profile::endpoint (void)
+TAO_COIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -239,7 +239,7 @@ TAO_COIOP_Profile::to_string () const
 }
 
 const char *
-TAO_COIOP_Profile::prefix (void)
+TAO_COIOP_Profile::prefix ()
 {
   return ::the_prefix;
 }
@@ -273,7 +273,7 @@ TAO_COIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_COIOP_Profile::encode_endpoints (void)
+TAO_COIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -330,7 +330,7 @@ TAO_COIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_COIOP_Profile::decode_endpoints (void)
+TAO_COIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h
index 85038ff65b5..adda3ea186c 100644
--- a/TAO/tao/Strategies/COIOP_Profile.h
+++ b/TAO/tao/Strategies/COIOP_Profile.h
@@ -47,7 +47,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, this is the most efficient since it
   /// doesn't require any address resolution processing.
@@ -60,12 +60,12 @@ public:
   TAO_COIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_COIOP_Profile (void);
+  ~TAO_COIOP_Profile ();
 
   /// Template methods. Please tao/Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -76,16 +76,14 @@ public:
   void add_endpoint (TAO_COIOP_Endpoint *endp);
 
 protected:
-
   /// Template methods. Please see tao/Profile.h for documentation.
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 protected:
-
   /**
    * Head of this profile's list of endpoints.  This endpoint is not
    * dynamically allocated because a profile always contains at least
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 1638a38763b..71934258658 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -27,18 +27,14 @@ TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
 {
 }
 
-TAO_COIOP_Transport::~TAO_COIOP_Transport (void)
-{
-}
-
 ACE_Event_Handler *
-TAO_COIOP_Transport::event_handler_i (void)
+TAO_COIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_COIOP_Transport::connection_handler_i (void)
+TAO_COIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -70,7 +66,7 @@ TAO_COIOP_Transport::handle_input (TAO_Resume_Handle &,
 
 
 int
-TAO_COIOP_Transport::register_handler (void)
+TAO_COIOP_Transport::register_handler ()
 {
   // We do never register register the handler with the reactor
   // as we never need to be informed about any incoming data,
diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h
index 2e01336abe9..f8be9978d78 100644
--- a/TAO/tao/Strategies/COIOP_Transport.h
+++ b/TAO/tao/Strategies/COIOP_Transport.h
@@ -47,13 +47,12 @@ typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 class TAO_Strategies_Export TAO_COIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
                        TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_COIOP_Transport (void);
+  ~TAO_COIOP_Transport () = default;
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
@@ -64,9 +63,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
@@ -83,7 +81,7 @@ protected:
                                    const ACE_Message_Block *message_block,
                                    ACE_Time_Value *max_wait_time);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   ///@}
 public:
@@ -102,7 +100,6 @@ public:
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
-
   /// The connection service handler used for accessing lower layer
   /// communication protocols.
   TAO_COIOP_Connection_Handler *connection_handler_;
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 7416b3b24f7..704aa675572 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -10,7 +10,6 @@
 #include "tao/Codeset_Manager.h"
 #include "tao/CDR.h"
 
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined(__ACE_INLINE__)
@@ -19,10 +18,11 @@
 
 #include "ace/os_include/os_netdb.h"
 #include <cstring>
+#include <memory>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void)
+TAO_DIOP_Acceptor::TAO_DIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_DIOP_PROFILE),
     addrs_ (0),
     port_span_ (1),
@@ -39,7 +39,7 @@ TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void)
 {
 }
 
-TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
+TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -231,7 +231,7 @@ TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_DIOP_Acceptor::close (void)
+TAO_DIOP_Acceptor::close ()
 {
   return 0;
 }
@@ -787,7 +787,7 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
 
   // The instantiation for this template is in
   // tao/DIOP_Connector.cpp.
-  ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_if_addrs (if_addrs);
+  std::unique_ptr<ACE_INET_Addr[]> safe_if_addrs (if_addrs);
 
 #if defined (ACE_HAS_IPV6)
   bool ipv4_only = def_type == AF_INET;
@@ -925,7 +925,7 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
 }
 
 CORBA::ULong
-TAO_DIOP_Acceptor::endpoint_count (void)
+TAO_DIOP_Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index bd64aee4f6d..2524d20a0da 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -45,17 +45,17 @@ class TAO_Strategies_Export TAO_DIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_DIOP_Acceptor (void);
+  TAO_DIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_DIOP_Acceptor (void);
+  ~TAO_DIOP_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   /// Returns address for default endpoint
   const ACE_INET_Addr& default_address () const;
@@ -80,13 +80,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
@@ -112,7 +112,6 @@ public:
                               char *&host);
 
 protected:
-
   /**
    * Helper method
    * Clear out 'addr' & 'specified_hostname' and initialize them based
@@ -173,7 +172,6 @@ protected:
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 protected:
-
   /// Array of ACE_INET_Addr instances, each one corresponding to a
   /// given network interface.
   ACE_INET_Addr *addrs_;
@@ -214,7 +212,6 @@ protected:
 private:
   // @@ Frank: From DIOP_Acceptor.h
   TAO_DIOP_Connection_Handler *connection_handler_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.inl b/TAO/tao/Strategies/DIOP_Acceptor.inl
index 88346814360..b7ea67f1218 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.inl
+++ b/TAO/tao/Strategies/DIOP_Acceptor.inl
@@ -15,7 +15,7 @@ TAO_DIOP_Acceptor::address () const
 }
 
 ACE_INLINE const ACE_INET_Addr *
-TAO_DIOP_Acceptor::endpoints (void)
+TAO_DIOP_Acceptor::endpoints ()
 {
   ACE_ASSERT (this->addrs_ != 0);
 
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 8b695fe6027..d87bb6ab8ed 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -48,7 +48,7 @@ TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core
   this->transport (specific_transport);
 }
 
-TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void)
+TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -65,7 +65,7 @@ TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void)
 
 // DIOP Additions - Begin
 const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::addr (void)
+TAO_DIOP_Connection_Handler::addr ()
 {
   return this->addr_;
 }
@@ -77,7 +77,7 @@ TAO_DIOP_Connection_Handler::addr (const ACE_INET_Addr &addr)
 }
 
 const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::local_addr (void)
+TAO_DIOP_Connection_Handler::local_addr ()
 {
   return this->local_addr_;
 }
@@ -206,7 +206,7 @@ TAO_DIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_DIOP_Connection_Handler::open_server (void)
+TAO_DIOP_Connection_Handler::open_server ()
 {
   TAO_DIOP_Protocol_Properties protocol_properties;
 
@@ -259,13 +259,13 @@ TAO_DIOP_Connection_Handler::open_server (void)
 }
 
 int
-TAO_DIOP_Connection_Handler::resume_handler (void)
+TAO_DIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_DIOP_Connection_Handler::close_connection (void)
+TAO_DIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -319,13 +319,13 @@ TAO_DIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_DIOP_Connection_Handler::release_os_resources (void)
+TAO_DIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer ().close ();
 }
 
 int
-TAO_DIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_DIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index 38dcb2cd588..20cbd7f2fa3 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -45,23 +45,21 @@ class TAO_Strategies_Export TAO_DIOP_Connection_Handler
   : public TAO_DIOP_SVC_HANDLER
   , public TAO_Connection_Handler
 {
-
 public:
-
   TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
   TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_DIOP_Connection_Handler (void);
+  ~TAO_DIOP_Connection_Handler ();
 
   /// Called by the <Strategy_Acceptor> when the handler is completely
   /// connected.  Argument is unused.
   virtual int open (void *);
 
   // @@ Frank: Similar to open, but called on server
-  virtual int open_server (void);
+  virtual int open_server ();
 
   //@{
   /**
@@ -77,8 +75,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -87,7 +85,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   // @@ Frank: Not needed
   /*
@@ -101,11 +99,11 @@ public:
    *
    */
   //@{
-  const ACE_INET_Addr &addr (void);
+  const ACE_INET_Addr &addr ();
 
   void addr (const ACE_INET_Addr &addr);
 
-  const ACE_INET_Addr &local_addr (void);
+  const ACE_INET_Addr &local_addr ();
 
   void local_addr (const ACE_INET_Addr &addr);
   //@}
@@ -116,12 +114,11 @@ public:
   int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
 protected:
-
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index b4b24ddd3bb..a82ab2ed3cd 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -19,15 +19,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DIOP_Connector::TAO_DIOP_Connector (void)
+TAO_DIOP_Connector::TAO_DIOP_Connector ()
   : TAO_Connector (TAO_TAG_DIOP_PROFILE)
 {
 }
 
-TAO_DIOP_Connector::~TAO_DIOP_Connector (void)
-{
-}
-
 int
 TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -41,7 +37,7 @@ TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_DIOP_Connector::close (void)
+TAO_DIOP_Connector::close ()
 {
   return 0;
 }
@@ -226,7 +222,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_DIOP_Connector::make_profile (void)
+TAO_DIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 7448c5938ed..de4b8e2109b 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -46,10 +46,10 @@ class TAO_Strategies_Export TAO_DIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_DIOP_Connector (void);
+  TAO_DIOP_Connector ();
 
   /// Destructor.
-  ~TAO_DIOP_Connector (void);
+  ~TAO_DIOP_Connector () = default;
 
   /**
    * @name The TAO_Connector Methods
@@ -58,7 +58,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -68,7 +68,6 @@ public:
   //@}
 
 protected:
-
   /**
    * @name More TAO_Connector Methods
    *
@@ -81,14 +80,13 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (void);
+  virtual TAO_Profile * make_profile ();
   //@}
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 private:
-
   /// Return the remote endpoint, a helper function
   TAO_DIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 };
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index 7cea233a221..335af696afb 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -52,7 +52,7 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
   this->host (host); // With IPv6 performs check for decimal address
 }
 
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (void)
+TAO_DIOP_Endpoint::TAO_DIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_DIOP_PROFILE),
     host_ (),
     port_ (0),
@@ -81,10 +81,6 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
   this->host (host); // With IPv6 performs check for decimal address
 }
 
-TAO_DIOP_Endpoint::~TAO_DIOP_Endpoint (void)
-{
-}
-
 int
 TAO_DIOP_Endpoint::set (const ACE_INET_Addr &addr,
                         int use_dotted_decimal_addresses)
@@ -176,13 +172,13 @@ TAO_DIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_DIOP_Endpoint::next (void)
+TAO_DIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_DIOP_Endpoint::duplicate (void)
+TAO_DIOP_Endpoint::duplicate ()
 {
   TAO_DIOP_Endpoint *endpoint = 0;
 
@@ -210,7 +206,7 @@ TAO_DIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_DIOP_Endpoint::hash (void)
+TAO_DIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
index ae1f8a3e70d..cc3a2e8af6a 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -46,7 +46,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_DIOP_Endpoint (void);
+  TAO_DIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -65,7 +65,7 @@ public:
                      CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_DIOP_Endpoint (void);
+  ~TAO_DIOP_Endpoint () = default;
 
   /**
    * @name TAO_Endpoint Methods
@@ -73,16 +73,16 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
   //@}
 
   // Allocates memory and returns a copy of <this>
@@ -107,7 +107,6 @@ public:
   CORBA::UShort port (CORBA::UShort p);
 
 private:
-
   /// Helper method for setting INET_Addr.
   int set (const ACE_INET_Addr &addr,
            int use_dotted_decimal_addresses);
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index c29d38219b1..66fc22e5328 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -13,15 +13,11 @@ static const char the_prefix[] = "diop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
+TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE)
 {
 }
 
-TAO_DIOP_Protocol_Factory::~TAO_DIOP_Protocol_Factory (void)
-{
-}
-
 int
 TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
@@ -42,7 +38,7 @@ TAO_DIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_DIOP_Protocol_Factory::make_acceptor (void)
+TAO_DIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -60,7 +56,7 @@ TAO_DIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 }
 
 TAO_Connector *
-TAO_DIOP_Protocol_Factory::make_connector (void)
+TAO_DIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
index e63cc69399a..b30659f7d8d 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -36,10 +36,10 @@ class TAO_Strategies_Export TAO_DIOP_Protocol_Factory
 {
 public:
   /// Constructor.
-  TAO_DIOP_Protocol_Factory (void);
+  TAO_DIOP_Protocol_Factory ();
 
   /// Destructor.
-  virtual ~TAO_DIOP_Protocol_Factory (void);
+  virtual ~TAO_DIOP_Protocol_Factory () = default;
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -61,8 +61,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 };
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index b362e145a27..7bb6c2e3cd4 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -66,7 +66,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_DIOP_Profile::~TAO_DIOP_Profile (void)
+TAO_DIOP_Profile::~TAO_DIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -342,7 +342,7 @@ TAO_DIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_DIOP_Profile::endpoint (void)
+TAO_DIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -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",
@@ -449,7 +448,7 @@ TAO_DIOP_Profile::to_string () const
 }
 
 const char *
-TAO_DIOP_Profile::prefix (void)
+TAO_DIOP_Profile::prefix ()
 {
   return ::the_prefix;
 }
@@ -500,7 +499,7 @@ TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_DIOP_Profile::encode_endpoints (void)
+TAO_DIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -553,7 +552,7 @@ TAO_DIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_DIOP_Profile::decode_endpoints (void)
+TAO_DIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index 1946349b1e8..a5cea7758f5 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -47,7 +47,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -70,13 +70,13 @@ public:
   TAO_DIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_DIOP_Profile (void);
+  ~TAO_DIOP_Profile ();
 
 
   /// Template methods. Please tao/Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -87,16 +87,14 @@ public:
   void add_endpoint (TAO_DIOP_Endpoint *endp);
 
 protected:
-
   /// Template methods. Please see tao/Profile.h for documentation.
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 protected:
-
   /**
    * Head of this profile's list of endpoints.  This endpoint is not
    * dynamically allocated because a profile always contains at least
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 05f210b7243..6c373c2fcf5 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -28,18 +28,14 @@ TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
 {
 }
 
-TAO_DIOP_Transport::~TAO_DIOP_Transport (void)
-{
-}
-
 ACE_Event_Handler *
-TAO_DIOP_Transport::event_handler_i (void)
+TAO_DIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_DIOP_Transport::connection_handler_i (void)
+TAO_DIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -203,7 +199,7 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
 
 
 int
-TAO_DIOP_Transport::register_handler (void)
+TAO_DIOP_Transport::register_handler ()
 {
   // @@ Michael:
   //
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 592240b664c..2dbd1b46019 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -51,13 +51,12 @@ typedef ACE_Svc_Handler<ACE_SOCK_DGRAM, ACE_NULL_SYNCH>
 class TAO_Strategies_Export TAO_DIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
                       TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_DIOP_Transport (void);
+  ~TAO_DIOP_Transport () = default;
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
@@ -68,9 +67,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
@@ -82,7 +80,7 @@ protected:
                         size_t len,
                         const ACE_Time_Value *s = 0);
 
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   ///@}
 public:
@@ -101,7 +99,6 @@ public:
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
-
   /// The connection service handler used for accessing lower layer
   /// communication protocols.
   TAO_DIOP_Connection_Handler *connection_handler_;
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
index e4c897391e0..2e0da48098f 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -1,15 +1,7 @@
 #include "tao/Strategies/LF_Strategy_Null.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Strategies/LF_Strategy_Null.inl"
-#endif /* __ACE_INLINE__ */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
-{
-}
-
 void
 TAO_LF_Strategy_Null::set_upcall_thread (TAO_Leader_Follower &)
 {
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h
index 802292b53a0..c53adaa8b82 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.h
+++ b/TAO/tao/Strategies/LF_Strategy_Null.h
@@ -31,28 +31,24 @@ class TAO_Strategies_Export TAO_LF_Strategy_Null : public TAO_LF_Strategy
 {
 public:
   /// Constructor
-  TAO_LF_Strategy_Null (void);
+  TAO_LF_Strategy_Null () = default;
 
   //@{
   /** @name Virtual Methods
    *
    * Please check the documentation in TAO_LF_Strategy
    */
-  virtual ~TAO_LF_Strategy_Null (void);
+  ~TAO_LF_Strategy_Null () override = default;
 
-  virtual void set_upcall_thread (TAO_Leader_Follower &);
-  virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
-                                     TAO_Leader_Follower &);
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &);
+  void set_upcall_thread (TAO_Leader_Follower &) override;
+  int set_event_loop_thread (ACE_Time_Value *max_wait_time,
+                             TAO_Leader_Follower &) override;
+  void reset_event_loop_thread (int call_reset,
+                                TAO_Leader_Follower &) override;
   //@}
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-# include "tao/Strategies/LF_Strategy_Null.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_LF_STRATEGY_NULL_H */
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.inl b/TAO/tao/Strategies/LF_Strategy_Null.inl
deleted file mode 100644
index 2eecd74fa73..00000000000
--- a/TAO/tao/Strategies/LF_Strategy_Null.inl
+++ /dev/null
@@ -1,4 +0,0 @@
-ACE_INLINE
-TAO_LF_Strategy_Null::TAO_LF_Strategy_Null (void)
-{
-}
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
index 1e023180cee..9254ad45457 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
@@ -9,12 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_OC_Endpoint_Selector_Factory::TAO_OC_Endpoint_Selector_Factory (void)
-  : oc_endpoint_selector_(0)
-{
-}
-
-TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory (void)
+TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory ()
 {
   delete this->oc_endpoint_selector_;
 }
@@ -46,7 +41,7 @@ TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_OC_Endpoint_Selector_Factory::register_orb_initializer (void)
+TAO_OC_Endpoint_Selector_Factory::register_orb_initializer ()
 {
   // Register the ORB initializer.
   try
@@ -80,7 +75,7 @@ TAO_OC_Endpoint_Selector_Factory::register_orb_initializer (void)
 }
 
 TAO_Invocation_Endpoint_Selector *
-TAO_OC_Endpoint_Selector_Factory::get_selector (void)
+TAO_OC_Endpoint_Selector_Factory::get_selector ()
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->oc_endpoint_selector_;
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
index e0994e7ba2f..a6d1b2a544c 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
@@ -50,29 +50,28 @@ class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Factory
 {
 public:
   /// Constructor.
-  TAO_OC_Endpoint_Selector_Factory (void);
+  TAO_OC_Endpoint_Selector_Factory () = default;
 
   /// Destructor.
-  virtual ~TAO_OC_Endpoint_Selector_Factory (void);
+  virtual ~TAO_OC_Endpoint_Selector_Factory ();
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 protected:
   /// The possible endpoint selector strategies that can be
   /// returned by this factory
 
-  TAO_Optimized_Connection_Endpoint_Selector *oc_endpoint_selector_;
+  TAO_Optimized_Connection_Endpoint_Selector *oc_endpoint_selector_ {};
 
-  int register_orb_initializer (void);
+  int register_orb_initializer ();
 };
 
 
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory)
 
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
index d0bff0c6aa5..1d61cb5d7f6 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
@@ -12,7 +12,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_OC_Endpoint_Selector_Loader::init (void)
+TAO_OC_Endpoint_Selector_Loader::init ()
 {
   return  ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory);
 }
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
index 0913f89df53..1a7a560912e 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
@@ -42,7 +42,7 @@ class TAO_Optimized_Connection_Endpoint_Selector;
 class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader
 {
 public:
-  static int init(void);
+  static int init();
 };
 
 static int
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index 656d238970b..e90d111ee97 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -36,7 +36,7 @@ TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv)
 }
 
 TAO_Optimized_Connection_Endpoint_Selector::
-~TAO_Optimized_Connection_Endpoint_Selector (void)
+~TAO_Optimized_Connection_Endpoint_Selector ()
 {
 }
 
@@ -125,7 +125,6 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
     }
 
 
-
   // at this point, we do not have an existing transport, so we must
   // reset the profile list and try establishing connections via the
   // connector(s).
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
index ddff6b17932..71bd45f5df9 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
@@ -50,7 +50,7 @@ public:
   TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value& tv);
 
   /// Destructor.
-  virtual ~TAO_Optimized_Connection_Endpoint_Selector (void);
+  virtual ~TAO_Optimized_Connection_Endpoint_Selector ();
 
   static void hook (TAO_ORB_Core *,
                     TAO_Stub *,
@@ -60,7 +60,6 @@ public:
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *,
                                 ACE_Time_Value *max_wait_time);
 private:
-
   int check_profile (TAO_Profile *,
                      TAO::Profile_Transport_Resolver *);
 
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index b33826598fb..b5ae1ccca8a 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -18,7 +18,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void)
+TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE),
     addrs_ (0),
     port_span_ (1),
@@ -34,7 +34,7 @@ TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void)
 {
 }
 
-TAO_SCIOP_Acceptor::~TAO_SCIOP_Acceptor (void)
+TAO_SCIOP_Acceptor::~TAO_SCIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -202,7 +202,7 @@ TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_SCIOP_Acceptor::close (void)
+TAO_SCIOP_Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
@@ -215,7 +215,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                          const char *address,
                          const char *options)
 {
-
   this->orb_core_ = orb_core;
 
   if (this->hosts_ != 0)
@@ -274,7 +273,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   size_t hostname_length = 0;
 
   if (port_separator_loc != 0) {
-
     // Port separator was found.  Check that the next character is
     // not the terminator.
     const char *port_loc = port_separator_loc;
@@ -297,9 +295,7 @@ 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
     // in open_i.
@@ -359,7 +355,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   size_t i = 0;
   ACE_INET_Addr temp_addr;
   while (i < num_secondary_ip_addrs) {
-
     // Obtain a char* for a single secondary hostname.
     ACE_CString & hostname_obj = hostnames[i + 1];
     ACE_Auto_Basic_Array_Ptr<char> hostname_auto(hostname_obj.rep());
@@ -408,15 +403,16 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   // Set cached hostnames.
   i = 0;
   while (i < hostnames.size()) {
-
     // The hostname_in_ior_ field may override the FIRST hostname only.
     if (this->hostname_in_ior_ != 0 && i == 0)
     {
       if (TAO_debug_level > 2)
       {
         TAOLIB_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Overriding address in IOR with %C\n"),
-                    this->hostname_in_ior_));
+                      ACE_TEXT ("TAO (%P|%t) - ")
+                      ACE_TEXT ("SCIOP_Acceptor::open, ")
+                      ACE_TEXT ("overriding address in IOR with %C\n"),
+                      this->hostname_in_ior_));
       }
       if (this->hostname (orb_core,
                           this->addrs_[i],
@@ -727,7 +723,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
   // the list of cached hostnames unless it is the only interface.
   size_t lo_cnt = 0;  // Loopback interface count
   for (size_t j = 0; j < if_cnt; ++j)
-    if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK)
+    if (if_addrs[j].is_loopback ())
       ++lo_cnt;
 
   // The instantiation for this template is in
@@ -762,7 +758,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
       // Ignore any loopback interface if there are other
       // non-loopback interfaces.
       if (if_cnt != lo_cnt &&
-          if_addrs[i].get_ip_address() == INADDR_LOOPBACK)
+          if_addrs[i].is_loopback ())
         continue;
 
       if (this->hostname_in_ior_ != 0)
@@ -770,7 +766,9 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
           if (TAO_debug_level > 2)
             {
               TAOLIB_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("Overriding address in IOR with %C\n"),
+                          ACE_TEXT ("TAO (%P|%t) - ")
+                          ACE_TEXT ("SCIOP_Acceptor::probe_interfaces, ")
+                          ACE_TEXT ("overriding address in IOR with %C\n"),
                           this->hostname_in_ior_));
             }
           if (this->hostname (orb_core,
@@ -802,7 +800,6 @@ int
 TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
                                               ACE_Array<ACE_CString> &hostnames_out)
 {
-
   // Make a copy of hostnames string
   int const hostnames_string_length = std::strlen(hostnames) + 1;
   char* hostnames_copy = 0;
@@ -824,7 +821,6 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
 
   // Set the size of the array to the number of hostnames
   if (hostnames_out.size(num_hostnames) == -1) {
-
     TAOLIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("TAO (%P|%t) Could not allocate storage ")
                        ACE_TEXT ("for %d hostnames in SCIOP endpoint\n"),
@@ -854,9 +850,8 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
   return 0;
 }
 
-
 CORBA::ULong
-TAO_SCIOP_Acceptor::endpoint_count (void)
+TAO_SCIOP_Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
@@ -916,7 +911,6 @@ TAO_SCIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
   return 1;
 }
 
-
 int
 TAO_SCIOP_Acceptor::parse_options (const char *str)
 {
@@ -926,7 +920,6 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
   // Use an option format similar to the one used for CGI scripts in
   // HTTP URLs.
   // e.g.:  option1=foo&option2=bar
-
   ACE_CString options (str);
 
   size_t len = options.length ();
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index 43aa383c072..4c53f4dfcbe 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -46,17 +46,17 @@ class TAO_Strategies_Export TAO_SCIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_SCIOP_Acceptor (void);
+  TAO_SCIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_SCIOP_Acceptor (void);
+  ~TAO_SCIOP_Acceptor ();
 
   /// @@ Helper method for the implementation repository, should go
   ///    away
   const ACE_INET_Addr& address () const;
 
   /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
+  const ACE_INET_Addr *endpoints ();
 
   typedef TAO_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> TAO_SCIOP_BASE_ACCEPTOR;
   typedef TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler> TAO_SCIOP_CREATION_STRATEGY;
@@ -78,12 +78,12 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
@@ -146,7 +146,7 @@ protected:
 
   /// Obtain tcp properties that must be used by this acceptor, i.e.,
   /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
+  int init_tcp_properties ();
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
@@ -161,7 +161,6 @@ protected:
                              CORBA::Short priority);
 
 protected:
-
   /// Array of ACE_INET_Addr instances, each one corresponding to a
   /// given network interface.
   ACE_INET_Addr *addrs_;
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.inl b/TAO/tao/Strategies/SCIOP_Acceptor.inl
index 840862e2710..86cc2f06e57 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.inl
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.inl
@@ -15,7 +15,7 @@ TAO_SCIOP_Acceptor::address () const
 }
 
 ACE_INLINE const ACE_INET_Addr *
-TAO_SCIOP_Acceptor::endpoints (void)
+TAO_SCIOP_Acceptor::endpoints ()
 {
   ACE_ASSERT (this->addrs_ != 0);
 
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index c538040a969..5d6de7fbb5a 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -58,7 +58,7 @@ TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_co
   this->transport (specific_transport);
 }
 
-TAO_SCIOP_Connection_Handler::~TAO_SCIOP_Connection_Handler (void)
+TAO_SCIOP_Connection_Handler::~TAO_SCIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -255,13 +255,13 @@ TAO_SCIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_SCIOP_Connection_Handler::resume_handler (void)
+TAO_SCIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_SCIOP_Connection_Handler::close_connection (void)
+TAO_SCIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -325,13 +325,13 @@ TAO_SCIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_SCIOP_Connection_Handler::release_os_resources (void)
+TAO_SCIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
 
 int
-TAO_SCIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_SCIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
@@ -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/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index 450c9c1abc3..f1dd65710cd 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -57,16 +57,14 @@ class TAO_Strategies_Export TAO_SCIOP_Connection_Handler
   : public TAO_SCIOP_SVC_HANDLER,
     public TAO_Connection_Handler
 {
-
 public:
-
   TAO_SCIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
   TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_SCIOP_Connection_Handler (void);
+  ~TAO_SCIOP_Connection_Handler ();
 
   //@{
   /**
@@ -86,8 +84,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -96,7 +94,7 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
   /// Process the <listen_list>
   int process_listen_point_list (IIOP::ListenPointList &listen_list);
@@ -106,7 +104,6 @@ public:
   int set_dscp_codepoint (CORBA::Long dscp);
 
 protected:
-
   /// Helper method needed by the set_dscp_codepoint () methods
   int set_tos (int tos);
 
@@ -114,13 +111,12 @@ protected:
   /**
    * @name TAO_Connection Handler overloads
    */
-  //  void handle_close_i (void);
-  virtual int release_os_resources (void);
+  //  void handle_close_i ();
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 
 private:
-
   /// Stores the type of service value.
   int dscp_codepoint_;
 };
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index d41dc1a1752..2dcc7944a35 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -22,14 +22,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SCIOP_Connector::TAO_SCIOP_Connector (void)
+TAO_SCIOP_Connector::TAO_SCIOP_Connector ()
   : TAO_Connector (TAO_TAG_SCIOP_PROFILE),
     connect_strategy_ (),
     base_connector_ (0)
 {
 }
 
-TAO_SCIOP_Connector::~TAO_SCIOP_Connector (void)
+TAO_SCIOP_Connector::~TAO_SCIOP_Connector ()
 {
 }
 
@@ -70,7 +70,7 @@ TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_SCIOP_Connector::close (void)
+TAO_SCIOP_Connector::close ()
 {
   delete this->base_connector_.concurrency_strategy ();
   delete this->base_connector_.creation_strategy ();
@@ -333,7 +333,7 @@ TAO_SCIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SCIOP_Connector::make_profile (void)
+TAO_SCIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index ee026db87bc..c73662fb73a 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -48,15 +48,15 @@ class TAO_Strategies_Export TAO_SCIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_SCIOP_Connector (void);
+  TAO_SCIOP_Connector ();
 
   /// Destructor.
-  ~TAO_SCIOP_Connector (void);
+  ~TAO_SCIOP_Connector ();
 
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
   virtual int check_prefix (const char *endpoint);
@@ -64,7 +64,6 @@ public:
   virtual char object_key_delimiter () const;
 
 public:
-
   typedef TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>
           TAO_SCIOP_CONNECT_CONCURRENCY_STRATEGY;
 
@@ -80,7 +79,6 @@ public:
           TAO_SCIOP_BASE_CONNECTOR;
 
 protected:
-
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int set_validate_endpoint (TAO_Endpoint *ep);
@@ -91,13 +89,12 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 private:
-
   /// Return the remote endpoint, a helper function
   TAO_SCIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
@@ -108,7 +105,6 @@ private:
                                     TAO_SCIOP_Endpoint *sciop_endpoint);
 
 private:
-
   /// Our connect strategy
   TAO_SCIOP_CONNECT_STRATEGY connect_strategy_;
 
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 9f56b3a88ca..8a6b5c604d9 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -51,7 +51,7 @@ TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
 {
 }
 
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (void)
+TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
   , host_ ()
   , port_ (683)  // default port (IANA assigned)
@@ -78,10 +78,6 @@ TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
   this->priority (priority);
 }
 
-TAO_SCIOP_Endpoint::~TAO_SCIOP_Endpoint (void)
-{
-}
-
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const TAO_SCIOP_Endpoint &rhs)
   : TAO_Endpoint (rhs.tag_,
                   rhs.priority_)
@@ -153,13 +149,13 @@ TAO_SCIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_SCIOP_Endpoint::next (void)
+TAO_SCIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_SCIOP_Endpoint::duplicate (void)
+TAO_SCIOP_Endpoint::duplicate ()
 {
   TAO_SCIOP_Endpoint *endpoint = 0;
 
@@ -187,7 +183,7 @@ TAO_SCIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_SCIOP_Endpoint::hash (void)
+TAO_SCIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
index 99c843e9d3b..0ea264db14b 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -49,7 +49,7 @@ public:
   friend class TAO_SSLIOP_Profile;
 
   /// Default constructor.
-  TAO_SCIOP_Endpoint (void);
+  TAO_SCIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -68,21 +68,21 @@ public:
                      CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_SCIOP_Endpoint (void);
+  ~TAO_SCIOP_Endpoint () = default;
 
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
 
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
+  virtual CORBA::ULong hash ();
 
   // = SCIOP_Endpoint-specific methods.
 
@@ -110,7 +110,6 @@ public:
   const char *preferred_network () const;
 
 private:
-
   /// Helper method for setting INET_Addr.
   int set (const ACE_INET_Addr &addr,
            int use_dotted_decimal_addresses);
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index d744c95c97a..aeb5c0d4c17 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -11,15 +11,11 @@ static const char prefix_[] = "sciop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void)
+TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE)
 {
 }
 
-TAO_SCIOP_Protocol_Factory::~TAO_SCIOP_Protocol_Factory (void)
-{
-}
-
 int
 TAO_SCIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
@@ -40,7 +36,7 @@ TAO_SCIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_SCIOP_Protocol_Factory::make_acceptor (void)
+TAO_SCIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -58,7 +54,7 @@ TAO_SCIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 }
 
 TAO_Connector *
-TAO_SCIOP_Protocol_Factory::make_connector (void)
+TAO_SCIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index a0930ed6432..96a633968ea 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -35,8 +35,8 @@ class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory
 : public TAO_Protocol_Factory
 {
 public:
-  TAO_SCIOP_Protocol_Factory (void);
-  virtual ~TAO_SCIOP_Protocol_Factory (void);
+  TAO_SCIOP_Protocol_Factory ();
+  virtual ~TAO_SCIOP_Protocol_Factory () = default;
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -53,8 +53,8 @@ public:
   virtual char options_delimiter () const;
 
   // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
 };
 
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index eaf71d16817..c82ac534360 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -61,7 +61,7 @@ TAO_SCIOP_Profile::TAO_SCIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_SCIOP_Profile::~TAO_SCIOP_Profile (void)
+TAO_SCIOP_Profile::~TAO_SCIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -284,7 +284,7 @@ TAO_SCIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_SCIOP_Profile::endpoint (void)
+TAO_SCIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -343,7 +343,7 @@ TAO_SCIOP_Profile::to_string () const
 }
 
 const char *
-TAO_SCIOP_Profile::prefix (void)
+TAO_SCIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
@@ -396,7 +396,7 @@ TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_SCIOP_Profile::encode_endpoints (void)
+TAO_SCIOP_Profile::encode_endpoints ()
 {
   CORBA::ULong actual_count = 0;
 
@@ -452,7 +452,7 @@ TAO_SCIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_SCIOP_Profile::decode_endpoints (void)
+TAO_SCIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index d644f758d3b..d0b4994c586 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -46,7 +46,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -68,12 +68,12 @@ public:
   TAO_SCIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_SCIOP_Profile (void);
+  ~TAO_SCIOP_Profile ();
 
   /// Template methods. Please see Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -84,16 +84,14 @@ public:
   void add_endpoint (TAO_SCIOP_Endpoint *endp);
 
 protected:
-
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 protected:
-
   /**
    * Head of this profile's list of endpoints.  This endpoint is not
    * dynamically allocated because a profile always contains at least
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index fa17942ca95..aadbe366401 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -29,18 +29,18 @@ TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
 {
 }
 
-TAO_SCIOP_Transport::~TAO_SCIOP_Transport (void)
+TAO_SCIOP_Transport::~TAO_SCIOP_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_SCIOP_Transport::event_handler_i (void)
+TAO_SCIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_SCIOP_Transport::connection_handler_i (void)
+TAO_SCIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 6b954f83bce..575d85e9476 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -46,19 +46,17 @@ class TAO_Acceptor;
 class TAO_Strategies_Export TAO_SCIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
                        TAO_ORB_Core *orb_core);
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  virtual ~TAO_SCIOP_Transport (void);
+  virtual ~TAO_SCIOP_Transport ();
 
   /** @name Overridden Template Methods
    *
@@ -66,8 +64,7 @@ protected:
    * details.
    */
   //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
 
   virtual ssize_t send (iovec *iov, int iovcnt,
                         size_t &bytes_transferred,
@@ -98,12 +95,11 @@ public:
 
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
-  virtual TAO_Connection_Handler * connection_handler_i (void);
+  virtual TAO_Connection_Handler * connection_handler_i ();
 
   //@}
 
 private:
-
   /// Set the Bidirectional context info in the service context list
   void set_bidir_context_info (TAO_Operation_Details &opdetails);
 
@@ -113,7 +109,6 @@ private:
   int get_listen_point (IIOP::ListenPointList &listen_point_list,
                         TAO_Acceptor *acceptor);
 private:
-
   /// The connection service handler used for accessing lower layer
   /// communication protocols.
   TAO_SCIOP_Connection_Handler *connection_handler_;
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 83443fd6430..0074fa17533 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void)
+TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     orb_core_ (0),
@@ -28,7 +28,7 @@ TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void)
 {
 }
 
-TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor (void)
+TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -160,7 +160,7 @@ TAO_SHMIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_SHMIOP_Acceptor::close (void)
+TAO_SHMIOP_Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
@@ -389,7 +389,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 
 
 CORBA::ULong
-TAO_SHMIOP_Acceptor::endpoint_count (void)
+TAO_SHMIOP_Acceptor::endpoint_count ()
 {
   // @@ for now just assume one!
   // we should take a look at the local address, if it is zero then
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index 870ea885cb6..853086b1d3e 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -41,10 +41,10 @@ class TAO_Strategies_Export TAO_SHMIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
-  TAO_SHMIOP_Acceptor (void);
+  TAO_SHMIOP_Acceptor ();
 
   /// Destructor.
-  ~TAO_SHMIOP_Acceptor (void);
+  ~TAO_SHMIOP_Acceptor ();
 
   typedef TAO_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> TAO_SHMIOP_BASE_ACCEPTOR;
   typedef TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler> TAO_SHMIOP_CREATION_STRATEGY;
@@ -68,13 +68,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint* endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index a98a0368370..ec18a6ab654 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -46,7 +46,7 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_
 }
 
 
-TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler (void)
+TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -161,13 +161,13 @@ TAO_SHMIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_SHMIOP_Connection_Handler::resume_handler (void)
+TAO_SHMIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_SHMIOP_Connection_Handler::close_connection (void)
+TAO_SHMIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -231,13 +231,13 @@ TAO_SHMIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_SHMIOP_Connection_Handler::release_os_resources (void)
+TAO_SHMIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
 
 int
-TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_SHMIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index b8d6247b732..4a688d9128d 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -43,7 +43,6 @@ class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler :
   public TAO_SHMIOP_SVC_HANDLER,
   public TAO_Connection_Handler
 {
-
 public:
   /// Constructor.
   TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
@@ -52,7 +51,7 @@ public:
   TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_SHMIOP_Connection_Handler (void);
+  ~TAO_SHMIOP_Connection_Handler ();
 
   /// Called by the <Strategy_Acceptor> when the handler is completely
   /// connected.  Argument is unused.
@@ -72,8 +71,8 @@ public:
   //@{
   /** @name Event Handler overloads
    */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -82,18 +81,16 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
 protected:
-
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 121185f4bd9..ab03c1c0fd4 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -17,17 +17,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (void)
+TAO_SHMIOP_Connector::TAO_SHMIOP_Connector ()
   : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
     connect_strategy_ (),
     base_connector_ (0)
 {
 }
 
-TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void)
-{
-}
-
 int
 TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -73,7 +69,7 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_SHMIOP_Connector::close (void)
+TAO_SHMIOP_Connector::close ()
 {
   delete this->base_connector_.concurrency_strategy ();
   delete this->base_connector_.creation_strategy ();
@@ -276,7 +272,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SHMIOP_Connector::make_profile (void)
+TAO_SHMIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@port/object_key
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index 72426bb2dea..6eb0d3329a8 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -50,10 +50,10 @@ class TAO_Strategies_Export TAO_SHMIOP_Connector : public TAO_Connector
 {
 public:
   /// Constructor.
-  TAO_SHMIOP_Connector (void);
+  TAO_SHMIOP_Connector ();
 
   /// Default destructor
-  ~TAO_SHMIOP_Connector (void);
+  ~TAO_SHMIOP_Connector () = default;
 
   /**
    * @name The TAO_Connector Methods
@@ -62,7 +62,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -72,7 +72,6 @@ public:
   //@}
 
 public:
-
   typedef TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
           TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY;
 
@@ -100,19 +99,17 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
   //@}
 
 private:
-
   /// Return the remote endpoint, a helper function
   TAO_SHMIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
 private:
-
   /// Local address.
   ACE_MEM_Addr address_;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index bb69096a8fd..ef5c6d8ab71 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -56,7 +56,7 @@ TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const char *host,
     this->host_ = host;
 }
 
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (void)
+TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
     , host_ ()
     , port_ (0)
@@ -82,7 +82,7 @@ TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const char *host,
   this->priority (priority);
 }
 
-TAO_SHMIOP_Endpoint::~TAO_SHMIOP_Endpoint (void)
+TAO_SHMIOP_Endpoint::~TAO_SHMIOP_Endpoint ()
 {
 }
 
@@ -151,13 +151,13 @@ TAO_SHMIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_SHMIOP_Endpoint::next (void)
+TAO_SHMIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_SHMIOP_Endpoint::duplicate (void)
+TAO_SHMIOP_Endpoint::duplicate ()
 {
   TAO_SHMIOP_Endpoint *endpoint = 0;
   ACE_NEW_RETURN (endpoint,
@@ -186,7 +186,7 @@ TAO_SHMIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_SHMIOP_Endpoint::hash (void)
+TAO_SHMIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
index 3199b2d684d..366d0cab3b0 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -44,7 +44,7 @@ public:
   friend class TAO_SHMIOP_Profile;
 
   /// Default constructor.
-  TAO_SHMIOP_Endpoint (void);
+  TAO_SHMIOP_Endpoint ();
 
   /// Constructor.  This is the most efficient constructor since it
   /// does not require any address resolution processing.
@@ -68,7 +68,7 @@ public:
                        CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_SHMIOP_Endpoint (void);
+  ~TAO_SHMIOP_Endpoint ();
 
   /**
    * @name TAO_Endpoint Methods
@@ -77,16 +77,16 @@ public:
    */
   //@{
   /// Return a copy of @c this
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (void);
+  CORBA::ULong hash ();
   //@}
 
   // = SHMIOP_Endpoint-specific methods.
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index d2950755688..88ad0f33aa3 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -15,14 +15,14 @@ static const char prefix_[] = "shmiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void)
+TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory ()
   : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE),
     mmap_prefix_ (0),
     min_bytes_ (10*1024)        // @@ Nanbor, remove this magic number!!
 {
 }
 
-TAO_SHMIOP_Protocol_Factory::~TAO_SHMIOP_Protocol_Factory (void)
+TAO_SHMIOP_Protocol_Factory::~TAO_SHMIOP_Protocol_Factory ()
 {
   delete [] this->mmap_prefix_;
 }
@@ -47,7 +47,7 @@ TAO_SHMIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_SHMIOP_Protocol_Factory::make_acceptor (void)
+TAO_SHMIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_SHMIOP_Acceptor *acceptor = 0;
 
@@ -94,7 +94,7 @@ TAO_SHMIOP_Protocol_Factory::init (int argc,
 }
 
 TAO_Connector *
-TAO_SHMIOP_Protocol_Factory::make_connector (void)
+TAO_SHMIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
index f6eb29a88d5..bbcd712bc2e 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -36,10 +36,10 @@ class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory
 {
 public:
   /// Constructor.
-  TAO_SHMIOP_Protocol_Factory (void);
+  TAO_SHMIOP_Protocol_Factory ();
 
   /// Destructor.
-  virtual ~TAO_SHMIOP_Protocol_Factory (void);
+  virtual ~TAO_SHMIOP_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -61,8 +61,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 
@@ -70,7 +70,7 @@ public:
   void mmap_file_prefix (const ACE_TCHAR *prefix);
 
   /// Get mmap file prefix
-  const ACE_TCHAR *mmap_file_prefix (void);
+  const ACE_TCHAR *mmap_file_prefix ();
 
 private:
   /// Specify the prefix (full path) for mmap files
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index ca5cbea5c7a..2af43d55793 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -65,7 +65,7 @@ TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile (void)
+TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -81,7 +81,7 @@ TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile (void)
 }
 
 TAO_Endpoint*
-TAO_SHMIOP_Profile::endpoint (void)
+TAO_SHMIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
@@ -359,7 +359,7 @@ TAO_SHMIOP_Profile::to_string () const
 }
 
 const char *
-TAO_SHMIOP_Profile::prefix (void)
+TAO_SHMIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
@@ -395,7 +395,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_SHMIOP_Profile::encode_endpoints (void)
+TAO_SHMIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -449,7 +449,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_SHMIOP_Profile::decode_endpoints (void)
+TAO_SHMIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index fdf1f24a4b7..344f7f4a43e 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -48,7 +48,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
@@ -70,13 +70,13 @@ public:
   TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_SHMIOP_Profile (void);
+  ~TAO_SHMIOP_Profile ();
 
 
   /// Template methods, please see Profile.h for documentation.
   virtual char * to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -87,16 +87,14 @@ public:
   void add_endpoint (TAO_SHMIOP_Endpoint *endp);
 
 protected:
-
   /// Template methods. Please see tao/Profile.h for documentation.
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 private:
-
   /**
    * Head of this profile's list of endpoints.  This endpoint is not
    * dynamically allocated because a profile always contains at least
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 70834ff1af1..bacbceb99cb 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -24,18 +24,18 @@ TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handl
 {
 }
 
-TAO_SHMIOP_Transport::~TAO_SHMIOP_Transport (void)
+TAO_SHMIOP_Transport::~TAO_SHMIOP_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_SHMIOP_Transport::event_handler_i (void)
+TAO_SHMIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_SHMIOP_Transport::connection_handler_i (void)
+TAO_SHMIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -263,7 +263,6 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
 }
 
 
-
 int
 TAO_SHMIOP_Transport::send_request (TAO_Stub *stub,
                                     TAO_ORB_Core *orb_core,
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index a03ed6361c4..ce57615d10c 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -50,13 +50,12 @@ typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>
 class TAO_Strategies_Export TAO_SHMIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
                         TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_SHMIOP_Transport (void);
+  ~TAO_SHMIOP_Transport ();
 
 protected:
   /**
@@ -65,8 +64,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 2216712d8a4..3d1b80571b8 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
+TAO_UIOP_Acceptor::TAO_UIOP_Acceptor ()
   : TAO_Acceptor (TAO_TAG_UIOP_PROFILE),
     base_acceptor_ (this),
     creation_strategy_ (0),
@@ -29,7 +29,7 @@ TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
 {
 }
 
-TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
+TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -55,7 +55,6 @@ TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
     return this->create_shared_profile (object_key,
                                         mprofile,
                                         priority);
-
 }
 
 int
@@ -169,7 +168,7 @@ TAO_UIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_UIOP_Acceptor::close (void)
+TAO_UIOP_Acceptor::close ()
 {
   if (this->unlink_on_close_)
     {
@@ -335,7 +334,7 @@ TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr,
 }
 
 CORBA::ULong
-TAO_UIOP_Acceptor::endpoint_count (void)
+TAO_UIOP_Acceptor::endpoint_count ()
 {
   return 1;
 }
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index 1231f8fd0bc..498850744f3 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -46,10 +46,10 @@ public:
   // Create Acceptor object using addr.
 
   /// Create Acceptor object using addr.
-  TAO_UIOP_Acceptor (void);
+  TAO_UIOP_Acceptor ();
 
   /// Destructor
-  virtual ~TAO_UIOP_Acceptor (void);
+  virtual ~TAO_UIOP_Acceptor ();
 
   typedef TAO_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
   typedef TAO_Creation_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CREATION_STRATEGY;
@@ -73,13 +73,13 @@ public:
                             int version_major,
                             int version_minor,
                             const char *options = 0);
-  virtual int close (void);
+  virtual int close ();
   virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
   virtual int is_collocated (const TAO_Endpoint* endpoint);
-  virtual CORBA::ULong endpoint_count (void);
+  virtual CORBA::ULong endpoint_count ();
 
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
@@ -99,7 +99,7 @@ private:
 
   /// Obtains uiop properties that must be used by this acceptor, i.e.,
   /// initializes <uiop_properties_>.
-  int init_uiop_properties (void);
+  int init_uiop_properties ();
 
   /// Create a UIOP profile representing this acceptor.
   int create_new_profile (const TAO::ObjectKey &object_key,
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index e6638ac8f3f..b8ccf92b0a9 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -44,7 +44,7 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core
 }
 
 
-TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler (void)
+TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -137,13 +137,13 @@ TAO_UIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_UIOP_Connection_Handler::resume_handler (void)
+TAO_UIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_UIOP_Connection_Handler::close_connection (void)
+TAO_UIOP_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -205,13 +205,13 @@ TAO_UIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_UIOP_Connection_Handler::release_os_resources (void)
+TAO_UIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
 
 int
-TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_UIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_UNIX_Addr addr;
 
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index fd8079e5121..e829448dae3 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -43,16 +43,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Strategies_Export TAO_UIOP_Connection_Handler : public TAO_UIOP_SVC_HANDLER,
                                                           public TAO_Connection_Handler
 {
-
 public:
-
   TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
   TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_UIOP_Connection_Handler (void);
+  ~TAO_UIOP_Connection_Handler ();
 
   //@{
   /**
@@ -69,8 +67,8 @@ public:
   /** @name Event Handler overloads
    */
   virtual int open (void *);
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
+  virtual int resume_handler ();
+  virtual int close_connection ();
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -79,15 +77,14 @@ public:
   //@}
 
   /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
+  int add_transport_to_cache ();
 
 protected:
-
   //@{
   /**
    * @name TAO_Connection Handler overloads
    */
-  virtual int release_os_resources (void);
+  virtual int release_os_resources ();
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
   //@}
 };
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 5203ed8c22f..4e0fb62ff5e 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -19,14 +19,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIOP_Connector::TAO_UIOP_Connector (void)
+TAO_UIOP_Connector::TAO_UIOP_Connector ()
   : TAO_Connector (TAO_TAG_UIOP_PROFILE),
     connect_strategy_ (),
     base_connector_ (0)
 {
 }
 
-TAO_UIOP_Connector::~TAO_UIOP_Connector (void)
+TAO_UIOP_Connector::~TAO_UIOP_Connector ()
 {
 }
 
@@ -62,7 +62,7 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_UIOP_Connector::close (void)
+TAO_UIOP_Connector::close ()
 {
   // Zap the creation strategy that we created earlier.
   delete this->base_connector_.creation_strategy ();
@@ -306,7 +306,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIOP_Connector::make_profile (void)
+TAO_UIOP_Connector::make_profile ()
 {
   TAO_Profile *profile = 0;
   ACE_NEW_THROW_EX (profile,
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index c16b3a412fb..3d9a4c6df30 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -45,16 +45,15 @@ class TAO_Endpoint;
 class TAO_Strategies_Export TAO_UIOP_Connector : public TAO_Connector
 {
 public:
-
   /**
    * Constructor.
    * @@ Do we want to pass in the tag here or should it be statically
    * defined?
    */
-  TAO_UIOP_Connector (void);
+  TAO_UIOP_Connector ();
 
   /// Destructor
-  ~TAO_UIOP_Connector (void);
+  ~TAO_UIOP_Connector ();
 
   /**
    * @name The TAO_Connector Methods
@@ -63,7 +62,7 @@ public:
    */
   //@{
   int open (TAO_ORB_Core *orb_core);
-  int close (void);
+  int close ();
 
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -78,7 +77,6 @@ public:
   //@}
 
 public:
-
   typedef TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
           TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY;
 
@@ -94,7 +92,6 @@ public:
           TAO_UIOP_BASE_CONNECTOR;
 
 protected:
-
   /**
    * @name More TAO_Connector methods
    *
@@ -107,17 +104,15 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile *make_profile (void);
+  virtual TAO_Profile *make_profile ();
 
   //@}
 
 private:
-
   /// Return the remote endpoint, a helper function
   TAO_UIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
 private:
-
   /// Our connect strategy
   TAO_UIOP_CONNECT_STRATEGY connect_strategy_;
 
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
index c74b5e3468a..fff5aa8b3a7 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -19,17 +19,13 @@ TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
 {
 }
 
-TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (void)
+TAO_UIOP_Endpoint::TAO_UIOP_Endpoint ()
   : TAO_Endpoint (TAO_TAG_UIOP_PROFILE)
     , object_addr_ ()
     , next_ (0)
 {
 }
 
-TAO_UIOP_Endpoint::~TAO_UIOP_Endpoint (void)
-{
-}
-
 int
 TAO_UIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 {
@@ -42,13 +38,13 @@ TAO_UIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 }
 
 TAO_Endpoint *
-TAO_UIOP_Endpoint::next (void)
+TAO_UIOP_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_UIOP_Endpoint::duplicate (void)
+TAO_UIOP_Endpoint::duplicate ()
 {
   TAO_UIOP_Endpoint *endpoint = 0;
   ACE_NEW_RETURN (endpoint,
@@ -74,7 +70,7 @@ TAO_UIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_UIOP_Endpoint::hash (void)
+TAO_UIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h
index 06ec08810b0..80d8af174d1 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ b/TAO/tao/Strategies/UIOP_Endpoint.h
@@ -41,14 +41,14 @@ public:
   friend class TAO_UIOP_Profile;
 
   /// Default constructor.
-  TAO_UIOP_Endpoint (void);
+  TAO_UIOP_Endpoint ();
 
   /// Constructor.
   TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
                      CORBA::Short priority = TAO_INVALID_PRIORITY);
 
   /// Destructor.
-  ~TAO_UIOP_Endpoint (void);
+  ~TAO_UIOP_Endpoint () = default;
 
   /**
    * @name TAO_Endpoint Methods
@@ -56,16 +56,16 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  virtual TAO_Endpoint *next (void);
+  virtual TAO_Endpoint *next ();
   virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
+  virtual TAO_Endpoint *duplicate ();
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent if their rendezvous points are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
+  virtual CORBA::ULong hash ();
   //@}
 
   // = UIOP_Endpoint-specific methods.
@@ -78,7 +78,6 @@ public:
   const char *rendezvous_point () const;
 
 private:
-
   /// Cached instance of <ACE_UNIX_Addr> for use in making
   /// invocations, etc.
   ACE_UNIX_Addr object_addr_;
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index 05bd45b381f..e7b004e9899 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -12,12 +12,12 @@ static const char prefix_[] = "uiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
+TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE)
 {
 }
 
-TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory (void)
+TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory ()
 {
 }
 
@@ -41,7 +41,7 @@ TAO_UIOP_Protocol_Factory::options_delimiter () const
 }
 
 TAO_Acceptor *
-TAO_UIOP_Protocol_Factory::make_acceptor (void)
+TAO_UIOP_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -59,7 +59,7 @@ TAO_UIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 }
 
 TAO_Connector *
-TAO_UIOP_Protocol_Factory::make_connector (void)
+TAO_UIOP_Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
 
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
index 6aa7f179bc4..3d0535e5f6b 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -35,10 +35,10 @@ class TAO_Strategies_Export TAO_UIOP_Protocol_Factory : public TAO_Protocol_Fact
 {
 public:
   /// Constructor.
-  TAO_UIOP_Protocol_Factory (void);
+  TAO_UIOP_Protocol_Factory ();
 
   /// Destructor.
-  virtual ~TAO_UIOP_Protocol_Factory (void);
+  virtual ~TAO_UIOP_Protocol_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -60,8 +60,8 @@ public:
    * Check Protocol_Factory.h for a description of these methods.
    */
   //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
+  virtual TAO_Acceptor  *make_acceptor ();
+  virtual TAO_Connector *make_connector  ();
   virtual int requires_explicit_endpoint () const;
   //@}
 };
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 3179089b4ec..0280b6ee4e7 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -64,7 +64,7 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
+TAO_UIOP_Profile::~TAO_UIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -272,7 +272,7 @@ TAO_UIOP_Profile::to_string () const
 }
 
 const char *
-TAO_UIOP_Profile::prefix (void)
+TAO_UIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
@@ -340,7 +340,7 @@ TAO_UIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_UIOP_Profile::encode_endpoints (void)
+TAO_UIOP_Profile::encode_endpoints ()
 {
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
@@ -374,7 +374,7 @@ TAO_UIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_UIOP_Profile::decode_endpoints (void)
+TAO_UIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index baa42e7b683..6bd8fdea123 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -50,7 +50,7 @@ public:
   virtual char object_key_delimiter () const;
 
   /// Return the char string prefix.
-  static const char *prefix (void);
+  static const char *prefix ();
 
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.  (actually, no marshalling for this protocol)
@@ -70,12 +70,12 @@ public:
   TAO_UIOP_Profile (TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_UIOP_Profile (void);
+  ~TAO_UIOP_Profile ();
 
   /// Template methods. Please see Profile.h for documentation.
   virtual char *to_string () const;
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
+  virtual int encode_endpoints ();
+  virtual TAO_Endpoint *endpoint ();
   virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
@@ -86,13 +86,12 @@ public:
   void add_endpoint (TAO_UIOP_Endpoint *endp);
 
 protected:
-
   /// Protected template methods. Please see documentation in
   /// Profile.h for details.
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 private:
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 62bb3514b6e..ff778763cc3 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -23,18 +23,18 @@ TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
 {
 }
 
-TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
+TAO_UIOP_Transport::~TAO_UIOP_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_UIOP_Transport::event_handler_i (void)
+TAO_UIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_UIOP_Transport::connection_handler_i (void)
+TAO_UIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index 9e1454efb2f..f44aa3a7196 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -48,13 +48,12 @@ typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
 class TAO_Strategies_Export TAO_UIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
                       TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_UIOP_Transport (void);
+  ~TAO_UIOP_Transport ();
 
 protected:
   /** @name Overridden Template Methods
@@ -62,9 +61,8 @@ protected:
    * These are implementations of template methods declared by TAO_Transport.
    */
   //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
+  virtual ACE_Event_Handler * event_handler_i ();
+  virtual TAO_Connection_Handler *connection_handler_i ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (iovec *iov, int iovcnt,
@@ -93,7 +91,6 @@ public:
   //@}
 
 private:
-
   /// The connection service handler used for accessing lower layer
   /// communication protocols.
   TAO_UIOP_Connection_Handler *connection_handler_;
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 0abba74c236..72a37aaaea1 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -41,9 +41,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
+TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer ()
 {
-
   TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory");
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory);
 
@@ -68,7 +67,7 @@ TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 #endif /* TAO_HAS_SCIOP == 1 */
 }
 
-TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
+TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory ()
   : reactor_type_ (TAO_DEFAULT_REACTOR_TYPE),
     threadqueue_type_ (TAO_THREAD_QUEUE_NOT_SET),
     cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
@@ -78,7 +77,7 @@ TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
   // Constructor
 }
 
-TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory (void)
+TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory ()
 {
   // Destructor
   TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
@@ -134,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"))))
@@ -303,7 +301,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-TAO_Advanced_Resource_Factory::load_default_protocols (void)
+TAO_Advanced_Resource_Factory::load_default_protocols ()
 {
   int const r =
     this->TAO_Default_Resource_Factory::load_default_protocols ();
@@ -322,7 +320,7 @@ TAO_Advanced_Resource_Factory::load_default_protocols (void)
 
 
 int
-TAO_Advanced_Resource_Factory::init_protocol_factories (void)
+TAO_Advanced_Resource_Factory::init_protocol_factories ()
 {
   // If the default resource factory exists, then disable it.
   // This causes any directives for the "Resource_Factory" to
@@ -377,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++)
@@ -406,9 +403,8 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
 }
 
 
-
 TAO_ProtocolFactorySet *
-TAO_Advanced_Resource_Factory::get_protocol_factories (void)
+TAO_Advanced_Resource_Factory::get_protocol_factories ()
 {
   return &protocol_factories_;
 }
@@ -504,7 +500,7 @@ typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC;
 typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR;
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void)
+TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->cdr_allocator_type_)
@@ -523,7 +519,7 @@ TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
+TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->cdr_allocator_type_)
@@ -541,7 +537,7 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator (void)
+TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->cdr_allocator_type_)
@@ -560,7 +556,7 @@ TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::amh_response_handler_allocator (void)
+TAO_Advanced_Resource_Factory::amh_response_handler_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->amh_response_handler_allocator_lock_type_)
@@ -579,7 +575,7 @@ TAO_Advanced_Resource_Factory::amh_response_handler_allocator (void)
 }
 
 ACE_Allocator *
-TAO_Advanced_Resource_Factory::ami_response_handler_allocator (void)
+TAO_Advanced_Resource_Factory::ami_response_handler_allocator ()
 {
   ACE_Allocator *allocator = 0;
   switch (this->ami_response_handler_allocator_lock_type_)
@@ -598,13 +594,13 @@ TAO_Advanced_Resource_Factory::ami_response_handler_allocator (void)
 }
 
 int
-TAO_Advanced_Resource_Factory::input_cdr_allocator_type_locked (void)
+TAO_Advanced_Resource_Factory::input_cdr_allocator_type_locked ()
 {
   return this->cdr_allocator_type_ == TAO_ALLOCATOR_NULL_LOCK ? 0 : 1;
 }
 
 TAO_Connection_Purging_Strategy *
-TAO_Advanced_Resource_Factory::create_purging_strategy (void)
+TAO_Advanced_Resource_Factory::create_purging_strategy ()
 {
   TAO_Connection_Purging_Strategy *strategy = 0;
 
@@ -645,7 +641,7 @@ TAO_Advanced_Resource_Factory::create_purging_strategy (void)
 }
 
 TAO_LF_Strategy *
-TAO_Advanced_Resource_Factory::create_lf_strategy (void)
+TAO_Advanced_Resource_Factory::create_lf_strategy ()
 {
   TAO_LF_Strategy *strategy = 0;
 
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index e09dd3c0038..db940110e70 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -19,7 +19,7 @@ class TAO_Connection_Purging_Strategy;
 class TAO_Strategies_Export TAO_Resource_Factory_Changer
 {
 public:
-  TAO_Resource_Factory_Changer (void);
+  TAO_Resource_Factory_Changer ();
 };
 
 /**
@@ -37,10 +37,10 @@ class TAO_Strategies_Export TAO_Advanced_Resource_Factory :
 {
 public:
   /// Constructor.
-  TAO_Advanced_Resource_Factory (void);
+  TAO_Advanced_Resource_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Advanced_Resource_Factory (void);
+  virtual ~TAO_Advanced_Resource_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -84,21 +84,20 @@ public:
    * @name Resource Retrieval
    */
   //@{
-  virtual int init_protocol_factories (void);
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* input_cdr_msgblock_allocator (void);
-  virtual ACE_Allocator* amh_response_handler_allocator (void);
-  virtual ACE_Allocator* ami_response_handler_allocator (void);
-  virtual int input_cdr_allocator_type_locked (void);
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
+  virtual int init_protocol_factories ();
+  virtual ACE_Allocator* input_cdr_dblock_allocator ();
+  virtual ACE_Allocator* input_cdr_buffer_allocator ();
+  virtual ACE_Allocator* input_cdr_msgblock_allocator ();
+  virtual ACE_Allocator* amh_response_handler_allocator ();
+  virtual ACE_Allocator* ami_response_handler_allocator ();
+  virtual int input_cdr_allocator_type_locked ();
+  virtual TAO_ProtocolFactorySet *get_protocol_factories ();
   //@}
 
-  virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
-  virtual TAO_LF_Strategy *create_lf_strategy (void);
+  virtual TAO_Connection_Purging_Strategy *create_purging_strategy ();
+  virtual TAO_LF_Strategy *create_lf_strategy ();
 
 protected:
-
   /// Obtain the reactor implementation
   virtual ACE_Reactor_Impl *allocate_reactor_impl () const;
 
@@ -126,8 +125,7 @@ protected:
   /// Type of lock used by AMI response handler allocator.
   Allocator_Lock_Type ami_response_handler_allocator_lock_type_;
 
-  virtual int load_default_protocols (void);
-
+  virtual int load_default_protocols ();
 };
 
 static TAO_Resource_Factory_Changer TAO_changer;
diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h
index d0a2d3c9f1d..eb8505fb697 100644
--- a/TAO/tao/String_Const_Sequence_Element_T.h
+++ b/TAO/tao/String_Const_Sequence_Element_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename traits>
 class string_const_sequence_element
 {
@@ -42,9 +41,7 @@ public:
   {
   }
 
-  ~string_const_sequence_element()
-  {
-  }
+  ~string_const_sequence_element() = default;
 
   inline operator const_value_type() const
   {
@@ -70,7 +67,6 @@ private:
   const_value_type const * element_;
   CORBA::Boolean const release_;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h
index 1905bba57ad..d0aabbb4343 100644
--- a/TAO/tao/String_Sequence_Element_T.h
+++ b/TAO/tao/String_Sequence_Element_T.h
@@ -19,7 +19,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename traits>
 class string_sequence_element
 {
@@ -57,9 +56,7 @@ public:
   {
   }
 
-  ~string_sequence_element()
-  {
-  }
+  ~string_sequence_element() = default;
 
   string_sequence_element & operator=(const_value_type rhs)
   {
@@ -105,7 +102,6 @@ public:
   }
 
   inline string_out out () const {
-
     if (release())
       {
         traits::release(*element_);
@@ -139,7 +135,6 @@ private:
   value_type * element_;
   CORBA::Boolean release_;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/String_Traits_Base_T.h b/TAO/tao/String_Traits_Base_T.h
index 3f6b63454e1..d750ddd1f7e 100644
--- a/TAO/tao/String_Traits_Base_T.h
+++ b/TAO/tao/String_Traits_Base_T.h
@@ -27,7 +27,6 @@ class String_out;
 
 namespace details
 {
-
 template<typename charT>
 struct string_traits_base
 {
@@ -101,7 +100,6 @@ struct string_traits_base<CORBA::WChar>
     return CORBA::wstring_alloc (len);
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h
index d34fb03b959..3140ce3edca 100644
--- a/TAO/tao/String_Traits_T.h
+++ b/TAO/tao/String_Traits_T.h
@@ -20,7 +20,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename char_type, class derived>
 struct string_traits_decorator
 {
@@ -77,7 +76,6 @@ struct string_traits
   , public string_traits_decorator<charT,string_traits<charT,dummy> >
 {
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index feaf10c6ce2..75199865edb 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -271,15 +271,14 @@ public:
   bool forwarded_on_exception () const;
 
 protected:
-
   /// Destructor is to be called only through _decr_refcnt() to
   /// enforce proper reference counting.
   virtual ~TAO_Stub ();
 
-  /// NON-THREAD SAFE version of reset_profiles (void);
+  /// NON-THREAD SAFE version of reset_profiles ();
   void reset_profiles_i ();
 
-  /// NON-THREAD SAFE version of next_profile (void)
+  /// NON-THREAD SAFE version of next_profile ()
   TAO_Profile *next_profile_i ();
 
 private:
@@ -306,7 +305,6 @@ private:
   int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info);
 
 private:
-
   // = Disallow copy construction and assignment.
   TAO_Stub (const TAO_Stub &);
   TAO_Stub &operator = (const TAO_Stub &);
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index b02fff98755..30c4653160b 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-TAO_Stub::reset_base (void)
+TAO_Stub::reset_base ()
 {
   this->base_profiles_.rewind ();
   this->profile_success_ = false;
@@ -21,7 +21,7 @@ TAO_Stub::profile_lock () const
 }
 
 ACE_INLINE void
-TAO_Stub::reset_forward (void)
+TAO_Stub::reset_forward ()
 {
   while (this->forward_profiles_ != 0
          && this->forward_profiles_ != this->forward_profiles_perm_) // Disturbingly the permanent
@@ -31,7 +31,7 @@ TAO_Stub::reset_forward (void)
 }
 
 ACE_INLINE void
-TAO_Stub::reset_profiles_i (void)
+TAO_Stub::reset_profiles_i ()
 {
   this->reset_forward ();
   this->reset_base ();
@@ -49,7 +49,7 @@ TAO_Stub::reset_profiles_i (void)
 }
 
 ACE_INLINE void
-TAO_Stub::reset_profiles (void)
+TAO_Stub::reset_profiles ()
 {
   ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
@@ -66,13 +66,13 @@ TAO_Stub::reset_profiles (void)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_Stub::profile_in_use (void)
+TAO_Stub::profile_in_use ()
 {
   return this->profile_in_use_;
 }
 
 ACE_INLINE TAO_MProfile *
-TAO_Stub::make_profiles (void)
+TAO_Stub::make_profiles ()
 {
   TAO_MProfile *mp = 0;
 
@@ -84,7 +84,7 @@ TAO_Stub::make_profiles (void)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_Stub::next_forward_profile (void)
+TAO_Stub::next_forward_profile ()
 {
   TAO_Profile *pfile_next = 0;
 
@@ -99,7 +99,7 @@ TAO_Stub::next_forward_profile (void)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_Stub::next_profile_i (void)
+TAO_Stub::next_profile_i ()
 {
   TAO_Profile *pfile_next = 0;
 
@@ -181,7 +181,7 @@ TAO_Stub::next_profile_i (void)
 }
 
 ACE_INLINE TAO_Profile *
-TAO_Stub::next_profile (void)
+TAO_Stub::next_profile ()
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
@@ -196,13 +196,13 @@ TAO_Stub::next_profile (void)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Stub::valid_forward_profile (void)
+TAO_Stub::valid_forward_profile ()
 {
   return (this->profile_success_ && this->forward_profiles_);
 }
 
 ACE_INLINE void
-TAO_Stub::set_valid_profile (void)
+TAO_Stub::set_valid_profile ()
 {
   this->profile_success_ = true;
 }
@@ -240,7 +240,7 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Stub::next_profile_retry (void)
+TAO_Stub::next_profile_retry ()
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
@@ -280,7 +280,7 @@ TAO_Stub::base_profiles () const
 }
 
 ACE_INLINE TAO_MProfile&
-TAO_Stub::base_profiles (void)
+TAO_Stub::base_profiles ()
 {
   return this->base_profiles_;
 }
@@ -292,7 +292,7 @@ TAO_Stub::forward_profiles () const
 }
 
 ACE_INLINE TAO_MProfile *
-TAO_Stub::forward_profiles (void)
+TAO_Stub::forward_profiles ()
 {
   return this->forward_profiles_;
 }
@@ -310,14 +310,14 @@ TAO_Stub::orb_core () const
 }
 
 ACE_INLINE CORBA::ORB_var &
-TAO_Stub::servant_orb_var (void)
+TAO_Stub::servant_orb_var ()
 {
   // Simply pass back the ORB pointer for temporary use.
   return this->servant_orb_;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-TAO_Stub::servant_orb_ptr (void)
+TAO_Stub::servant_orb_ptr ()
 {
   // Simply pass back the ORB pointer for temporary use.
   return CORBA::ORB::_duplicate (this->servant_orb_.in ());
@@ -354,7 +354,7 @@ TAO_Stub::object_proxy_broker (TAO::Object_Proxy_Broker * object_proxy_broker)
 }
 
 ACE_INLINE void
-TAO_Stub::destroy (void)
+TAO_Stub::destroy ()
 {
   // The reference count better be zero at this point!
   delete this;
@@ -367,7 +367,7 @@ TAO_Stub::optimize_collocation_objects () const
 }
 
 ACE_INLINE TAO::Transport_Queueing_Strategy *
-TAO_Stub::transport_queueing_strategy (void)
+TAO_Stub::transport_queueing_strategy ()
 {
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
@@ -398,14 +398,14 @@ bool TAO_Stub::forwarded_on_exception () const
 
 ACE_INLINE
 void
-TAO_Stub::_incr_refcnt (void)
+TAO_Stub::_incr_refcnt ()
 {
   ++this->refcount_;
 }
 
 ACE_INLINE
 void
-TAO_Stub::_decr_refcnt (void)
+TAO_Stub::_decr_refcnt ()
 {
   if (--this->refcount_ == 0)
     delete this;
@@ -436,7 +436,7 @@ TAO_Stub_Auto_Ptr::get () const
 }
 
 ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::release (void)
+TAO_Stub_Auto_Ptr::release ()
 {
   ACE_TRACE ("TAO_Stub_Auto_Ptr::release");
   TAO_Stub *old = this->p_;
@@ -479,7 +479,7 @@ TAO_Stub_Auto_Ptr::operator= (TAO_Stub_Auto_Ptr &rhs)
 }
 
 ACE_INLINE
-TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void)
+TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr ()
 {
   ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr");
   if (this->get() != nullptr)
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
index b5c84d6a356..ae4534d1b39 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -48,7 +48,7 @@ class TAO_Export TAO_Stub_Factory : public ACE_Service_Object
 {
 public:
   /// Destructor.
-  virtual ~TAO_Stub_Factory (void);
+  virtual ~TAO_Stub_Factory ();
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
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 d7fdc168986..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);
-
   };
 
   /**
@@ -186,7 +185,6 @@ namespace TAO
     Invocation_Base * const invocation_;
     Invocation_Status status_;
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
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/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index f7fdb843f84..78f4622e327 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -57,7 +57,7 @@ public:
                             bool is_heap_allocated = false);
 
   /// Destructor
-  virtual ~TAO_Synch_Queued_Message (void);
+  virtual ~TAO_Synch_Queued_Message ();
 
   const ACE_Message_Block *current_block () const;
 
@@ -69,7 +69,7 @@ public:
   virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const;
   virtual void bytes_transferred (size_t &byte_count);
   virtual TAO_Queued_Message *clone (ACE_Allocator *alloc);
-  virtual void destroy (void);
+  virtual void destroy ();
   virtual void copy_if_necessary (const ACE_Message_Block* chain);
   //@}
 
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index 78b73221a11..fd43063fe20 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -42,23 +42,22 @@ class TAO_Export TAO_Synch_Reply_Dispatcher
   : public TAO_Reply_Dispatcher
   , public TAO_LF_Invocation_Event
 {
-
 public:
   /// Constructor.
   TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core,
                               IOP::ServiceContextList &sc);
 
   /// Destructor.
-  virtual ~TAO_Synch_Reply_Dispatcher (void);
+  virtual ~TAO_Synch_Reply_Dispatcher ();
 
   /// Return the reply CDR.
-  TAO_InputCDR &reply_cdr (void);
+  TAO_InputCDR &reply_cdr ();
 
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
 
-  virtual void reply_timed_out (void);
+  virtual void reply_timed_out ();
 
 protected:
   /// The service context list
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 486f1cf2eed..f8aa2c5beec 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -912,7 +912,7 @@ TAO::excp_factory excp_array [] = {
 
 // Concrete SystemException constructors
 #define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::name ::name (void) \
+CORBA::name ::name () \
   :  CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
                              #name, \
                              0, \
@@ -989,7 +989,7 @@ STANDARD_EXCEPTION_LIST
 
 #define TAO_SYSTEM_EXCEPTION(name) \
 CORBA::SystemException * \
-CORBA::name ::_tao_create (void) \
+CORBA::name ::_tao_create () \
 { \
   CORBA::name *result = 0; \
   ACE_NEW_RETURN (result, CORBA::name (), 0); \
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 10ffd265862..1aeb7636e07 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -26,12 +26,6 @@
 
 #include "tao/Exception.h"
 
-#ifndef TAO_Exception_Export
-#  define TAO_Exception_Export ACE_Proper_Export_Flag
-# else
-#  define TAO_Exception_Export TAO_Export
-#endif  /* !TAO_Exception_Export */
-
 #ifdef THREAD_CANCELLED
 # undef THREAD_CANCELLED
 #endif /* THREAD_CANCELLED */
@@ -86,7 +80,6 @@ namespace CORBA
   class TAO_Export SystemException : public Exception
   {
   public:
-
     /// Copy constructor.
     /**
      * @note This constructor should be protected, but VC7.1 at
@@ -146,7 +139,6 @@ namespace CORBA
     virtual CORBA::Exception *_tao_duplicate () const;
 
   protected:
-
     /// Default constructor.
     SystemException ();
 
@@ -181,10 +173,10 @@ namespace CORBA
   // inside the ORB.  All minor codes should be symbolically catalogued.
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-    class TAO_Exception_Export name : public SystemException \
+    class TAO_Export name : public SystemException \
     { \
     public: \
-      name (void); \
+      name (); \
       name (CORBA::ULong code, \
             CORBA::CompletionStatus completed); \
       static name * _downcast (CORBA::Exception* exception); \
@@ -193,7 +185,7 @@ namespace CORBA
       virtual CORBA::TypeCode_ptr _tao_type () const; \
       static void _tao_any_destructor (void*); \
       virtual CORBA::Exception *_tao_duplicate () const; \
-      static CORBA::SystemException *_tao_create (void); \
+      static CORBA::SystemException *_tao_create (); \
     }; \
 
   TAO_SYSTEM_EXCEPTION(UNKNOWN)          // the unknown exception
diff --git a/TAO/tao/System_Time_Policy_Strategy.h b/TAO/tao/System_Time_Policy_Strategy.h
index b8b52470f0c..c5a7fd76d72 100644
--- a/TAO/tao/System_Time_Policy_Strategy.h
+++ b/TAO/tao/System_Time_Policy_Strategy.h
@@ -41,11 +41,11 @@ class TAO_Export TAO_System_Time_Policy_Strategy
 public:
   virtual ~TAO_System_Time_Policy_Strategy ();
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void);
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy ();
 
 private:
   static ACE_Time_Policy_T<ACE_System_Time_Policy>  time_policy_;
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 2bdb10bdcbe..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
       {
@@ -572,7 +571,6 @@ namespace
                            bool skip_service_config_open,
                            bool ignore_default_svc_conf_file)
   {
-
     if (skip_service_config_open)
       {
         return 0;
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/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index db1720972d3..b29202db42d 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -80,7 +80,6 @@ class TAO_Operation_Details;
 class TAO_Export TAO_ServerRequest
 {
 public:
-
   /// Declare FW_Server_Request_Wrapper a friend
   /// This friendship makes the FW_Server_Request_Wrapper be able to
   /// clone the TAO_ServerRequest.
diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl
index 8b9a1519556..b7feb853996 100644
--- a/TAO/tao/TAO_Server_Request.inl
+++ b/TAO/tao/TAO_Server_Request.inl
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // This constructor is used by the CSD clone.
 ACE_INLINE
-TAO_ServerRequest::TAO_ServerRequest (void)
+TAO_ServerRequest::TAO_ServerRequest ()
   : mesg_base_ (0),
     operation_ (0),
     operation_len_ (0),
@@ -98,7 +98,7 @@ TAO_ServerRequest::response_expected (CORBA::Boolean response)
 }
 
 ACE_INLINE void
-TAO_ServerRequest::sync_before_dispatch (void)
+TAO_ServerRequest::sync_before_dispatch ()
 {
   if (this->sync_with_server_ &&
       this->transport_ != 0 &&
@@ -109,7 +109,7 @@ TAO_ServerRequest::sync_before_dispatch (void)
 }
 
 ACE_INLINE void
-TAO_ServerRequest::sync_after_dispatch (void)
+TAO_ServerRequest::sync_after_dispatch ()
 {
   if (this->sync_with_server_ &&
       this->transport_ != 0 &&
@@ -144,37 +144,37 @@ TAO_ServerRequest::is_queued (CORBA::Boolean queued_flag)
 }
 
 ACE_INLINE TAO::ObjectKey &
-TAO_ServerRequest::object_key (void)
+TAO_ServerRequest::object_key ()
 {
   return this->profile_.object_key ();
 }
 
 ACE_INLINE TAO_Service_Context &
-TAO_ServerRequest::request_service_context (void)
+TAO_ServerRequest::request_service_context ()
 {
   return this->request_service_context_;
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_ServerRequest::reply_service_info (void)
+TAO_ServerRequest::reply_service_info ()
 {
   return this->reply_service_context ().service_info ();
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_ServerRequest::request_service_info (void)
+TAO_ServerRequest::request_service_info ()
 {
   return this->request_service_context ().service_info ();
 }
 
 ACE_INLINE TAO_Transport *
-TAO_ServerRequest::transport (void)
+TAO_ServerRequest::transport ()
 {
   return this->transport_.get ();
 }
 
 ACE_INLINE CORBA::ULong
-TAO_ServerRequest::request_id (void)
+TAO_ServerRequest::request_id ()
 {
   return this->request_id_;
 }
@@ -192,7 +192,7 @@ TAO_ServerRequest::requesting_principal (const CORBA::OctetSeq &principal)
 }
 
 ACE_INLINE TAO_Tagged_Profile &
-TAO_ServerRequest::profile (void)
+TAO_ServerRequest::profile ()
 {
   return this->profile_;
 }
@@ -206,7 +206,7 @@ TAO_ServerRequest::forward_location (CORBA::Object_ptr forward_reference)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ServerRequest::forward_location (void)
+TAO_ServerRequest::forward_location ()
 {
   return CORBA::Object::_duplicate (this->forward_location_.in ());
 }
@@ -218,7 +218,7 @@ TAO_ServerRequest::is_forwarded () const
 }
 
 ACE_INLINE GIOP::ReplyStatusType
-TAO_ServerRequest::reply_status (void)
+TAO_ServerRequest::reply_status ()
 {
   return this->reply_status_;
 }
@@ -230,7 +230,7 @@ TAO_ServerRequest::reply_status (GIOP::ReplyStatusType reply_status)
 }
 
 ACE_INLINE void
-TAO_ServerRequest::is_dsi (void)
+TAO_ServerRequest::is_dsi ()
 {
   this->is_dsi_ = true;
 }
@@ -248,7 +248,7 @@ TAO_ServerRequest::dsi_nvlist_align (ptrdiff_t alignment)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_ServerRequest::argument_flag (void)
+TAO_ServerRequest::argument_flag ()
 {
   return this->argument_flag_;
 }
@@ -268,13 +268,13 @@ TAO_ServerRequest::collocated () const
 
 #if TAO_HAS_INTERCEPTORS == 1
 ACE_INLINE size_t &
-TAO_ServerRequest::interceptor_count (void)
+TAO_ServerRequest::interceptor_count ()
 {
   return this->interceptor_count_;
 }
 
 ACE_INLINE CORBA::Exception *
-TAO_ServerRequest::caught_exception (void)
+TAO_ServerRequest::caught_exception ()
 {
   return this->caught_exception_;
 }
@@ -286,7 +286,7 @@ TAO_ServerRequest::pi_reply_status (PortableInterceptor::ReplyStatus s)
 }
 
 ACE_INLINE PortableInterceptor::ReplyStatus
-TAO_ServerRequest::pi_reply_status (void)
+TAO_ServerRequest::pi_reply_status ()
 {
   return this->pi_reply_status_;
 }
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
index 58d96602e2e..f5c235ae8fa 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -22,7 +22,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE, class ACE_LOCK> void
-TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
+TAO_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::dump");
@@ -34,13 +34,13 @@ TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
 }
 
 template <class TYPE, class ACE_LOCK> TAO_Singleton<TYPE, ACE_LOCK> *&
-TAO_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+TAO_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
   return TAO_Singleton<TYPE, ACE_LOCK>::singleton_;
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-TAO_Singleton<TYPE, ACE_LOCK>::instance (void)
+TAO_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::instance");
 
@@ -118,7 +118,7 @@ template <class TYPE, class ACE_LOCK> TAO_TSS_Singleton<TYPE, ACE_LOCK> *
 TAO_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 
 template <class TYPE, class ACE_LOCK> void
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump");
@@ -130,13 +130,13 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 }
 
 template <class TYPE, class ACE_LOCK> TAO_TSS_Singleton<TYPE, ACE_LOCK> *&
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
   return TAO_TSS_Singleton<TYPE, ACE_LOCK>::singleton_;
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance");
 
diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h
index a4563cb3c81..4a55e38443e 100644
--- a/TAO/tao/TAO_Singleton.h
+++ b/TAO/tao/TAO_Singleton.h
@@ -44,7 +44,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class TYPE, class ACE_LOCK>
 class TAO_Singleton : public ACE_Cleanup
 {
-
 public:
   /// Global access point to the Singleton.
   static TYPE *instance ();
diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl
index 530fc7ce38c..5bf773cd6ae 100644
--- a/TAO/tao/TAO_Singleton.inl
+++ b/TAO/tao/TAO_Singleton.inl
@@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // have a default constructor.  Let the compiler figure it out . . .
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton (void)
+TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton ()
 {
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void)
+TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton ()
 {
 }
 
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index e00a42fc9b8..be2c6bf30c4 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -48,7 +48,7 @@ class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base
 {
 public:
   /// Explicitly initialize.
-  virtual int init (void);
+  virtual int init ();
 
   /**
    * Explicitly initialize the TAO_Singleton_Manager, in addition to
@@ -64,24 +64,24 @@ public:
    * Returns 1 before the TAO_Singleton_Manager has been constructed.
    * See ACE_Object_Manager::starting_up for more information.
    */
-  static int starting_up (void);
+  static int starting_up ();
 
   /// Returns 1 after the TAO_Singleton_Manager has been destroyed.
   /// See ACE_Object_Manager::shutting_down for more information.
-  static int shutting_down (void);
+  static int shutting_down ();
 
   /// Accesses a default signal set used, for example, in
   /// ACE_Sig_Guard methods.
-  static sigset_t *default_mask (void);
+  static sigset_t *default_mask ();
 
   /// Returns the current thread hook for the process.
-  static ACE_Thread_Hook *thread_hook (void);
+  static ACE_Thread_Hook *thread_hook ();
 
   /// Returns the existing thread hook and assign a new_thread_hook.
   static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *new_thread_hook);
 
   /// Accessor to singleton instance.
-  static TAO_Singleton_Manager *instance (void);
+  static TAO_Singleton_Manager *instance ();
 
   /// Register an ACE_Cleanup object for cleanup at process
   /// termination.
@@ -117,11 +117,10 @@ public:
                       const char* name);
 
 protected:
-
   /// Force allocation on the heap.
   //@{
-  TAO_Singleton_Manager (void);
-  ~TAO_Singleton_Manager (void);
+  TAO_Singleton_Manager ();
+  ~TAO_Singleton_Manager ();
   //@}
 
 private:
@@ -152,7 +151,6 @@ private:
   /// Lock that is used to guard internal structures.
   TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_;
 #endif /* ACE_MT_SAFE */
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index 645a612fe9c..eb2b7950d44 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -45,7 +45,6 @@ namespace TAO
 class TAO_Export TAO_TSS_Resources
 {
 public:
-
   /// Constructor
   TAO_TSS_Resources ();
 
@@ -56,7 +55,6 @@ public:
   static TAO_TSS_Resources * instance ();
 
 private:
-
   /// Do not copy TSS resources
   //@{
   TAO_TSS_Resources (const TAO_TSS_Resources&);
@@ -64,7 +62,6 @@ private:
   //@}
 
 public:
-
   /**
    * Points to structure containing state for the current upcall
    * context in this thread.  Note that it does not come from the
diff --git a/TAO/tao/Tagged_Components.inl b/TAO/tao/Tagged_Components.inl
index 00332ee2d49..36547daa148 100644
--- a/TAO/tao/Tagged_Components.inl
+++ b/TAO/tao/Tagged_Components.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Tagged_Components::TAO_Tagged_Components (void)
+TAO_Tagged_Components::TAO_Tagged_Components ()
   :  orb_type_ (0),
      orb_type_set_ (0),
      code_sets_set_ (0)
@@ -71,7 +71,7 @@ TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const
 }
 
 ACE_INLINE IOP::MultipleComponentProfile&
-TAO_Tagged_Components::components (void)
+TAO_Tagged_Components::components ()
 {
   return this->components_;
 }
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index 0b41fc1ec9c..978c87d8bff 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -42,7 +42,6 @@ namespace TAO
 class TAO_Export TAO_Tagged_Profile
 {
 public:
-
   /// Declare FW_Server_Request_Wrapper a friend
   /// This friendship makes the FW_Server_Request_Wrapper be able to
   /// clone the TAO_Tagged_Profile data member in TAO_ServerRequest.
diff --git a/TAO/tao/Tagged_Profile.inl b/TAO/tao/Tagged_Profile.inl
index 683ead394da..1122f0402eb 100644
--- a/TAO/tao/Tagged_Profile.inl
+++ b/TAO/tao/Tagged_Profile.inl
@@ -15,7 +15,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
 }
 
 ACE_INLINE TAO::ObjectKey &
-TAO_Tagged_Profile::object_key (void)
+TAO_Tagged_Profile::object_key ()
 {
   if (!this->object_key_extracted_)
     this->object_key_extracted_ = this->extract_object_key (this->profile_);
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index eed52ccf519..86a789e535b 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -76,7 +76,6 @@ public:
 
   /// @name Accessors
   //@{
-
   TAO_Acceptor_Registry &acceptor_registry ();
 
   /**
@@ -147,7 +146,6 @@ public:
   //@}
 
 private:
-
   /// Checks if the acceptor registry has been created.
   int has_acceptor_registry_been_created () const;
 
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index eb9f72a05f6..2f509154f6d 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -99,7 +99,6 @@ public:
   /// Factory method.
   virtual TAO_Thread_Lane_Resources_Manager *
   create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
index 2979579e685..62d3937c40d 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -44,7 +44,7 @@ public:
   TAO_Thread_Per_Connection_Handler (TAO_Connection_Handler *ch,
                                      TAO_ORB_Core *oc);
 
-  ~TAO_Thread_Per_Connection_Handler (void);
+  ~TAO_Thread_Per_Connection_Handler ();
 
   /// Template hook method that the thread uses...
   /**
diff --git a/TAO/tao/Time_Policy_Manager.h b/TAO/tao/Time_Policy_Manager.h
index ab665a8221a..20ba14c27ba 100644
--- a/TAO/tao/Time_Policy_Manager.h
+++ b/TAO/tao/Time_Policy_Manager.h
@@ -51,7 +51,7 @@ public:
   /// Parse svc.conf arguments
   int parse_args (int argc, ACE_TCHAR* argv[]);
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
diff --git a/TAO/tao/Time_Policy_Strategy.h b/TAO/tao/Time_Policy_Strategy.h
index e9e5aaef573..2322ffa5a2e 100644
--- a/TAO/tao/Time_Policy_Strategy.h
+++ b/TAO/tao/Time_Policy_Strategy.h
@@ -42,11 +42,11 @@ class TAO_Export TAO_Time_Policy_Strategy
 public:
   virtual ~TAO_Time_Policy_Strategy () {}
 
-  virtual ACE_Timer_Queue * create_timer_queue (void) = 0;
+  virtual ACE_Timer_Queue * create_timer_queue () = 0;
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq) = 0;
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void) = 0;
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index 7fec8956aa6..a4e4b5196bd 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -6,14 +6,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
-  TkResource_Factory::TkResource_Factory (void)
+  TkResource_Factory::TkResource_Factory ()
     : reactor_impl_ (0)
   {
   }
 
   ACE_Reactor_Impl *
-  TkResource_Factory::reactor_impl (void)
+  TkResource_Factory::reactor_impl ()
   {
     // synchronized by external locks
     if (!this->reactor_impl_)
diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h
index b3a75bc27cb..c7ad9b22a95 100644
--- a/TAO/tao/TkResource/TkResource_Factory.h
+++ b/TAO/tao/TkResource/TkResource_Factory.h
@@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class TkResource_Factory
    *
@@ -38,13 +37,11 @@ namespace TAO
   class TAO_TkResource_Export TkResource_Factory : public GUIResource_Factory
   {
   public:
-
     TkResource_Factory ();
 
   protected:
-
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
     /// Reactor created by this factory.
diff --git a/TAO/tao/TkResource/TkResource_Loader.cpp b/TAO/tao/TkResource/TkResource_Loader.cpp
index 23308831d6f..c576b7722a5 100644
--- a/TAO/tao/TkResource/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource/TkResource_Loader.cpp
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  TkResource_Loader::TkResource_Loader (void)
+  TkResource_Loader::TkResource_Loader ()
   {
     TkResource_Factory *tmp = 0;
 
@@ -16,7 +16,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory( tmp );
   }
 
-  TkResource_Loader::~TkResource_Loader (void)
+  TkResource_Loader::~TkResource_Loader ()
   {
   }
 }
diff --git a/TAO/tao/TkResource/TkResource_Loader.h b/TAO/tao/TkResource/TkResource_Loader.h
index a62e74d2435..5e69fa41c0f 100644
--- a/TAO/tao/TkResource/TkResource_Loader.h
+++ b/TAO/tao/TkResource/TkResource_Loader.h
@@ -43,11 +43,9 @@ namespace TAO
   class TAO_TkResource_Export TkResource_Loader
   {
   public:
+    TkResource_Loader ();
 
-    TkResource_Loader (void);
-
-    virtual ~TkResource_Loader (void);
-
+    virtual ~TkResource_Loader ();
   };
 }
 
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 8fbeea0093d..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;
@@ -2109,7 +2107,6 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
           message_block.copy (this->partial_message_->rd_ptr (),
                               this->partial_message_->length ()) == 0)
         {
-
           recv_size -= this->partial_message_->length ();
           // reset is done later to avoid problem in case of EWOULDBLOCK
           // or EAGAIN errno
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index fce15a1dcf8..4268a276746 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -550,7 +550,6 @@ public:
    * strategies implement them correctly.
    */
   //@{
-
   /// Request has been just sent, but the reply is not received. Idle
   /// the transport now.
   bool idle_after_send ();
@@ -615,7 +614,6 @@ public:
    * following methods with the semantics documented below.
    */
   //@{
-
   /// Return the event handler used to receive notifications from the
   /// Reactor.
   /**
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index cadf737ec18..fa95a606d0a 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -57,7 +57,7 @@ TAO_Transport::opened_as (TAO::Connection_Role role)
 }
 
 ACE_INLINE TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *
-TAO_Transport::cache_map_entry (void)
+TAO_Transport::cache_map_entry ()
 {
   return this->cache_map_entry_;
 }
@@ -100,7 +100,7 @@ TAO_Transport::id (size_t id)
 }
 
 ACE_INLINE bool
-TAO_Transport::queue_is_empty (void)
+TAO_Transport::queue_is_empty ()
 {
   ACE_GUARD_RETURN (ACE_Lock,
                     ace_mon,
@@ -116,14 +116,14 @@ TAO_Transport::flush_timer_pending () const
 }
 
 ACE_INLINE void
-TAO_Transport::reset_flush_timer (void)
+TAO_Transport::reset_flush_timer ()
 {
   this->flush_timer_id_ = -1;
   this->current_deadline_ = ACE_Time_Value::zero;
 }
 
 ACE_INLINE TAO_GIOP_Message_Base *
-TAO_Transport::messaging_object (void)
+TAO_Transport::messaging_object ()
 {
   return this->messaging_object_;
 }
@@ -185,7 +185,7 @@ TAO_Transport::is_connected () const
 }
 
 ACE_INLINE TAO_Connection_Handler *
-TAO_Transport::connection_handler (void)
+TAO_Transport::connection_handler ()
 {
   return this->connection_handler_i();
 }
@@ -289,7 +289,7 @@ TAO::Transport::Stats::opened_since () const
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
 ACE_INLINE int
-TAO_Transport::notify_reactor (void)
+TAO_Transport::notify_reactor ()
 {
   if (!this->ws_->is_registered ())
     {
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 3ccc5a27601..b4c5416f540 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -20,7 +20,6 @@ namespace TAO
 {
   namespace Transport
   {
-
     /// ctor
     Current_Impl::Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id)
       : core_ (core)
@@ -29,7 +28,7 @@ namespace TAO
     }
 
     /// dtor
-    Current_Impl::~Current_Impl (void)
+    Current_Impl::~Current_Impl ()
     {
     }
 
@@ -61,34 +60,34 @@ namespace TAO
       return (t==0 || t->stats () == 0) ? &dummy_transport_stats : t->stats ();
     }
 
-    CORBA::Long Current_Impl::id (void)
+    CORBA::Long Current_Impl::id ()
     {
       const TAO_Transport* t = this->transport ();
 
       return (t==0) ? 0 : static_cast<CORBA::Long> (t->id ());
     }
 
-    CounterT Current_Impl::bytes_sent (void)
+    CounterT Current_Impl::bytes_sent ()
     {
       return transport_stats ()->bytes_sent ();
     }
 
-    CounterT Current_Impl::bytes_received (void)
+    CounterT Current_Impl::bytes_received ()
     {
       return transport_stats ()->bytes_received ();
     }
 
-    CounterT Current_Impl::messages_sent (void)
+    CounterT Current_Impl::messages_sent ()
     {
       return transport_stats ()->messages_sent ();
     }
 
-    CounterT Current_Impl::messages_received (void)
+    CounterT Current_Impl::messages_received ()
     {
       return transport_stats ()->messages_received ();
     }
 
-    TimeBase::TimeT Current_Impl::open_since (void)
+    TimeBase::TimeT Current_Impl::open_since ()
     {
       TimeBase::TimeT msecs = 0;
       transport_stats ()->opened_since ().msec (msecs);
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index cbc30649131..50e48f70c22 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -20,7 +20,6 @@ namespace TAO
 {
   namespace Transport
   {
-
     // Forward decl
     class Stats;
 
@@ -77,7 +76,7 @@ namespace TAO
         /// reference counted, and should not be destroyed using
         /// delete() by anything other than the reference counting
         /// mechanism.
-        virtual ~Current_Impl (void);
+        virtual ~Current_Impl ();
 
       private:
         Current_Impl (const Current_Impl &) = delete;
@@ -90,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.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index 36e24d07090..8a29334892a 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -26,7 +26,7 @@ namespace TAO
   namespace Transport
   {
     /// Destructor
-    Current_Loader::~Current_Loader (void)
+    Current_Loader::~Current_Loader ()
     {
     }
 
@@ -67,7 +67,7 @@ namespace TAO
 {
   namespace Transport
   {
-    int current_static_initializer (void)
+    int current_static_initializer ()
     {
       ACE_STATIC_SVC_REGISTER (TAO_Transport_Current_Loader);
       return 0;
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index 58ee8590810..2b4302b5c78 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -41,9 +41,8 @@ namespace TAO
 
     protected:
       /// Protected destructor to enforce reference counting discipline
-      virtual ~Current_Loader (void);
+      virtual ~Current_Loader ();
     };
-
   }
 }
 
@@ -53,7 +52,7 @@ namespace TAO
 {
   namespace Transport
   {
-    int current_static_initializer (void);
+    int current_static_initializer ();
   }
 }
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
index 668f40aa9f4..491a57c65a6 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
@@ -14,7 +14,6 @@ namespace TAO
 {
   namespace Transport
   {
-
     template <typename Impl>
     Current_ORBInitializer<Impl>::Current_ORBInitializer(const ACE_TCHAR* id)
       : Current_ORBInitializer_Base (id)
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 4e6c3cfa13f..4e31955cdf2 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -26,7 +26,6 @@ namespace TAO
 {
   namespace Transport
   {
-
     template <typename Impl>
     class Current_ORBInitializer
       : public Current_ORBInitializer_Base
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index 62960016660..4a73c4c6641 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -8,14 +8,13 @@ namespace TAO
 {
   namespace Transport
   {
-
     Current_ORBInitializer_Base::Current_ORBInitializer_Base(const ACE_TCHAR* id)
       : id_ (id)
     {
       // do nothing
     }
 
-    Current_ORBInitializer_Base::~Current_ORBInitializer_Base(void)
+    Current_ORBInitializer_Base::~Current_ORBInitializer_Base()
     {
       // do nothing
     }
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index f47317b4790..8cc02736757 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -38,7 +38,7 @@ namespace TAO
     {
     public:
       Current_ORBInitializer_Base (const ACE_TCHAR* id);
-      virtual ~Current_ORBInitializer_Base (void);
+      virtual ~Current_ORBInitializer_Base ();
 
       virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr);
 
@@ -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/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 1885d524586..bb4bec3ecc9 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -16,15 +16,13 @@ namespace TAO
 {
   namespace Transport
   {
-
-
     /// Obtains the IIOP_Connection_Handler associated with the
     /// Transport. Will throw NoContext if the (selected) transport
     /// () == 0, or if transport->connection_handler () == 0. Will
     /// throw NoContext, if no transport has been selected yet.
 
     TAO_IIOP_Connection_Handler*
-    IIOP_Current_Impl::handler (void)
+    IIOP_Current_Impl::handler ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       const TAO_Transport* t = this->transport ();
@@ -59,12 +57,12 @@ namespace TAO
 
     /// Dtor
 
-    IIOP_Current_Impl::~IIOP_Current_Impl (void)
+    IIOP_Current_Impl::~IIOP_Current_Impl ()
     {
     }
 
     CORBA::Long
-    IIOP_Current_Impl::id (void)
+    IIOP_Current_Impl::id ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       // Need to use cast to pacify windows compilers complaining
@@ -76,14 +74,14 @@ namespace TAO
     }
 
     ::SSLIOP::Current_ptr
-    IIOP_Current_Impl::ssliop_current (void)
+    IIOP_Current_Impl::ssliop_current ()
     {
         throw ::CORBA::NO_IMPLEMENT ();
     }
 
 
     CORBA::Long
-    IIOP_Current_Impl::remote_port (void)
+    IIOP_Current_Impl::remote_port ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -99,7 +97,7 @@ namespace TAO
     }
 
     char*
-    IIOP_Current_Impl::remote_host (void)
+    IIOP_Current_Impl::remote_host ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -115,7 +113,7 @@ namespace TAO
     }
 
     CORBA::Long
-    IIOP_Current_Impl::local_port (void)
+    IIOP_Current_Impl::local_port ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
@@ -131,7 +129,7 @@ namespace TAO
     }
 
     char*
-    IIOP_Current_Impl::local_host (void)
+    IIOP_Current_Impl::local_host ()
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index 3e94c9d88b9..f74e7216f93 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -31,7 +31,6 @@ namespace TAO
 {
   namespace Transport
   {
-
     /**
      * @class IIOP_Current_Impl
      *
@@ -77,7 +76,7 @@ namespace TAO
       /// Transport. Will throw NoContext if the (selected) transport
       /// () == 0, or if transport->connection_handler () == 0. Will
       /// throw NoContext, if no transport has been selected yet.
-      TAO_IIOP_Connection_Handler* handler (void);
+      TAO_IIOP_Connection_Handler* handler ();
 
     private:
       IIOP_Current_Impl (const IIOP_Current_Impl &) = delete;
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
index 3901d9158a4..d3bc5c69354 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -70,7 +70,7 @@ namespace TAO
   {
     namespace IIOP
     {
-      int current_static_initializer (void)
+      int current_static_initializer ()
       {
         ACE_STATIC_SVC_REGISTER (TAO_Transport_IIOP_Current_Loader);
         return 0;
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
index 91bf6176485..125b0ea296f 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
@@ -25,7 +25,6 @@ namespace TAO
 {
   namespace Transport
   {
-
     namespace IIOP
     {
       class TAO_Transport_Current_Export Current_Loader
@@ -48,7 +47,7 @@ namespace TAO
   {
     namespace IIOP
     {
-      int current_static_initializer (void);
+      int current_static_initializer ();
     }
   }
 }
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index f0600e15df1..ed1b61d819c 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -55,12 +55,11 @@ namespace TAO
 class TAO_Export TAO_Connector
 {
 public:
-
   /// Default constructor.
   TAO_Connector (CORBA::ULong tag);
 
   /// The destructor.
-  virtual ~TAO_Connector (void);
+  virtual ~TAO_Connector ();
 
   /**
    * The tag identifying the specific ORB transport layer protocol.
@@ -87,7 +86,7 @@ public:
   virtual int open (TAO_ORB_Core *orb_core) = 0;
 
   /// Shutdown Connector bridge and concrete Connector.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * To support pluggable we need to abstract away the details of the
@@ -122,7 +121,7 @@ protected:
   virtual int supports_parallel_connects () const;
 
   /// Create a profile with a given endpoint.
-  virtual TAO_Profile *make_profile (void) = 0;
+  virtual TAO_Profile *make_profile () = 0;
 
   /// Set and validate endpoint. We need to do this to initialize our
   /// remote *_Addr's which have not been done during IOR decode.
@@ -200,10 +199,10 @@ protected:
   void orb_core (TAO_ORB_Core *orb_core);
 
   /// Create a connect strategy
-  int create_connect_strategy (void);
+  int create_connect_strategy ();
 
   /// Return the TAO_ORB_Core pointer
-  TAO_ORB_Core *orb_core (void);
+  TAO_ORB_Core *orb_core ();
 
 protected:
   /// The (a)synch connect strategy
diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl
index 802e7bfdf1f..7cb887f5a9c 100644
--- a/TAO/tao/Transport_Connector.inl
+++ b/TAO/tao/Transport_Connector.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_ORB_Core *
-TAO_Connector::orb_core (void)
+TAO_Connector::orb_core ()
 {
   return this->orb_core_;
 }
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
index 0986b3c4c60..e05a3f035cf 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -46,11 +46,11 @@ class TAO_Export TAO_Transport_Descriptor_Interface
 {
 public:
   /// Destructor
-  virtual ~TAO_Transport_Descriptor_Interface (void);
+  virtual ~TAO_Transport_Descriptor_Interface ();
 
   /// This call allocates and copies the contents of this class and
   /// returns the pointer
-  virtual  TAO_Transport_Descriptor_Interface *duplicate (void) = 0;
+  virtual  TAO_Transport_Descriptor_Interface *duplicate () = 0;
 
   /// Try to determine if this object is same as the @a other_prop.
   virtual CORBA::Boolean is_equivalent (
@@ -60,7 +60,7 @@ public:
   virtual u_long hash () const = 0;
 
   /// Return the underlying endpoint object
-  TAO_Endpoint *endpoint (void);
+  TAO_Endpoint *endpoint ();
 
   /// Reset the endpoint pointer to point to another, if that one is
   /// part of the chain based by the current endpoint. Although this
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Default Constructor
-  TAO_Transport_Descriptor_Interface (void);
+  TAO_Transport_Descriptor_Interface ();
 
   /// Constructor
   TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
index 53a1cf35bf1..579af9390f5 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -13,7 +13,7 @@ TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (
 }
 
 ACE_INLINE
-TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void)
+TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface ()
   : endpoint_ (0),
     bidir_flag_ (false),
     release_ (false)
@@ -22,7 +22,7 @@ TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void)
 
 
 ACE_INLINE TAO_Endpoint *
-TAO_Transport_Descriptor_Interface::endpoint (void)
+TAO_Transport_Descriptor_Interface::endpoint ()
 {
   return this->endpoint_;
 }
diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h
index 293182d094f..d33a8469d77 100644
--- a/TAO/tao/Transport_Selection_Guard.h
+++ b/TAO/tao/Transport_Selection_Guard.h
@@ -70,26 +70,26 @@ namespace TAO
     TAO_Transport* operator-> () const
     {
       return this->get ();
-    };
+    }
 
     /// getter
     TAO_Transport& operator* () const
     {
       return *this->get ();
-    };
+    }
 
     /// Getter
     TAO_Transport* get () const
     {
       return this->curr_;
-    };
+    }
 
     /// Setter
     Transport_Selection_Guard& set (TAO_Transport* t)
     {
       this->curr_ = t;
       return *this;
-    };
+    }
 
   Transport_Selection_Guard& operator=(const Transport_Selection_Guard& rhs) {
     if (this != &rhs)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 11ab6b5f086..bbbc8060fad 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
+TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl ()
 {
 }
 
@@ -280,7 +280,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_TypeCodeFactory_Adapter_Impl::Initializer (void)
+TAO_TypeCodeFactory_Adapter_Impl::Initializer ()
 {
   TAO_ORB_Core::typecodefactory_adapter_name ("Concrete_TypeCodeFactory_Adapter");
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index c5795c57cee..b7564aa6325 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -38,7 +38,7 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl
   : public TAO_TypeCodeFactory_Adapter
 {
 public:
-  virtual ~TAO_TypeCodeFactory_Adapter_Impl (void);
+  virtual ~TAO_TypeCodeFactory_Adapter_Impl ();
 
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
@@ -181,7 +181,7 @@ public:
 
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index c799f5ba154..cab2d59fb02 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
+TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * [])
 }
 
 int
-TAO_TypeCodeFactory_Loader::Initializer (void)
+TAO_TypeCodeFactory_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Loader);
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index c0a111cd94e..54eafc2c57c 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -33,7 +33,7 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Loader
 {
 public:
   /// Constructor.
-  TAO_TypeCodeFactory_Loader (void);
+  TAO_TypeCodeFactory_Loader ();
 
   /// Overload the base class method to create a new instance
   /// of a TypeCodeFactory object.
@@ -42,7 +42,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index ee4e1641e7e..bf7aba73ca0 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
@@ -93,11 +92,11 @@ namespace TCF
 }
 
 
-TAO_TypeCodeFactory_i::TAO_TypeCodeFactory_i (void)
+TAO_TypeCodeFactory_i::TAO_TypeCodeFactory_i ()
 {
 }
 
-TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void)
+TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i ()
 {
 }
 
@@ -567,7 +566,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
   if (is_recursive)
     {
-
       recursive_typecode_type * const rtc =
         dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
 
diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
index 6042574391b..8a6b9778b87 100644
--- a/TAO/tao/Typecode_typesC.h
+++ b/TAO/tao/Typecode_typesC.h
@@ -51,7 +51,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
-
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index c49630b75d4..0576a2d4e88 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -34,7 +34,7 @@ TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::interceptor_value (
 
 template<typename S_var,
          template <typename> class Insert_Policy>
-TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::~In_UB_String_Clonable_Argument_T (void)
+TAO::In_UB_String_Clonable_Argument_T<S_var,Insert_Policy>::~In_UB_String_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index 957afc63702..aac13e1880b 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -43,7 +43,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *&
-TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg (void)
+TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -62,7 +62,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *&
-TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void)
+TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -72,7 +72,7 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void)
 template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T (void)
+TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T ()
 {
 }
 
@@ -80,7 +80,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *&
-TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg (void)
+TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -89,7 +89,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *
-TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp (void)
+TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp ()
 {
   return this->x_.ptr ();
 }
@@ -98,7 +98,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_var::s_traits::char_type *
-TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn (void)
+TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn ()
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Unbounded_Array_Allocation_Traits_T.h b/TAO/tao/Unbounded_Array_Allocation_Traits_T.h
index 16d9c9a8382..c1bff8b70ec 100644
--- a/TAO/tao/Unbounded_Array_Allocation_Traits_T.h
+++ b/TAO/tao/Unbounded_Array_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, bool dummy>
 struct unbounded_array_allocation_traits
 {
@@ -48,7 +47,6 @@ struct unbounded_array_allocation_traits
     delete[] buffer;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Unbounded_Array_Sequence_T.h b/TAO/tao/Unbounded_Array_Sequence_T.h
index 2de921a3f0b..6a304a519b9 100644
--- a/TAO/tao/Unbounded_Array_Sequence_T.h
+++ b/TAO/tao/Unbounded_Array_Sequence_T.h
@@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<typename T_array, typename T_slice, typename T_tag>
 class unbounded_array_sequence
 {
diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
index cbbb8a59336..2de1bb30c5a 100644
--- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<typename object_t, typename object_t_var>
 class unbounded_object_reference_sequence
 {
@@ -109,7 +108,6 @@ public:
 private:
   implementation_type impl_;
 };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index d50b8b8be03..dc7a3bf1053 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -44,21 +44,21 @@ public:
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
   typedef details::range_checking<value_type,true> range;
 
-  inline unbounded_value_sequence<CORBA::Octet>()
+  inline unbounded_value_sequence()
     : maximum_ (allocation_traits::default_maximum())
     , length_ (0)
     , buffer_ (allocation_traits::default_buffer_allocation())
     , release_ (buffer_ != 0)
     , mb_ (0)
   {}
-  inline explicit unbounded_value_sequence<CORBA::Octet>(CORBA::ULong maximum)
+  inline explicit unbounded_value_sequence(CORBA::ULong maximum)
     : maximum_(maximum)
     , length_(0)
     , buffer_(allocbuf(maximum_))
     , release_(true)
     , mb_ (0)
   {}
-  inline unbounded_value_sequence<CORBA::Octet>(
+  inline unbounded_value_sequence(
       CORBA::ULong maximum,
       CORBA::ULong length,
       value_type * data,
@@ -69,7 +69,7 @@ public:
       release_ (release),
       mb_ (0)
   {}
-  inline ~unbounded_value_sequence<CORBA::Octet>() {
+  inline ~unbounded_value_sequence() {
     if (mb_)
       ACE_Message_Block::release (mb_);
     if (release_)
@@ -77,7 +77,7 @@ public:
   }
   /// Create a sequence of octets from a single message block (i.e. it
   /// ignores any chaining in the message block).
-  inline unbounded_value_sequence<CORBA::Octet> (CORBA::ULong length,
+  inline unbounded_value_sequence (CORBA::ULong length,
                                                  const ACE_Message_Block* mb)
     : maximum_ (length)
     , length_ (length)
@@ -135,7 +135,7 @@ public:
           }
         else
           {
-            unbounded_value_sequence<CORBA::Octet> tmp(length);
+            unbounded_value_sequence tmp(length);
             tmp.length_ = length;
             element_traits::copy_range(
               buffer_,
@@ -146,7 +146,7 @@ public:
         return;
       }
 
-    unbounded_value_sequence<CORBA::Octet> tmp(length);
+    unbounded_value_sequence tmp(length);
     tmp.length_ = length;
     element_traits::copy_range(
       buffer_,
@@ -167,7 +167,7 @@ public:
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release = false) {
-    unbounded_value_sequence<CORBA::Octet> tmp(maximum, length, data, release);
+    unbounded_value_sequence tmp(maximum, length, data, release);
     swap(tmp);
   }
   inline value_type const * get_buffer() const {
@@ -196,7 +196,7 @@ public:
       return buffer_;
     }
 
-    unbounded_value_sequence<CORBA::Octet> tmp;
+    unbounded_value_sequence tmp;
     swap(tmp);
     tmp.release_ = false;
 
@@ -205,8 +205,8 @@ public:
 
   // moved inside the class to resolve namespace lookup issues.
   // This is a replacement for the commented block below.
-  inline bool operator== (const unbounded_value_sequence<CORBA::Octet> & rhs) const {
-    unbounded_value_sequence<CORBA::Octet> const & lhs = *this;
+  inline bool operator== (const unbounded_value_sequence & rhs) const {
+    unbounded_value_sequence const & lhs = *this;
     CORBA::ULong const len = lhs.length();
 
     // We use the subscript operator instead of get_buffer() to avoid a
@@ -218,7 +218,7 @@ public:
            : ACE_OS::memcmp(&lhs[0], &rhs[0], len) == 0));
   }
 
-  inline bool operator!= (const unbounded_value_sequence<CORBA::Octet> & rhs) const
+  inline bool operator!= (const unbounded_value_sequence & rhs) const
   {
     return !this->operator==(rhs);
   }
@@ -246,12 +246,12 @@ public:
   /// Replaces the current buffer with @a mb, using only @a length bytes.
   /// It takes a duplicate of <mb> so the user still owns it.
   inline void replace (CORBA::ULong length, const ACE_Message_Block* mb) {
-    unbounded_value_sequence<CORBA::Octet> s (length, mb);
+    unbounded_value_sequence s (length, mb);
     swap (s);
   }
 
-  unbounded_value_sequence<CORBA::Octet> (
-    const unbounded_value_sequence<CORBA::Octet> &rhs)
+  unbounded_value_sequence (
+    const unbounded_value_sequence &rhs)
     : maximum_ (0)
     , length_ (0)
     , buffer_(0)
@@ -264,7 +264,7 @@ public:
       length_ = rhs.length_;
       return;
     }
-    unbounded_value_sequence<CORBA::Octet> tmp(rhs.maximum_);
+    unbounded_value_sequence tmp(rhs.maximum_);
     tmp.length_ = rhs.length_;
     if (rhs.mb_ == 0)
       {
@@ -287,10 +287,10 @@ public:
     swap(tmp);
   }
 
-  unbounded_value_sequence<CORBA::Octet> &
-  operator= (const unbounded_value_sequence<CORBA::Octet> & rhs)
+  unbounded_value_sequence &
+  operator= (const unbounded_value_sequence & rhs)
   {
-    unbounded_value_sequence<CORBA::Octet> tmp(rhs);
+    unbounded_value_sequence tmp(rhs);
     swap(tmp);
     return * this;
   }
@@ -311,7 +311,6 @@ private:
   mutable CORBA::Boolean release_;
   ACE_Message_Block* mb_;
 };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h
index 518e876a26a..cd0a1e650cf 100644
--- a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h
+++ b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, class ref_traits, bool dummy>
 struct unbounded_reference_allocation_traits
 {
@@ -77,7 +76,6 @@ struct unbounded_reference_allocation_traits
     delete[] buffer;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h
index ac23b74cad0..b4f7e964db3 100644
--- a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h
+++ b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, bool dummy>
 struct unbounded_value_allocation_traits
 {
@@ -48,7 +47,6 @@ struct unbounded_value_allocation_traits
     delete[] buffer;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h
index 3d6893254a3..a9cbab9133e 100644
--- a/TAO/tao/Unbounded_Value_Sequence_T.h
+++ b/TAO/tao/Unbounded_Value_Sequence_T.h
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<class T, class Tag=int>
 class unbounded_value_sequence
 {
@@ -91,7 +90,6 @@ public:
 private:
   implementation_type impl_;
 };
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 590916c2753..a8dfd8d0416 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -9,11 +9,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Virtual.  Do not inline.
-CORBA::UserException::~UserException ()
-{
-}
-
 CORBA::UserException &
 CORBA::UserException::operator= (CORBA::UserException const & rhs)
 {
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index 6869abd5a47..9484b095da4 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -39,12 +39,11 @@ namespace CORBA
   class TAO_Export UserException : public Exception
   {
   public:
-
     /// Copy constructor.
     UserException (UserException const &rhs);
 
     /// Destructor.
-    virtual ~UserException ();
+    virtual ~UserException () = default;
 
     /// Assignment operator.
     UserException &operator= (UserException const &rhs);
@@ -72,7 +71,6 @@ namespace CORBA
     /// Default constructor.
     UserException ();
   };
-
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index 3bba257dd04..0596a2fcd0e 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-CORBA::UserException::UserException (void)
+CORBA::UserException::UserException ()
 {
 }
 
diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp
index 15bebee3752..5e49710d6be 100644
--- a/TAO/tao/Utils/Encodable.cpp
+++ b/TAO/tao/Utils/Encodable.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Encodable::~TAO_Encodable (void)
+TAO_Encodable::~TAO_Encodable ()
 {
 }
 
diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h
index ab69d949ca1..5a085d8e33d 100644
--- a/TAO/tao/Utils/Encodable.h
+++ b/TAO/tao/Utils/Encodable.h
@@ -41,8 +41,7 @@ class TAO_InputCDR;
 class TAO_UTILS_Export TAO_Encodable
 {
 public:
-
-  virtual ~TAO_Encodable (void);
+  virtual ~TAO_Encodable ();
 
   ///  Encodes the object implementing this method into a CDR stream.
   ///  Returns true on success and false on failure.
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index 0115d46cf88..76066530e04 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -7,7 +7,6 @@ void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
    PortableServer::ServantBase * servant) throw ()
 {
-
   try
     {
       PortableServer::POA_var poa (servant->_default_POA ());
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index 6667bfa5f60..2a7f9d4e763 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -26,7 +26,6 @@ namespace TAO
 {
   namespace Utils
   {
-
     /**
      * @struct Implicit_Deactivation_Functor
      *
@@ -50,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 f58ac29d3c3..e6febb40611 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -25,7 +25,6 @@ namespace TAO
 {
   namespace Utils
   {
-
     /**
      * @struct ORB_Destroyer_Functor
      *
@@ -49,7 +48,6 @@ namespace TAO
       CORBA::ORB,
       ORB_Destroyer_Functor>
     ORB_Destroyer;
-
   } // namespace Utils
 } // namespace TAO
 
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index 808982f2e06..0092a304741 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -97,7 +97,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 // Activate POA manager.
 
 int
-TAO_ORB_Manager::activate_poa_manager (void)
+TAO_ORB_Manager::activate_poa_manager ()
 {
   this->poa_manager_->activate ();
   return 0;
@@ -177,7 +177,7 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv)
 }
 
 int
-TAO_ORB_Manager::fini (void)
+TAO_ORB_Manager::fini ()
 {
   this->poa_->destroy (1, 1);
 
@@ -193,7 +193,7 @@ TAO_ORB_Manager::fini (void)
 }
 
 int
-TAO_ORB_Manager::run (void)
+TAO_ORB_Manager::run ()
 {
   this->poa_manager_->activate ();
 
@@ -205,34 +205,34 @@ TAO_ORB_Manager::run (void)
 // Return the corba orb reference.
 
 CORBA::ORB_ptr
-TAO_ORB_Manager::orb (void)
+TAO_ORB_Manager::orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_.in ());
 }
 
 // Return the root POA reference
 PortableServer::POA_ptr
-TAO_ORB_Manager::root_poa (void)
+TAO_ORB_Manager::root_poa ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 // Return the child POA reference
 PortableServer::POA_ptr
-TAO_ORB_Manager::child_poa (void)
+TAO_ORB_Manager::child_poa ()
 {
   return PortableServer::POA::_duplicate (this->child_poa_.in ());
 }
 
 PortableServer::POAManager_ptr
-TAO_ORB_Manager::poa_manager (void)
+TAO_ORB_Manager::poa_manager ()
 {
   return PortableServer::POAManager::_duplicate (this->poa_manager_.in ());
 }
 
 // Destructor.
 
-TAO_ORB_Manager::~TAO_ORB_Manager (void)
+TAO_ORB_Manager::~TAO_ORB_Manager ()
 {
   try
     {
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index eecd045d8c7..335a477b6f5 100644
--- a/TAO/tao/Utils/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -89,10 +89,10 @@ public:
    * @retval -1 Failure
    * @retval 0 Success
    */
-  int fini (void);
+  int fini ();
 
   /// Destructor.
-  ~TAO_ORB_Manager (void);
+  ~TAO_ORB_Manager ();
 
   // = Accessor methods.
 
@@ -106,7 +106,7 @@ public:
    * @retval -1 Failure
    * @retval 0 Success
    */
-  int activate_poa_manager (void);
+  int activate_poa_manager ();
 
   /**
    * Activate <servant>, using the POA <activate_object> call.  Users
@@ -164,7 +164,7 @@ public:
   /**
    * Run the ORB event loop.
    */
-  int run (void);
+  int run ();
 
   /**
    * Accessor which returns the ORB pointer.  Following the normal
@@ -175,7 +175,7 @@ public:
    * @return ORB pointer which has been duplicated, so caller
    *         must release pointer when done.
    */
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /**
    * Accessor which returns the root poa. Following the normal CORBA
@@ -185,7 +185,7 @@ public:
    * @return Root POA pointer which has been duplicated.  Caller
    *         must release pointer when done.
    */
-  PortableServer::POA_ptr root_poa (void);
+  PortableServer::POA_ptr root_poa ();
 
   /**
    * Accessor which returns the child poa. Following the normal CORBA
@@ -195,7 +195,7 @@ public:
    * @return Child POA pointer which has been duplicated.  Caller
    *         must release pointer when done.
    */
-  PortableServer::POA_ptr child_poa (void);
+  PortableServer::POA_ptr child_poa ();
 
   /**
    * Accessor which returns the poa manager. Following the normal
@@ -206,7 +206,7 @@ public:
    * @return POAManager pointer which has been duplicated.  Caller
    *         must release pointer when done.
    */
-  PortableServer::POAManager_ptr poa_manager (void);
+  PortableServer::POAManager_ptr poa_manager ();
 
 protected:
   /// The ORB.
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
index 4c0bb923ff5..821ba11dbb7 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -23,7 +23,6 @@ namespace TAO
 {
   namespace Utils
   {
-
     /**
      * @class PolicyList_Destroyer
      *
@@ -37,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 7e1911c0dd4..be31d6efa04 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -28,7 +28,6 @@ namespace TAO
 {
   namespace Utils
   {
-
     /**
      * @class RIR_Narrow
      *
@@ -53,7 +52,6 @@ namespace TAO
     private:
       static _ptr_type narrow_object (CORBA::Object_ptr object);
     };
-
   } // namespace Utils
 } // namespace TAO
 
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
index 843e3610e54..a194bc0354c 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -35,7 +35,7 @@
  *      int parse_args (int argc, ACE_TCHAR * argv[]);
  *      int init (CORBA::ORB_ptr orb );
  *      int idle(int &result);
- *      int fini (void);
+ *      int fini ();
  *      const char * identity () const;
  *
  *      parse_args, self_register, self_unregister return 0 if ok, nonzero for error.
diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h
index 91a253774ca..1be9dd82ccd 100644
--- a/TAO/tao/Value_Traits_T.h
+++ b/TAO/tao/Value_Traits_T.h
@@ -19,7 +19,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, bool dummy>
 struct value_traits
 {
@@ -60,7 +59,6 @@ struct value_traits
     copy_range(begin, end, dst);
   }
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index c968219535f..c6785f74a25 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::AbstractBase::AbstractBase (void)
+CORBA::AbstractBase::AbstractBase ()
   : is_objref_ (false)
   , refcount_ (1)
   , is_collocated_ (false)
@@ -51,12 +51,8 @@ CORBA::AbstractBase::AbstractBase (TAO_Stub * protocol_proxy,
 {
 }
 
-CORBA::AbstractBase::~AbstractBase (void)
-{
-}
-
 void
-CORBA::AbstractBase::_add_ref (void)
+CORBA::AbstractBase::_add_ref ()
 {
   ++this->refcount_;
 
@@ -68,7 +64,7 @@ CORBA::AbstractBase::_add_ref (void)
 }
 
 void
-CORBA::AbstractBase::_remove_ref (void)
+CORBA::AbstractBase::_remove_ref ()
 {
   // This is required by the C++ Mapping 1.2.
   if (this->is_objref_)
@@ -94,7 +90,7 @@ CORBA::AbstractBase::_tao_any_destructor (void *x)
 }
 
 CORBA::Object_ptr
-CORBA::AbstractBase::_to_object (void)
+CORBA::AbstractBase::_to_object ()
 {
   if (!this->is_objref_)
     {
@@ -105,7 +101,7 @@ CORBA::AbstractBase::_to_object (void)
 }
 
 CORBA::ValueBase *
-CORBA::AbstractBase::_to_value (void)
+CORBA::AbstractBase::_to_value ()
 {
   if (this->is_objref_)
     {
@@ -380,7 +376,7 @@ CORBA::AbstractBase::_tao_stream_v (std::ostream &strm) const
 #endif /* GEN_OSTREAM_OPS */
 
 CORBA::ValueBase *
-CORBA::AbstractBase::_tao_to_value (void)
+CORBA::AbstractBase::_tao_to_value ()
 {
   return 0;
 }
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index f9825071858..18aeb6430be 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -125,10 +125,9 @@ namespace CORBA
     AbstractBase ();
     AbstractBase (const AbstractBase &);
 
-    virtual ~AbstractBase ();
+    virtual ~AbstractBase () = default;
 
   protected:
-
     CORBA::Boolean is_objref_;
 
   private:
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index 9e4329c0358..8fe77db69d4 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -46,7 +46,7 @@ CORBA::AbstractBase::_stubobj () const
           return this->equivalent_obj_->_stubobj ();
         }
     }
-  return 0;
+  return nullptr;
 }
 
 ACE_INLINE
diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h
index 9a5027d8624..b88a8bb7d47 100644
--- a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h
+++ b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, class ref_traits, CORBA::ULong MAX, bool dummy>
 struct bounded_valuetype_allocation_traits
 {
@@ -63,7 +62,6 @@ struct bounded_valuetype_allocation_traits
     return MAX;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
index 4ec02bb7989..163806e5da2 100644
--- a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
+++ b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<typename object_t, typename object_t_var, CORBA::ULong MAX>
 class bounded_valuetype_sequence
 {
@@ -104,7 +103,6 @@ private:
 
   template <typename stream, typename object_t, typename object_t_var, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_valuetype_sequence<object_t, object_t_var, MAX> & source) {
-
     const ::CORBA::ULong length = source.length ();
     if (length > source.maximum () || !(strm << length)) {
       return false;
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
index 385d5266499..19bfbb1fb9b 100644
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -1,5 +1,3 @@
-//
-
 #include "tao/Valuetype/Bounded_Valuetype_Sequence_T.h"
 #include "tao/Valuetype/Unbounded_Valuetype_Sequence_T.h"
 
diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
index 42a5224fa53..8e7dc85abb2 100644
--- a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
+++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
@@ -17,7 +17,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename T, class ref_traits, bool dummy>
 struct unbounded_valuetype_allocation_traits
 {
@@ -31,7 +30,7 @@ struct unbounded_valuetype_allocation_traits
 
   inline static value_type * default_buffer_allocation()
   {
-    return 0;
+    return nullptr;
   }
 
   inline static value_type * allocbuf(CORBA::ULong maximum)
@@ -58,7 +57,7 @@ struct unbounded_valuetype_allocation_traits
 
   inline static void freebuf(value_type * buffer)
   {
-    if(buffer != 0)
+    if(buffer != nullptr)
     {
       value_type * begin = buffer - 1;
       value_type * end = reinterpret_cast<value_type*>(*begin);
@@ -69,7 +68,6 @@ struct unbounded_valuetype_allocation_traits
     delete[] buffer;
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
index 72a64f3a308..bc3d23335f8 100644
--- a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
+++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
@@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
 template<typename object_t, typename object_t_var>
 class unbounded_valuetype_sequence
 {
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 7189243b08a..3a92ae576d7 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -54,7 +54,7 @@ TAO_ChunkInfo::TAO_ChunkInfo (CORBA::Boolean do_chunking,
 }
 
 CORBA::ValueBase *
-CORBA::ValueBase::_copy_value (void)
+CORBA::ValueBase::_copy_value ()
 {
   // Note that TAO traditionally has not enforced this functions PURE
   // virtual nature, thus the end user didn't have to provide an
@@ -72,7 +72,7 @@ CORBA::ValueBase::_copy_value (void)
   return 0;
 }
 
-CORBA::ValueBase::ValueBase (void)
+CORBA::ValueBase::ValueBase ()
   : is_truncatable_(0),
     chunking_(0)
 {
@@ -84,10 +84,6 @@ CORBA::ValueBase::ValueBase (const ValueBase& val)
 {
 }
 
-CORBA::ValueBase::~ValueBase (void)
-{
-}
-
 CORBA::ValueBase*
 CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
 {
@@ -1372,31 +1368,31 @@ namespace CORBA
 // member functions for CORBA::DefaultValueRefCountBase ============
 
 // destructor
-CORBA::DefaultValueRefCountBase::~DefaultValueRefCountBase (void)
+CORBA::DefaultValueRefCountBase::~DefaultValueRefCountBase ()
 {
 }
 
 void
-CORBA::DefaultValueRefCountBase::_add_ref (void)
+CORBA::DefaultValueRefCountBase::_add_ref ()
 {
   this->_tao_add_ref ();
 }
 
 void
-CORBA::DefaultValueRefCountBase::_remove_ref (void)
+CORBA::DefaultValueRefCountBase::_remove_ref ()
 {
   this->_tao_remove_ref ();
 }
 
 CORBA::ULong
-CORBA::DefaultValueRefCountBase::_refcount_value (void)
+CORBA::DefaultValueRefCountBase::_refcount_value ()
 {
   return this->_tao_refcount_value ();
 }
 
 // ===========================================================
 
-CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
+CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase ()
   : refcount_ (1)
 {
 }
@@ -1411,13 +1407,13 @@ CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase
 }
 
 void
-CORBA::DefaultValueRefCountBase::_tao_add_ref (void)
+CORBA::DefaultValueRefCountBase::_tao_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
+CORBA::DefaultValueRefCountBase::_tao_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index add847fabef..32eeaed2b3d 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -236,7 +236,7 @@ namespace CORBA
   protected:
     ValueBase ();
     ValueBase (const ValueBase&);
-    virtual ~ValueBase ();
+    virtual ~ValueBase () = default;
 
     /// This flag is set to be true when the valuetype defined
     /// in the idl has the truncatable parent.
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index ad7003800d2..a7986ab90c7 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -26,23 +26,23 @@ CORBA::remove_ref (CORBA::ValueFactoryBase *val)
 
 // ===========================================================
 
-CORBA::ValueFactoryBase::ValueFactoryBase (void)
+CORBA::ValueFactoryBase::ValueFactoryBase ()
   : refcount_ (1)
 {
 }
 
-CORBA::ValueFactoryBase::~ValueFactoryBase (void)
+CORBA::ValueFactoryBase::~ValueFactoryBase ()
 {
 }
 
 void
-CORBA::ValueFactoryBase::_add_ref (void)
+CORBA::ValueFactoryBase::_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::ValueFactoryBase::_remove_ref (void)
+CORBA::ValueFactoryBase::_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -52,7 +52,7 @@ CORBA::ValueFactoryBase::_remove_ref (void)
 
 // No-op. This should never be called, but it can't be pure virtual.
 CORBA::AbstractBase *
-CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void)
+CORBA::ValueFactoryBase::create_for_unmarshal_abstract ()
 {
   return 0;
 }
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index ddfafde6f4c..3c59c8b833d 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -70,7 +70,6 @@ namespace CORBA
     /// Reference counter.
     std::atomic<uint32_t> refcount_;
   };
-
 }  // End CORBA namespace
 
 namespace TAO
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index 897f7a40bc7..005a8dadfcf 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -5,12 +5,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
+TAO_ValueFactory_Map::TAO_ValueFactory_Map ()
   : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
 {
 }
 
-TAO_ValueFactory_Map::~TAO_ValueFactory_Map (void)
+TAO_ValueFactory_Map::~TAO_ValueFactory_Map ()
 {
   // Initialize an iterator.  We need to go thru each entry and free
   // up storage allocated to hold the external ids and invoke
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index e2653291683..e46fa050b7a 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -35,9 +35,8 @@ namespace CORBA
 class TAO_ValueFactory_Map
 {
 public:
-
-  TAO_ValueFactory_Map (void);
-  ~TAO_ValueFactory_Map (void);
+  TAO_ValueFactory_Map ();
+  ~TAO_ValueFactory_Map ();
 
   /**
    * Associate the factory (int_id) with the repo_id (ext_id).
@@ -63,13 +62,12 @@ public:
   int find (const char *repo_id,
             CORBA::ValueFactory &factory);
 
-  void dump (void);
+  void dump ();
 
   /// Return singleton instance of this class.
-  static TAO_ValueFactory_Map * instance (void);
+  static TAO_ValueFactory_Map * instance ();
 
 private:
-
   /// The hash table data structure.
   typedef ACE_Hash_Map_Manager_Ex<const char *,
                                   CORBA::ValueFactory,
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index c136bde51c9..60c8722c3ff 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -9,8 +9,8 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (void)
-  : ptr_ (0)
+TAO_Value_Var_T<T>::TAO_Value_Var_T ()
+  : ptr_ (nullptr)
 {}
 
 template <typename T>
@@ -32,7 +32,7 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (const TAO_Value_Var_T<T> & p)
 }
 
 template <typename T>
-TAO_Value_Var_T<T>::~TAO_Value_Var_T (void)
+TAO_Value_Var_T<T>::~TAO_Value_Var_T ()
 {
   TAO::Value_Traits<T>::remove_ref (this->ptr_);
 }
@@ -92,14 +92,14 @@ TAO_Value_Var_T<T>::in () const
 
 template <typename T>
 T *&
-TAO_Value_Var_T<T>::inout (void)
+TAO_Value_Var_T<T>::inout ()
 {
   return this->ptr_;
 }
 
 template <typename T>
 T *&
-TAO_Value_Var_T<T>::out (void)
+TAO_Value_Var_T<T>::out ()
 {
   TAO::Value_Traits<T>::remove_ref (this->ptr_);
   this->ptr_ = 0;
@@ -108,7 +108,7 @@ TAO_Value_Var_T<T>::out (void)
 
 template <typename T>
 T *
-TAO_Value_Var_T<T>::_retn (void)
+TAO_Value_Var_T<T>::_retn ()
 {
   T * tmp = this->ptr_;
   this->ptr_ = 0;
@@ -128,7 +128,7 @@ template <typename T>
 TAO_Value_Out_T<T>::TAO_Value_Out_T (T *& p)
   : ptr_ (p)
 {
-  this->ptr_ = 0;
+  this->ptr_ = nullptr;
 }
 
 template <typename T>
@@ -136,7 +136,7 @@ TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p)
   : ptr_ (p.out ())
 {
   TAO::Value_Traits<T>::remove_ref (this->ptr_);
-  this->ptr_ = 0;
+  this->ptr_ = nullptr;
 }
 
 template <typename T>
@@ -168,14 +168,14 @@ TAO_Value_Out_T<T>::operator T *& ()
 
 template <typename T>
 T *&
-TAO_Value_Out_T<T>::ptr (void)
+TAO_Value_Out_T<T>::ptr ()
 {
   return this->ptr_;
 }
 
 template <typename T>
 T *
-TAO_Value_Out_T<T>::operator-> (void)
+TAO_Value_Out_T<T>::operator-> ()
 {
   return this->ptr_;
 }
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 0a5e67ec072..b4eba819bb8 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -74,7 +74,6 @@ public:
   T * ptr () const;
 
 private:
-
   // Prevent widening assignment.
   TAO_Value_Var_T (const TAO_Base_var &);
   void operator= (const TAO_Base_var &);
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 80223c32b0d..b4576554821 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -7,12 +7,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void)
-{
-}
-
 TAO_Valuetype_Adapter *
-TAO_Valuetype_Adapter_Factory_Impl::create (void)
+TAO_Valuetype_Adapter_Factory_Impl::create ()
 {
   TAO_Valuetype_Adapter_Impl *nva = 0;
   ACE_NEW_THROW_EX (nva,
@@ -22,12 +18,9 @@ TAO_Valuetype_Adapter_Factory_Impl::create (void)
   return nva;
 }
 
-// *********************************************************************
-
 // Initialization and registration of dynamic service object.
-
 int
-TAO_Valuetype_Adapter_Factory_Impl::Initializer (void)
+TAO_Valuetype_Adapter_Factory_Impl::Initializer ()
 {
   TAO_ORB_Core::valuetype_adapter_factory_name (
       "Concrete_Valuetype_Adapter_Factory");
@@ -37,7 +30,6 @@ TAO_Valuetype_Adapter_Factory_Impl::Initializer (void)
         ace_svc_desc_TAO_Valuetype_Adapter_Factory_Impl);
 }
 
-
 ACE_STATIC_SVC_DEFINE (
     TAO_Valuetype_Adapter_Factory_Impl,
     ACE_TEXT ("Concrete_Valuetype_Adapter_Factory"),
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
index 0b8ab48fe36..c07d372d800 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
@@ -39,7 +39,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Factory_Impl
   : public TAO_Valuetype_Adapter_Factory
 {
 public:
-  virtual ~TAO_Valuetype_Adapter_Factory_Impl ();
+  virtual ~TAO_Valuetype_Adapter_Factory_Impl () = default;
 
   virtual TAO_Valuetype_Adapter * create ();
 
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index 3e95c82454f..fce5a351e90 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -9,10 +9,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
-{
-}
-
 CORBA::Object_ptr
 TAO_Valuetype_Adapter_Impl::abstractbase_to_object (
     CORBA::AbstractBase_ptr p)
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index aba0ca95696..201fe5455b6 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -39,8 +39,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl
   : public TAO_Valuetype_Adapter
 {
 public:
-
-  virtual ~TAO_Valuetype_Adapter_Impl (void);
+  virtual ~TAO_Valuetype_Adapter_Impl () = default;
 
   virtual CORBA::Object_ptr abstractbase_to_object (
       CORBA::AbstractBase_ptr);
diff --git a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h
index 79962ed4da6..f79741486d5 100644
--- a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h
@@ -18,7 +18,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename obj_ref_traits>
 class valuetype_sequence_element
 {
@@ -55,9 +54,7 @@ public:
   {
   }
 
-  ~valuetype_sequence_element()
-  {
-  }
+  ~valuetype_sequence_element() = default;
 
   valuetype_sequence_element & operator=(
       valuetype_var const & rhs)
@@ -118,7 +115,6 @@ private:
   value_type * element_;
   CORBA::Boolean release_;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
index 3cffe4e2249..43c1d66bd53 100644
--- a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
@@ -16,7 +16,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<typename object_t, typename object_t_var>
 struct valuetype_traits_base
 {
@@ -38,7 +37,7 @@ struct valuetype_traits_base
 
   inline static object_type * nil()
   {
-    return 0;
+    return nullptr;
   }
 
   inline static object_type * default_initializer()
@@ -46,7 +45,6 @@ struct valuetype_traits_base
     return nil();
   }
 };
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h
index 2e9e581b4b6..3061b2dd417 100644
--- a/TAO/tao/Valuetype/Valuetype_Traits_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h
@@ -19,7 +19,6 @@ namespace TAO
 {
 namespace details
 {
-
 template<class object_t, class object_t_var, class derived>
 struct valuetype_traits_decorator
 {
@@ -82,7 +81,6 @@ struct valuetype_traits
   typedef object_type const * const_value_type;
   typedef object_t_var object_type_var;
 };
-
 } // namespace details
 } // namespace CORBA
 
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index 3787d47012a..4754cc4e1ed 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -35,7 +35,7 @@ TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value (
 
 template<typename S_forany,
          template <typename> class Insert_Policy>
-TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clonable_Argument_T (void)
+TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -49,7 +49,7 @@ TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::~In_Var_Array_Clo
 template<typename S_forany,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone (void)
+TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone ()
 {
   typedef TAO::details::array_traits<S_forany> ARRAY_TRAITS;
   typename ARRAY_TRAITS::slice_type * tmp_ptr = 0;
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index 8b2fd7d0529..29f634049a2 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -43,7 +43,7 @@ template<typename S_forany,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
-TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void)
+TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg ()
 {
   return this->x_.inout ();
 }
@@ -65,7 +65,7 @@ template<typename S_out,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *&
-TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg (void)
+TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -77,7 +77,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::
-Ret_Var_Array_Argument_T (void)
+Ret_Var_Array_Argument_T ()
 {}
 
 template<typename S_var,
@@ -85,7 +85,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *&
-TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void)
+TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -95,7 +95,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
-TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void)
+TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp ()
 {
   return this->x_.ptr ();
 }
@@ -105,7 +105,7 @@ template<typename S_var,
          template <typename> class Insert_Policy>
 ACE_INLINE
 typename S_forany::_slice_type *
-TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void)
+TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn ()
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index a736630c989..e7e23c5201f 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -33,7 +33,7 @@ TAO::In_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (
 
 template<typename S,
          template <typename> class Insert_Policy>
-TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Argument_T (void)
+TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Argument_T ()
 {
   if (this->is_clone_)
     {
@@ -45,7 +45,7 @@ TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::~In_Var_Size_Clonable_Arg
 template<typename S,
          template <typename> class Insert_Policy>
 TAO::Argument*
-TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::clone (void)
+TAO::In_Var_Size_Clonable_Argument_T<S,Insert_Policy>::clone ()
 {
   S* clone_x = new S (*(this->x_));
   In_Var_Size_Clonable_Argument_T<S,Insert_Policy>* clone_arg
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
index 82cb065b1de..d82ceea4184 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -40,7 +40,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg ()
 {
   return *this->x_;
 }
@@ -60,7 +60,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -70,7 +70,7 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void)
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T (void)
+TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T ()
 {
 }
 
@@ -78,7 +78,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg ()
 {
   return this->x_.out ();
 }
@@ -87,7 +87,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp (void)
+TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp ()
 {
   return this->x_.ptr ();
 }
@@ -96,7 +96,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn (void)
+TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn ()
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h
index 3c7a22ac3b2..4cc8aa62885 100644
--- a/TAO/tao/Vector_Argument_T.h
+++ b/TAO/tao/Vector_Argument_T.h
@@ -88,7 +88,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S & x_;
@@ -112,7 +112,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
+    S & arg ();
 
   private:
     S & x_;
diff --git a/TAO/tao/Vector_Argument_T.inl b/TAO/tao/Vector_Argument_T.inl
index ced1dda2f53..ad9ca1feae6 100644
--- a/TAO/tao/Vector_Argument_T.inl
+++ b/TAO/tao/Vector_Argument_T.inl
@@ -69,7 +69,7 @@ TAO::Out_Vector_Argument_T<S,Insert_Policy>::arg ()
 template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
-TAO::Ret_Vector_Argument_T<S,Insert_Policy>::Ret_Vector_Argument_T (void)
+TAO::Ret_Vector_Argument_T<S,Insert_Policy>::Ret_Vector_Argument_T ()
 {
 }
 
@@ -77,7 +77,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Vector_Argument_T<S,Insert_Policy>::arg (void)
+TAO::Ret_Vector_Argument_T<S,Insert_Policy>::arg ()
 {
   return this->x_;
 }
@@ -86,7 +86,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Vector_Argument_T<S,Insert_Policy>::excp (void)
+TAO::Ret_Vector_Argument_T<S,Insert_Policy>::excp ()
 {
   return this->x_;
 }
@@ -95,7 +95,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Vector_Argument_T<S,Insert_Policy>::retn (void)
+TAO::Ret_Vector_Argument_T<S,Insert_Policy>::retn ()
 {
   return this->x_;
 }
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index e09644e2bb6..24a5563acaa 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,7 +4,7 @@
 
 #define TAO_MAJOR_VERSION 3
 #define TAO_MINOR_VERSION 0
-#define TAO_MICRO_VERSION 3
-#define TAO_VERSION "3.0.3"
-#define TAO_VERSION_CODE 0x30003
+#define TAO_MICRO_VERSION 10
+#define TAO_VERSION "3.0.10"
+#define TAO_VERSION_CODE 0x3000a
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index c6d79a32ff4..6009312c714 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -11,10 +11,6 @@ namespace TAO
   {
   }
 
-  Wait_On_LF_No_Upcall::~Wait_On_LF_No_Upcall ()
-  {
-  }
-
   int
   Wait_On_LF_No_Upcall::wait (ACE_Time_Value *max_wait_time,
                               TAO_Synch_Reply_Dispatcher &rd)
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index 5741902c931..caf40f38828 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -44,18 +44,16 @@ namespace TAO
     explicit Wait_On_LF_No_Upcall (TAO_Transport *t);
 
     /// Destructor.
-    virtual ~Wait_On_LF_No_Upcall (void);
+    ~Wait_On_LF_No_Upcall () override = default;
 
     /*! @copydoc TAO_Wait_Strategy::wait() */
-    virtual int wait (ACE_Time_Value *max_wait_time,
-                      TAO_Synch_Reply_Dispatcher &rd);
+    int wait (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd) override;
 
     /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
-    virtual bool can_process_upcalls () const;
+    bool can_process_upcalls () const override;
 
     /*! @copydoc TAO_Wait_Strategy::defer_upcall() */
-    virtual int defer_upcall (ACE_Event_Handler*);
-
+    int defer_upcall (ACE_Event_Handler*) override;
   };
 }
 
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 4491baac65e..348bf3b307f 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -13,10 +13,6 @@ TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower
 {
 }
 
-TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower ()
-{
-}
-
 int
 TAO_Wait_On_Leader_Follower::register_handler ()
 {
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index cca3a7fb3d0..23b854d39b1 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -37,30 +37,27 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
 {
-
 public:
   /// Constructor.
-  TAO_Wait_On_Leader_Follower (TAO_Transport *transport);
+  explicit TAO_Wait_On_Leader_Follower (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_On_Leader_Follower (void);
+  ~TAO_Wait_On_Leader_Follower () override = default;
 
    /*! @copydoc TAO_Wait_Strategy::sending_request() */
-  virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
+  int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics) override;
 
    /*! @copydoc TAO_Wait_Strategy::wait() */
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd);
+  int wait (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd) override;
 
    /*! @copydoc TAO_Wait_Strategy::register_handler() */
-  virtual int register_handler (void);
+  int register_handler () override;
 
    /*! @copydoc TAO_Wait_Strategy::non_blocking() */
-  virtual bool non_blocking () const;
+  bool non_blocking () const override;
 
    /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
-  virtual bool can_process_upcalls () const;
-
+  bool can_process_upcalls () const override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 4e73e0109f9..2394a6506a9 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -13,10 +13,6 @@ TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
 {
 }
 
-TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor ()
-{
-}
-
 int
 TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
                            TAO_Synch_Reply_Dispatcher &rd)
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index 57993e40f77..bfd66ee16b3 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -28,26 +28,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Wait_On_Reactor : public TAO_Wait_Strategy
 {
-
 public:
   /// Constructor.
   explicit TAO_Wait_On_Reactor (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_On_Reactor (void);
+  ~TAO_Wait_On_Reactor () override = default;
 
   /*! @copydoc TAO_Wait_Strategy::wait() */
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd);
+  int wait (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd) override;
 
   /*! @copydoc TAO_Wait_Strategy::register_handler() */
-  virtual int register_handler (void);
+  int register_handler () override;
 
   /*! @copydoc TAO_Wait_Strategy::non_blocking() */
-  virtual bool non_blocking () const;
+  bool non_blocking () const override;
 
   /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
-  virtual bool can_process_upcalls () const;
+  bool can_process_upcalls () const override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 0105e9ed5f4..92bcdba8467 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -15,11 +15,6 @@ TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
 {
 }
 
-// Destructor.
-TAO_Wait_On_Read::~TAO_Wait_On_Read ()
-{
-}
-
 int
 TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core,
                                    TAO_Message_Semantics msg_semantics)
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index fde048dc907..1fa4703e508 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -26,32 +26,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Wait_On_Read :  public TAO_Wait_Strategy
 {
-
 public:
   /// Constructor.
   explicit TAO_Wait_On_Read (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_On_Read (void);
+  ~TAO_Wait_On_Read () override = default;
 
   /*! @copydoc TAO_Wait_Strategy::sending_request() */
-  virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
+  int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics) override;
 
    /*! @copydoc TAO_Wait_Strategy::finished_request() */
-  virtual void finished_request ();
+  void finished_request () override;
 
   /*! @copydoc TAO_Wait_Strategy::wait() */
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd);
+  int wait (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd) override;
 
   /*! @copydoc TAO_Wait_Strategy::register_handler() */
-  virtual int register_handler (void);
+  int register_handler () override;
 
   /*! @copydoc TAO_Wait_Strategy::non_blocking() */
-  virtual bool non_blocking () const;
+  bool non_blocking () const override;
 
   /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
-  virtual bool can_process_upcalls () const;
+  bool can_process_upcalls () const override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index fc13c417789..fa0258db6c6 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -13,11 +13,6 @@ TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
 {
 }
 
-// Destructor.
-TAO_Wait_Strategy::~TAO_Wait_Strategy ()
-{
-}
-
 int
 TAO_Wait_Strategy::defer_upcall (ACE_Event_Handler*)
 {
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 34fdab5d184..c900be668fc 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -40,13 +40,12 @@ class TAO_Synch_Reply_Dispatcher;
  */
 class TAO_Export TAO_Wait_Strategy
 {
-
 public:
   /// Constructor.
   explicit TAO_Wait_Strategy (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_Strategy ();
+  virtual ~TAO_Wait_Strategy () = default;
 
   /**
    * The user is going to send a request, prepare any internal
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 43a1f850746..ad161848f6c 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -52,7 +52,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
-
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
@@ -62,7 +61,6 @@ namespace CORBA
   class TAO_Export WrongTransaction : public CORBA::UserException
   {
   public:
-
     WrongTransaction ();
     WrongTransaction (const WrongTransaction &);
     ~WrongTransaction ();
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index f97a97b28bb..5f24aa4e3d1 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   XtResource_Factory::XtResource_Factory (XtAppContext p_context):
     reactor_impl_(nullptr),
     context_(p_context)
@@ -14,7 +13,7 @@ namespace TAO
   }
 
   ACE_Reactor_Impl *
-  XtResource_Factory::reactor_impl (void)
+  XtResource_Factory::reactor_impl ()
   {
     // synchronized by external locks
     if (!this->context_)
diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h
index 5043ca039fd..e50f217c27b 100644
--- a/TAO/tao/XtResource/XtResource_Factory.h
+++ b/TAO/tao/XtResource/XtResource_Factory.h
@@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class XtResource_Factory
    *
@@ -42,10 +41,9 @@ namespace TAO
     XtResource_Factory (XtAppContext context);
 
     /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
+    virtual ACE_Reactor_Impl *reactor_impl ();
 
   private:
-
     /// Reactor created by this factory.
     ACE_XtReactor *reactor_impl_;
 
diff --git a/TAO/tao/XtResource/XtResource_Loader.cpp b/TAO/tao/XtResource/XtResource_Loader.cpp
index 95078ee11d4..11dbc3a05cb 100644
--- a/TAO/tao/XtResource/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource/XtResource_Loader.cpp
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   XtResource_Loader::XtResource_Loader (XtAppContext context)
   {
     XtResource_Factory *tmp = 0;
diff --git a/TAO/tao/XtResource/XtResource_Loader.h b/TAO/tao/XtResource/XtResource_Loader.h
index 300df16a879..0349c26b015 100644
--- a/TAO/tao/XtResource/XtResource_Loader.h
+++ b/TAO/tao/XtResource/XtResource_Loader.h
@@ -41,7 +41,6 @@ namespace TAO
    */
   class TAO_XtResource_Export XtResource_Loader
   {
-
   public:
     XtResource_Loader  (XtAppContext context);
 
diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp
index d1f84d8d256..d65e6f5d77a 100644
--- a/TAO/tao/ZIOP/ZIOP.cpp
+++ b/TAO/tao/ZIOP/ZIOP.cpp
@@ -10,12 +10,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ZIOP_Loader::TAO_ZIOP_Loader (void)
+TAO_ZIOP_Loader::TAO_ZIOP_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_ZIOP_Loader::~TAO_ZIOP_Loader (void)
+TAO_ZIOP_Loader::~TAO_ZIOP_Loader ()
 {
 }
 
@@ -93,7 +93,7 @@ TAO_ZIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
 }
 
 int
-TAO_ZIOP_Loader::Initializer (void)
+TAO_ZIOP_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_ZIOP_Loader);
 }
diff --git a/TAO/tao/ZIOP/ZIOP.h b/TAO/tao/ZIOP/ZIOP.h
index 31d5078710e..64d4b66990b 100644
--- a/TAO/tao/ZIOP/ZIOP.h
+++ b/TAO/tao/ZIOP/ZIOP.h
@@ -39,12 +39,11 @@ class TAO_ServerRequest;
 class TAO_ZIOP_Export TAO_ZIOP_Loader : public TAO_ZIOP_Adapter
 {
 public:
-
   /// Constructor
-  TAO_ZIOP_Loader (void);
+  TAO_ZIOP_Loader ();
 
   /// Destructor
-  virtual ~TAO_ZIOP_Loader (void);
+  virtual ~TAO_ZIOP_Loader ();
 
   virtual bool decompress (ACE_Data_Block **db, TAO_Queued_Data &qd, TAO_ORB_Core &orb_core);
 
@@ -58,13 +57,12 @@ public:
   virtual void load_policy_validators (TAO_Policy_Validator &validator);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 
   /// Converts compressor ID to a compressor name.
   static const char * ziop_compressorid_name (::Compression::CompressorId st);
 
 private:
-
   /// Set to true after init is called.
   bool initialized_;
 
diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.h b/TAO/tao/ZIOP/ZIOP_ORBInitializer.h
index 87fcff4fbde..1f723f86404 100644
--- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.h
+++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.h
@@ -58,7 +58,6 @@ public:
   //@}
 
 private:
-
   /// Register policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_Validator.h b/TAO/tao/ZIOP/ZIOP_Policy_Validator.h
index 9cfab884e8d..fed6da7cd79 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_Validator.h
+++ b/TAO/tao/ZIOP/ZIOP_Policy_Validator.h
@@ -37,7 +37,6 @@ class TAO_ORB_Core;
 class TAO_ZIOP_Export TAO_ZIOPPolicy_Validator : public TAO_Policy_Validator
 {
 public:
-
   TAO_ZIOPPolicy_Validator (TAO_ORB_Core &orb_core);
 
   virtual void validate_impl (TAO_Policy_Set &policies);
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
index 1c252dee3e9..7000776893c 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
@@ -18,7 +18,7 @@ CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (
 {
 }
 
-CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (void)
+CompressorIdLevelListPolicy::CompressorIdLevelListPolicy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , ::ZIOP::CompressorIdLevelListPolicy ()
@@ -37,7 +37,7 @@ CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (const CompressorIdLeve
 }
 
 CORBA::PolicyType
-CompressorIdLevelListPolicy::policy_type (void)
+CompressorIdLevelListPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -56,7 +56,7 @@ CompressorIdLevelListPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressorIdLevelListPolicy::copy (void)
+CompressorIdLevelListPolicy::copy ()
 {
   CompressorIdLevelListPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, CompressorIdLevelListPolicy (*this),
@@ -67,12 +67,12 @@ CompressorIdLevelListPolicy::copy (void)
 }
 
 void
-CompressorIdLevelListPolicy::destroy (void)
+CompressorIdLevelListPolicy::destroy ()
 {
 }
 
 ::Compression::CompressorIdLevelList *
-CompressorIdLevelListPolicy::compressor_ids (void)
+CompressorIdLevelListPolicy::compressor_ids ()
 {
   return &this->value_;
 }
@@ -112,7 +112,7 @@ CompressionEnablingPolicy::CompressionEnablingPolicy (
 {
 }
 
-CompressionEnablingPolicy::CompressionEnablingPolicy (void)
+CompressionEnablingPolicy::CompressionEnablingPolicy ()
   : ::CORBA::Object ()
   , ::CORBA::Policy ()
   , ::ZIOP::CompressionEnablingPolicy ()
@@ -131,7 +131,7 @@ CompressionEnablingPolicy::CompressionEnablingPolicy (const CompressionEnablingP
 }
 
 CORBA::PolicyType
-CompressionEnablingPolicy::policy_type (void)
+CompressionEnablingPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -150,7 +150,7 @@ CompressionEnablingPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressionEnablingPolicy::copy (void)
+CompressionEnablingPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
  // exception safe!
@@ -164,12 +164,12 @@ CompressionEnablingPolicy::copy (void)
 }
 
 void
-CompressionEnablingPolicy::destroy (void)
+CompressionEnablingPolicy::destroy ()
 {
 }
 
 ::CORBA::Boolean
-CompressionEnablingPolicy::compression_enabled (void)
+CompressionEnablingPolicy::compression_enabled ()
 {
   return this->value_;
 }
@@ -220,7 +220,7 @@ CompressionLowValuePolicy::CompressionLowValuePolicy (const CompressionLowValueP
 }
 
 CORBA::PolicyType
-CompressionLowValuePolicy::policy_type (void)
+CompressionLowValuePolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -239,7 +239,7 @@ CompressionLowValuePolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressionLowValuePolicy::copy (void)
+CompressionLowValuePolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
  // exception safe!
@@ -253,12 +253,12 @@ CompressionLowValuePolicy::copy (void)
 }
 
 void
-CompressionLowValuePolicy::destroy (void)
+CompressionLowValuePolicy::destroy ()
 {
 }
 
 ::CORBA::ULong
-CompressionLowValuePolicy::low_value (void)
+CompressionLowValuePolicy::low_value ()
 {
   return this->value_;
 }
@@ -290,7 +290,7 @@ CompressionMinRatioPolicy::CompressionMinRatioPolicy (const CompressionMinRatioP
 }
 
 CORBA::PolicyType
-CompressionMinRatioPolicy::policy_type (void)
+CompressionMinRatioPolicy::policy_type ()
 {
   // Future policy implementors: notice how this minimizes the
   // footprint of the class.
@@ -309,7 +309,7 @@ CompressionMinRatioPolicy::clone () const
 }
 
 CORBA::Policy_ptr
-CompressionMinRatioPolicy::copy (void)
+CompressionMinRatioPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
  // exception safe!
@@ -323,12 +323,12 @@ CompressionMinRatioPolicy::copy (void)
 }
 
 void
-CompressionMinRatioPolicy::destroy (void)
+CompressionMinRatioPolicy::destroy ()
 {
 }
 
 ::Compression::CompressionRatio
-CompressionMinRatioPolicy::ratio (void)
+CompressionMinRatioPolicy::ratio ()
 {
   return this->value_;
 }
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.h b/TAO/tao/ZIOP/ZIOP_Policy_i.h
index 433926cf9c9..fb7be623b81 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.h
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.h
@@ -39,7 +39,7 @@ class CompressorIdLevelListPolicy
   , public virtual ::CORBA::LocalObject
 {
 public:
-  CompressorIdLevelListPolicy (void);
+  CompressorIdLevelListPolicy ();
 
   /// Constructor.
   CompressorIdLevelListPolicy (const ::Compression::CompressorIdLevelList& val);
@@ -52,11 +52,11 @@ public:
 
   virtual ::Compression::CompressorIdLevelList * compressor_ids ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
@@ -84,7 +84,7 @@ class CompressionEnablingPolicy
   , public virtual ::CORBA::LocalObject
 {
 public:
-  CompressionEnablingPolicy (void);
+  CompressionEnablingPolicy ();
 
   /// Constructor.
   CompressionEnablingPolicy (const ::CORBA::Boolean val);
@@ -96,13 +96,13 @@ public:
   virtual CompressionEnablingPolicy *clone () const;
 
   /// = The ZIOP::BidirectionalPolicy methods
-  virtual ::CORBA::Boolean compression_enabled (void);
+  virtual ::CORBA::Boolean compression_enabled ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
@@ -116,7 +116,6 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 private:
-
   /// The attribute
   ::CORBA::Boolean value_;
 };
@@ -131,7 +130,6 @@ class CompressionLowValuePolicy
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   CompressionLowValuePolicy (const ::CORBA::ULong val);
 
@@ -142,18 +140,17 @@ public:
   virtual CompressionLowValuePolicy *clone () const;
 
   /// = The ZIOP::BidirectionalPolicy methods
-  virtual ::CORBA::ULong low_value (void);
+  virtual ::CORBA::ULong low_value ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
 private:
-
   /// The attribute
   ::CORBA::ULong value_;
 };
@@ -168,7 +165,6 @@ class CompressionMinRatioPolicy
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   CompressionMinRatioPolicy (const ::Compression::CompressionRatio val);
 
@@ -178,18 +174,17 @@ public:
   /// Returns a copy of this CompressionMinRatioPolicy.
   virtual CompressionMinRatioPolicy *clone () const;
 
-  virtual ::Compression::CompressionRatio ratio (void);
+  virtual ::Compression::CompressionRatio ratio ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
 private:
-
   /// The attribute
   ::Compression::CompressionRatio value_;
 };
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp
index 9bc84af9845..a0d819ae2e8 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp
@@ -21,7 +21,7 @@ TAO_ZIOP_Stub::TAO_ZIOP_Stub (const char *repository_id,
 {
 }
 
-TAO_ZIOP_Stub::~TAO_ZIOP_Stub (void)
+TAO_ZIOP_Stub::~TAO_ZIOP_Stub ()
 {
   if (!CORBA::is_nil (this->compression_enabling_policy_.in ()))
     this->compression_enabling_policy_->destroy ();
@@ -31,7 +31,7 @@ TAO_ZIOP_Stub::~TAO_ZIOP_Stub (void)
 }
 
 void
-TAO_ZIOP_Stub::parse_policies (void)
+TAO_ZIOP_Stub::parse_policies ()
 {
   CORBA::PolicyList_var policy_list
     = this->base_profiles_.policy_list ();
@@ -61,7 +61,7 @@ TAO_ZIOP_Stub::parse_policies (void)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::exposed_compression_id_list_policy (void)
+TAO_ZIOP_Stub::exposed_compression_id_list_policy ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -78,7 +78,7 @@ TAO_ZIOP_Stub::exposed_compression_id_list_policy (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::exposed_compression_enabling_policy (void)
+TAO_ZIOP_Stub::exposed_compression_enabling_policy ()
 {
   if (!this->are_policies_parsed_)
     {
@@ -137,7 +137,7 @@ TAO_ZIOP_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::effective_compression_enabling_policy (void)
+TAO_ZIOP_Stub::effective_compression_enabling_policy ()
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -172,7 +172,7 @@ TAO_ZIOP_Stub::effective_compression_enabling_policy (void)
 }
 
 CORBA::Policy *
-TAO_ZIOP_Stub::effective_compression_id_list_policy (void)
+TAO_ZIOP_Stub::effective_compression_id_list_policy ()
 {
   // Get effective override (This is the CLIENTS compressor's priority ordered list).
   CORBA::Policy_var policy (
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.h b/TAO/tao/ZIOP/ZIOP_Stub.h
index 97c454197f8..51ce9fc5bd8 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.h
+++ b/TAO/tao/ZIOP/ZIOP_Stub.h
@@ -45,12 +45,11 @@ namespace TAO
 class TAO_ZIOP_Export TAO_ZIOP_Stub : public TAO_Stub
 {
 public:
-
   TAO_ZIOP_Stub (const char *repository_id,
                  const TAO_MProfile &profiles,
                  TAO_ORB_Core *orb_core);
 
-  virtual ~TAO_ZIOP_Stub (void);
+  virtual ~TAO_ZIOP_Stub ();
 
   /**
    * Returns the effective policy if @a type is a known client-exposed
@@ -62,20 +61,19 @@ public:
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
 private:
-
   /// Helper method used to parse the policies.
-  void parse_policies (void);
+  void parse_policies ();
 
   void exposed_compression_enabling_policy (CORBA::Policy_ptr policy);
 
   void exposed_compression_id_list_policy (CORBA::Policy_ptr policy);
 
-  CORBA::Policy_ptr exposed_compression_enabling_policy (void);
+  CORBA::Policy_ptr exposed_compression_enabling_policy ();
 
-  CORBA::Policy_ptr exposed_compression_id_list_policy (void);
+  CORBA::Policy_ptr exposed_compression_id_list_policy ();
 
-  CORBA::Policy *effective_compression_enabling_policy (void);
-  CORBA::Policy *effective_compression_id_list_policy (void);
+  CORBA::Policy *effective_compression_enabling_policy ();
+  CORBA::Policy *effective_compression_id_list_policy ();
 
   // The following attribute are used to cache
   // the different kind of policies and avoid to
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
index a9fe731afdf..23ca0b113ab 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory (void)
+TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory ()
 {
 }
 
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
index 0726fbf5dfb..e0a7b4be0f2 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
@@ -45,7 +45,7 @@ class TAO_ZIOP_Export TAO_ZIOP_Stub_Factory : public TAO_Stub_Factory
 {
 public:
   // -- Ctor/Dtor --
-  virtual ~TAO_ZIOP_Stub_Factory (void);
+  virtual ~TAO_ZIOP_Stub_Factory ();
 
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
diff --git a/TAO/tao/ZIOP_Adapter.h b/TAO/tao/ZIOP_Adapter.h
index 1044a885bcd..a8437685c55 100644
--- a/TAO/tao/ZIOP_Adapter.h
+++ b/TAO/tao/ZIOP_Adapter.h
@@ -46,7 +46,7 @@ public:
   virtual void load_policy_validators (TAO_Policy_Validator &validator) = 0;
 
   /// The virtual destructor
-  virtual ~TAO_ZIOP_Adapter (void);
+  virtual ~TAO_ZIOP_Adapter ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 9029b5a13ef..b7d36f6697b 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -37,10 +37,10 @@ class TAO_Export TAO_Default_Client_Strategy_Factory
 {
 public:
   /// Constructor.
-  TAO_Default_Client_Strategy_Factory (void);
+  TAO_Default_Client_Strategy_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Default_Client_Strategy_Factory (void);
+  virtual ~TAO_Default_Client_Strategy_Factory ();
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
@@ -52,9 +52,9 @@ public:
   // = Check Client_Strategy_Factory.h for the documentation of the
   //   following methods.
   virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
-  virtual ACE_Lock *create_transport_mux_strategy_lock (void);
+  virtual ACE_Lock *create_transport_mux_strategy_lock ();
   virtual int reply_dispatcher_table_size () const;
-  virtual int allow_callback (void);
+  virtual int allow_callback ();
   virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
   virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
   virtual bool use_cleanup_options () const;
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index cee00e985c0..c702393d69c 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -27,6 +27,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 
+#include <memory>
+
 #if !defined (__ACE_INLINE__)
 #include "tao/default_resource.inl"
 #endif /* __ACE_INLINE__ */
@@ -1127,7 +1129,6 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy (
           ACE_NEW_RETURN (strategy,
                           TAO_Null_Fragmentation_Strategy,
                           strategy);
-
         }
       else
         {
@@ -1192,7 +1193,7 @@ TAO_Default_Resource_Factory::codeset_manager()
     }
 
 
-  ACE_Auto_Ptr<TAO_Codeset_Manager> safemgr (mgr);
+  std::unique_ptr<TAO_Codeset_Manager> safemgr (mgr);
 
   if (TAO_debug_level >= 1)
     TAOLIB_DEBUG ((LM_DEBUG,
@@ -1203,7 +1204,6 @@ TAO_Default_Resource_Factory::codeset_manager()
   this->wchar_codeset_parameters_.apply_to (mgr->wchar_codeset_descriptor());
 
   return safemgr.release ();
-
 }
 
 TAO_Resource_Factory::Resource_Usage
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index b2e556c3d91..4f20cb03d58 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -138,7 +138,6 @@ public:
    * @name Member Accessors
    */
   //@{
-
   int get_parser_names (char **&names,
                         int &number_of_names);
   enum
@@ -147,7 +146,7 @@ public:
   };
 
   /// Modify and get the source for the CDR allocators
-  int cdr_allocator_source (void);
+  int cdr_allocator_source ();
 
   // = Resource Retrieval
   virtual int use_locked_data_blocks () const;
@@ -256,7 +255,7 @@ protected:
    */
   bool dynamically_allocated_reactor_;
 
-  virtual int load_default_protocols (void);
+  virtual int load_default_protocols ();
 
   /// This flag is used to determine whether options have been
   /// processed via the init() function.  It is necessary to
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 80f82534edf..3f61e85c2c6 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -33,8 +33,8 @@ class TAO_Export TAO_Default_Server_Strategy_Factory
   : public TAO_Server_Strategy_Factory
 {
 public:
-  TAO_Default_Server_Strategy_Factory (void);
-  virtual ~TAO_Default_Server_Strategy_Factory (void);
+  TAO_Default_Server_Strategy_Factory ();
+  virtual ~TAO_Default_Server_Strategy_Factory ();
 
   // = Service Configurator hooks.
   virtual int init (int argc, ACE_TCHAR* argv[]);
@@ -42,10 +42,10 @@ public:
   // = The TAO_Server_Strategy_Factory methods, please read the
   //   documentation in "tao/Server_Strategy_Factory.h"
   virtual int open (TAO_ORB_Core*);
-  virtual int activate_server_connections (void);
+  virtual int activate_server_connections ();
   virtual int thread_per_connection_timeout (ACE_Time_Value &timeout);
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
+  virtual int server_connection_thread_flags ();
+  virtual int server_connection_thread_count ();
 
   /// Parse the arguments, check the documentation in
   /// $TAO_ROOT/docs/Options.html for details
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 9d85feb2355..53d4e7bf6e8 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -140,7 +140,6 @@ public:
    * @name Helper methods used by the Invocation classes.
    */
   //@{
-
   /// Marshals the list of @c this->arg_ into the \a cdr.
   bool marshal_args (TAO_OutputCDR &cdr);
 
diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl
index 3db521b5de2..b1cc3fa16c9 100644
--- a/TAO/tao/operation_details.inl
+++ b/TAO/tao/operation_details.inl
@@ -71,7 +71,7 @@ TAO_Operation_Details::in_argument_flag () const
 #endif // TAO_IGNORE_IN_ARGS
 
 ACE_INLINE TAO_Service_Context &
-TAO_Operation_Details::request_service_context (void)
+TAO_Operation_Details::request_service_context ()
 {
   return this->request_service_info_;
 }
@@ -83,7 +83,7 @@ TAO_Operation_Details::request_service_context () const
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_Operation_Details::request_service_info (void)
+TAO_Operation_Details::request_service_info ()
 {
   return this->request_service_context ().service_info ();
 }
@@ -95,7 +95,7 @@ TAO_Operation_Details::request_service_info () const
 }
 
 ACE_INLINE TAO_Service_Context &
-TAO_Operation_Details::reply_service_context (void)
+TAO_Operation_Details::reply_service_context ()
 {
   return this->reply_service_info_;
 }
@@ -107,7 +107,7 @@ TAO_Operation_Details::reply_service_context () const
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_Operation_Details::reply_service_info (void)
+TAO_Operation_Details::reply_service_info ()
 {
   return this->reply_service_context ().service_info ();
 }
@@ -119,12 +119,12 @@ TAO_Operation_Details::reply_service_info () const
 }
 
 ACE_INLINE void
-TAO_Operation_Details::reset_request_service_info (void)
+TAO_Operation_Details::reset_request_service_info ()
 {
   this->request_service_context ().service_info ().length (0);
 }
 ACE_INLINE void
-TAO_Operation_Details::reset_reply_service_info (void)
+TAO_Operation_Details::reset_reply_service_info ()
 {
   this->reply_service_context ().service_info ().length (0);
 }
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 8e85b937e0f..13b01526c74 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -51,7 +51,6 @@ typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
 class TAO_Export TAO_ORB_Parameters
 {
 public:
-
   typedef ACE_Array_Map<ACE_CString, ACE_CString> endpoints_map_type;
 
   /// Constructor.
diff --git a/TAO/tao/params.inl b/TAO/tao/params.inl
index e2ede8c30bf..2d5dcd6632c 100644
--- a/TAO/tao/params.inl
+++ b/TAO/tao/params.inl
@@ -161,7 +161,7 @@ TAO_ORB_Parameters::nodelay (int x)
 }
 
 ACE_INLINE int
-TAO_ORB_Parameters::sock_keepalive (void)
+TAO_ORB_Parameters::sock_keepalive ()
 {
   return this->sock_keepalive_;
 }
@@ -173,7 +173,7 @@ TAO_ORB_Parameters::sock_keepalive (int x)
 }
 
 ACE_INLINE int
-TAO_ORB_Parameters::sock_dontroute (void)
+TAO_ORB_Parameters::sock_dontroute ()
 {
   return this->sock_dontroute_;
 }
@@ -185,7 +185,7 @@ TAO_ORB_Parameters::sock_dontroute (int x)
 }
 
 ACE_INLINE int
-TAO_ORB_Parameters::ip_hoplimit (void)
+TAO_ORB_Parameters::ip_hoplimit ()
 {
   return this->ip_hoplimit_;
 }
@@ -197,7 +197,7 @@ TAO_ORB_Parameters::ip_hoplimit (int x)
 }
 
 ACE_INLINE bool
-TAO_ORB_Parameters::ip_multicastloop (void)
+TAO_ORB_Parameters::ip_multicastloop ()
 {
   return this->ip_multicastloop_;
 }
@@ -209,7 +209,7 @@ TAO_ORB_Parameters::ip_multicastloop (bool x)
 }
 
 ACE_INLINE u_short
-TAO_ORB_Parameters::iiop_client_port_base (void)
+TAO_ORB_Parameters::iiop_client_port_base ()
 {
   return this->iiop_client_port_base_;
 }
@@ -221,7 +221,7 @@ TAO_ORB_Parameters::iiop_client_port_base (u_short b)
 }
 
 ACE_INLINE u_short
-TAO_ORB_Parameters::iiop_client_port_span (void)
+TAO_ORB_Parameters::iiop_client_port_span ()
 {
   return this->iiop_client_port_base_ ?
     this->iiop_client_port_span_ : 0;
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index b4dc72e825b..398ef5c1064 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -54,7 +54,6 @@ namespace TAO
 class TAO_Export TAO_Target_Specification
 {
 public:
-
   /// Ctor
   TAO_Target_Specification ();
   enum TAO_Target_Address
diff --git a/TAO/tao/target_specification.inl b/TAO/tao/target_specification.inl
index cd58417e335..0dbefafc9d4 100644
--- a/TAO/tao/target_specification.inl
+++ b/TAO/tao/target_specification.inl
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Target_Specification::TAO_Target_Specification (void)
+TAO_Target_Specification::TAO_Target_Specification ()
   :specifier_ (TAO_Target_Specification::Key_Addr),
    profile_index_ (0)
 {
@@ -46,7 +46,7 @@ TAO_Target_Specification::target_specifier (IOP::IOR &ior,
 }
 
 ACE_INLINE const TAO::ObjectKey*
-TAO_Target_Specification::object_key (void)
+TAO_Target_Specification::object_key ()
 {
   if (this->specifier_ == TAO_Target_Specification::Key_Addr)
     return this->u_.object_key_;
@@ -55,7 +55,7 @@ TAO_Target_Specification::object_key (void)
 }
 
 ACE_INLINE const IOP::TaggedProfile *
-TAO_Target_Specification::profile (void)
+TAO_Target_Specification::profile ()
 {
   if (this->specifier_ == TAO_Target_Specification::Profile_Addr)
     return this->u_.profile_;
@@ -77,7 +77,7 @@ TAO_Target_Specification::iop_ior (IOP::IOR *& ior)
 }
 
 ACE_INLINE TAO_Target_Specification::TAO_Target_Address
-TAO_Target_Specification::specifier (void)
+TAO_Target_Specification::specifier ()
 {
   return this->specifier_;
 }
diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h
index 6cb0b769609..300ac7e1fcd 100644
--- a/TAO/tao/varbase.h
+++ b/TAO/tao/varbase.h
@@ -34,10 +34,8 @@ public:
   TAO_Base_var () {}
 
 private:
-
   TAO_Base_var (const TAO_Base_var &);
   TAO_Base_var & operator= (const TAO_Base_var &);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 5f7d3cd9fef..9335e55a899 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -72,7 +72,7 @@ public:
   virtual ~ST_AMH_Server ();
 
   /// ORB initialisation stuff
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// register the servant with the poa
   virtual void register_servant (ST_AMH_Servant *servant);
@@ -131,7 +131,7 @@ ST_AMH_Server::~ST_AMH_Server ()
 }
 
 int
-ST_AMH_Server::start_orb_and_poa (void)
+ST_AMH_Server::start_orb_and_poa ()
 {
   try
     {
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 086b43367e0..38fc4db9cca 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -4,7 +4,6 @@
 #include "TestS.h"
 
 int num_calls = 10; // total calls client is going to make
-const int sleep_time = 1; // sleep for  1 sec on each call
 
 // This should equal num_calls within 'sleep * num_calls' seconds
 int calls_received = 0;
@@ -44,7 +43,6 @@ protected:
   CORBA::ORB_var orb_;
 };
 
-
 /***************************/
 /*** Servant Definition ***/
 
@@ -65,7 +63,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr,
   // the client as well
 }
 
-
 /*** Server Declaration ***/
 
 /**
@@ -76,10 +73,10 @@ class ST_AMH_Server
 {
 public:
   ST_AMH_Server (int *argc, ACE_TCHAR **argv);
-  virtual ~ST_AMH_Server ();
+  virtual ~ST_AMH_Server () = default;
 
   /// ORB initialization stuff
-  int start_orb_and_poa (void);
+  int start_orb_and_poa ();
 
   /// register the servant with the poa
   virtual void register_servant (ST_AMH_Servant *servant);
@@ -121,10 +118,6 @@ ST_AMH_Server::ST_AMH_Server (int* argc, ACE_TCHAR **argv)
   this->ior_output_file_ = const_cast<char*> ("test.ior");
 }
 
-ST_AMH_Server::~ST_AMH_Server ()
-{
-}
-
 void
 ST_AMH_Server::cleanup ()
 {
@@ -142,7 +135,7 @@ ST_AMH_Server::cleanup ()
 }
 
 int
-ST_AMH_Server::start_orb_and_poa (void)
+ST_AMH_Server::start_orb_and_poa ()
 {
   try
     {
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index b87718680e2..ae02f995243 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -18,7 +18,6 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         const char * in_str,
                         bool check_params)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     number_ ((CORBA::Long) 931232),
      yadda_ ((CORBA::Long) 140474),
      in_l_ (in_l),
      in_str_(CORBA::string_dup(in_str)),
@@ -61,13 +60,13 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index 22f9b58728f..6487e77d505 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -34,9 +34,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
@@ -45,8 +45,6 @@ public:
 private:
   CORBA::ORB_var orb_;
 
-  CORBA::Long number_;
-
   CORBA::Long yadda_;
 
   CORBA::Long in_l_;
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 17480ca2adb..d68560f8842 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -102,7 +102,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   };
 
@@ -128,7 +128,6 @@ public:
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"));
       try
@@ -154,7 +153,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -165,7 +164,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     };
-  ~Handler (void)
+  ~Handler ()
   {
   };
 
@@ -308,7 +307,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 47a4fef9047..0500ee74451 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -61,10 +61,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler (void) {};
+  Handler () = default;
 
   /// Destructor.
-    ~Handler (void) {};
+  ~Handler () = default;
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
@@ -94,7 +94,6 @@ public:
 
   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"
                   "Testing proper exception handling ...\n"));
@@ -143,7 +142,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index 4c592413169..cc3b457afe4 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -18,7 +18,7 @@ AMI_Buffering::Nest_Guard::Nest_Guard (AMI_Buffering &a)
     target_.max_nest_ = target_.nest_;
 }
 
-AMI_Buffering::Nest_Guard::~Nest_Guard (void)
+AMI_Buffering::Nest_Guard::~Nest_Guard ()
 {
   --target_.nest_;
 }
@@ -40,25 +40,25 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload)
 }
 
 void
-AMI_Buffering::flush (void)
+AMI_Buffering::flush ()
 {
 }
 
 void
-AMI_Buffering::sync (void)
+AMI_Buffering::sync ()
 {
   this->admin_->flush ();
 }
 
 void
-AMI_Buffering::shutdown (void)
+AMI_Buffering::shutdown ()
 {
   this->must_shutdown_ = true;
   this->try_shutdown();
 }
 
 void
-AMI_Buffering::try_shutdown(void)
+AMI_Buffering::try_shutdown()
 {
   if (!this->must_shutdown_ || this->nest_ > 0)
     return;
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index 8717c5b5917..22de3af8fee 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -17,20 +17,20 @@ public:
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void sync (void);
+  virtual void sync ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// internal implementation of shutdown. This
-  void try_shutdown (void);
+  void try_shutdown ();
 
   class Nest_Guard
     {
     public:
       Nest_Guard (AMI_Buffering &);
-      ~Nest_Guard (void);
+      ~Nest_Guard ();
     private:
       AMI_Buffering &target_;
     };
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index 9706776f1fc..c50ae8d98eb 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -8,13 +8,13 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::request_count (void)
+AMI_Buffering_Admin::request_count ()
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::bytes_received_count (void)
+AMI_Buffering_Admin::bytes_received_count ()
 {
   return this->bytes_received_count_;
 }
@@ -27,12 +27,12 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length)
 }
 
 void
-AMI_Buffering_Admin::flush (void)
+AMI_Buffering_Admin::flush ()
 {
 }
 
 void
-AMI_Buffering_Admin::shutdown (void)
+AMI_Buffering_Admin::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index 60f0b40346a..490e0d364a2 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -14,15 +14,15 @@ public:
   AMI_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (void);
+  virtual CORBA::ULong request_count ();
 
-  virtual CORBA::ULong bytes_received_count (void);
+  virtual CORBA::ULong bytes_received_count ();
 
   virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp
index 48327cc41ca..db5bae4319d 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.cpp
+++ b/TAO/tests/AMI_Buffering/Client_Task.cpp
@@ -8,14 +8,14 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 }
 
 void
-Client_Task::terminate_loop (void)
+Client_Task::terminate_loop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->terminate_loop_ = 1;
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   try
diff --git a/TAO/tests/AMI_Buffering/Client_Task.h b/TAO/tests/AMI_Buffering/Client_Task.h
index 631aae096d2..b4b64869a89 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.h
+++ b/TAO/tests/AMI_Buffering/Client_Task.h
@@ -18,10 +18,10 @@ public:
   Client_Task (CORBA::ORB_ptr orb);
 
   /// Terminate the loop
-  void terminate_loop (void);
+  void terminate_loop ();
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index 99cf8d3157b..53848092efc 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -1,11 +1,11 @@
 #include "Reply_Handler.h"
 
-Reply_Handler::Reply_Handler (void)
+Reply_Handler::Reply_Handler ()
 {
 }
 
 void
-Reply_Handler::receive_data (void)
+Reply_Handler::receive_data ()
 {
 }
 
@@ -23,7 +23,7 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder)
 }
 
 void
-Reply_Handler::sync (void)
+Reply_Handler::sync ()
 {
 }
 
@@ -41,7 +41,7 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder)
 }
 
 void
-Reply_Handler::shutdown (void)
+Reply_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index 9260787f71b..a6ae680c824 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -11,16 +11,16 @@ class Reply_Handler
 {
 public:
   /// Constructor
-  Reply_Handler (void);
+  Reply_Handler ();
 
   // = The skeleton methods
-  virtual void receive_data (void);
+  virtual void receive_data ();
   virtual void receive_data_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void sync (void);
+  virtual void sync ();
   virtual void sync_excep (::Messaging::ExceptionHolder *holder);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
 };
 
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/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index 0a77ef98bc8..4bcfed42729 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -34,7 +34,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec)
 }
 
 void
-Timeout_i::shutdown (void)
+Timeout_i::shutdown ()
 {
   orb_->shutdown ();
   //ACE_DEBUG ((LM_DEBUG,
@@ -53,7 +53,7 @@ TimeoutHandler_i::TimeoutHandler_i ()
 }
 
 void
-TimeoutHandler_i::sendTimeToWait (void)
+TimeoutHandler_i::sendTimeToWait ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "reply"));
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index b5da504a2ed..e15ae533023 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -24,7 +24,7 @@ public:
 
   virtual void sendTimeToWait (CORBA::Long msec);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -38,7 +38,7 @@ public:
 
   ~TimeoutHandler_i () = default;
 
-  virtual void sendTimeToWait (void);
+  virtual void sendTimeToWait ();
 
   virtual void sendTimeToWait_excep (
       ::Messaging::ExceptionHolder * excep_holder);
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 7ec9006996a..65900ae7808 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -43,7 +43,7 @@ passer_i::passer_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 }
 
 void
-passer_i::shutdown (void)
+passer_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index 7c103c98c8e..f6c2c3673e8 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -22,7 +22,7 @@ public:
 
   virtual void pass_nil (base_out outarg);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.cpp b/TAO/tests/Alt_Mapping/alt_mapping_i.cpp
index ed022f1e666..b6c0de213b7 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping_i.cpp
+++ b/TAO/tests/Alt_Mapping/alt_mapping_i.cpp
@@ -20,7 +20,7 @@ Alt_Mapping_i::Alt_Mapping_i (CORBA::ORB_ptr orb)
 {
 }
 
-Alt_Mapping_i::~Alt_Mapping_i (void)
+Alt_Mapping_i::~Alt_Mapping_i ()
 {
 }
 
@@ -54,7 +54,7 @@ Alt_Mapping_i::test_struct_sequence (
 }
 
 void
-Alt_Mapping_i::shutdown (void)
+Alt_Mapping_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.h b/TAO/tests/Alt_Mapping/alt_mapping_i.h
index e0e852b0fb9..3c52050a2eb 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping_i.h
+++ b/TAO/tests/Alt_Mapping/alt_mapping_i.h
@@ -25,7 +25,7 @@ class Alt_Mapping_i : public POA_Alt_Mapping
 public:
   Alt_Mapping_i (CORBA::ORB_ptr orb);
 
-  ~Alt_Mapping_i (void);
+  ~Alt_Mapping_i ();
 
   virtual std::string
   test_unbounded_string (const std::string s1,
@@ -37,7 +37,7 @@ public:
     Alt_Mapping::StructSeq & s2,
     Alt_Mapping::StructSeq & s3);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp
index 681c105de4f..0ee820d05cc 100644
--- a/TAO/tests/Alt_Mapping/client.cpp
+++ b/TAO/tests/Alt_Mapping/client.cpp
@@ -31,14 +31,14 @@ Alt_Mapping_Client<T>::Alt_Mapping_Client (CORBA::ORB_ptr orb,
 
 // destructor
 template <class T>
-Alt_Mapping_Client<T>::~Alt_Mapping_Client (void)
+Alt_Mapping_Client<T>::~Alt_Mapping_Client ()
 {
   delete this->test_object_;
 }
 
 // All the individual tests.
 template <class T> int
-Alt_Mapping_Client<T>::run_sii_test (void)
+Alt_Mapping_Client<T>::run_sii_test ()
 {
   CORBA::ULong i = 0;  // loop index
   Options *opt = OPTIONS::instance (); // get the options
@@ -98,7 +98,6 @@ Alt_Mapping_Client<T>::run_sii_test (void)
         }
       catch (const CORBA::Exception& ex)
         {
-
           this->results_.error_count (this->results_.error_count () + 1);
           ex._tao_print_exception (opname);
           ACE_ERROR ((LM_ERROR,
@@ -106,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/client.h b/TAO/tests/Alt_Mapping/client.h
index 6dce445ec8b..8a4be2d0646 100644
--- a/TAO/tests/Alt_Mapping/client.h
+++ b/TAO/tests/Alt_Mapping/client.h
@@ -39,10 +39,10 @@ public:
                      Alt_Mapping_ptr objref,
                      T *);
 
-  ~Alt_Mapping_Client (void);
+  ~Alt_Mapping_Client ();
 
   /// run the SII test
-  int run_sii_test (void);
+  int run_sii_test ();
 
 private:
   /// underlying ORB
diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp
index da6e7f6e0ff..fc5f22ee919 100644
--- a/TAO/tests/Alt_Mapping/driver.cpp
+++ b/TAO/tests/Alt_Mapping/driver.cpp
@@ -40,11 +40,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 }
 
 // constructor
-Driver::Driver (void)
+Driver::Driver ()
 {
 }
 
-Driver::~Driver (void)
+Driver::~Driver ()
 {
 }
 
@@ -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)
     {
@@ -103,7 +102,7 @@ Driver::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Driver::run (void)
+Driver::run ()
 {
   // serves as a factory of Param_Client objects. It is also responsible to
   // start the test
diff --git a/TAO/tests/Alt_Mapping/driver.h b/TAO/tests/Alt_Mapping/driver.h
index 42b76a5c132..a1e0ac1f4f2 100644
--- a/TAO/tests/Alt_Mapping/driver.h
+++ b/TAO/tests/Alt_Mapping/driver.h
@@ -27,14 +27,14 @@ class Driver
 {
 public:
   // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
+  Driver ();
+  ~Driver ();
 
   /// Initialize the driver object
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// underlying ORB (we do not own it)
diff --git a/TAO/tests/Alt_Mapping/helper.cpp b/TAO/tests/Alt_Mapping/helper.cpp
index b1c28b87cc1..a80382afa39 100644
--- a/TAO/tests/Alt_Mapping/helper.cpp
+++ b/TAO/tests/Alt_Mapping/helper.cpp
@@ -16,28 +16,28 @@
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
-Generator::Generator (void)
+Generator::Generator ()
 {
 }
 
-Generator::~Generator (void)
+Generator::~Generator ()
 {
 }
 
 CORBA::Short
-Generator::gen_short (void)
+Generator::gen_short ()
 {
   return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE);
 }
 
 CORBA::Long
-Generator::gen_long (void)
+Generator::gen_long ()
 {
   return ::ACE_OS::rand () % TEST_BUFSIZE;
 }
 
 char *
-Generator::gen_string (void)
+Generator::gen_string ()
 {
   return gen_string (TEST_BUFSIZE);
 }
@@ -64,7 +64,7 @@ Generator::gen_string (int max_length)
 }
 
 CORBA::WChar *
-Generator::gen_wstring (void)
+Generator::gen_wstring ()
 {
   return gen_wstring (TEST_BUFSIZE);
 }
@@ -92,7 +92,7 @@ Generator::gen_wstring (int max_length)
 }
 
 const Alt_Mapping::Fixed_Struct
-Generator::gen_fixed_struct (void)
+Generator::gen_fixed_struct ()
 {
   this->fixed_struct_.l = ACE_OS::rand ();
   this->fixed_struct_.c = ACE_OS::rand () % 128;
diff --git a/TAO/tests/Alt_Mapping/helper.h b/TAO/tests/Alt_Mapping/helper.h
index ab589675057..55824f5078a 100644
--- a/TAO/tests/Alt_Mapping/helper.h
+++ b/TAO/tests/Alt_Mapping/helper.h
@@ -20,17 +20,17 @@
 class Generator
 {
 public:
-  Generator (void);
+  Generator ();
 
-  ~Generator (void);
+  ~Generator ();
 
-  CORBA::Short gen_short (void);
-  CORBA::Long gen_long (void);
-  char* gen_string (void);
+  CORBA::Short gen_short ();
+  CORBA::Long gen_long ();
+  char* gen_string ();
   char* gen_string (int maxlength);
-  CORBA::WChar* gen_wstring (void);
+  CORBA::WChar* gen_wstring ();
   CORBA::WChar* gen_wstring (int maxlength);
-  const Alt_Mapping::Fixed_Struct gen_fixed_struct (void);
+  const Alt_Mapping::Fixed_Struct gen_fixed_struct ();
 
  private:
   Alt_Mapping::Fixed_Struct fixed_struct_;
diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp
index 923d6ed5fa7..56659886a1c 100644
--- a/TAO/tests/Alt_Mapping/options.cpp
+++ b/TAO/tests/Alt_Mapping/options.cpp
@@ -20,7 +20,7 @@
 #include "ace/Log_Msg.h"
 
 // Constructor.p
-Options::Options (void)
+Options::Options ()
   : ior_ (CORBA::string_dup ("file://test.ior")),
     test_type_ (Options::NO_TEST),
     invoke_type_ (Options::SII),
@@ -30,7 +30,7 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
@@ -133,19 +133,19 @@ Options::param_test_ior () const
 }
 
 Options::TEST_TYPE
-Options::test_type (void)
+Options::test_type ()
 {
   return this->test_type_;
 }
 
 Options::INVOKE_TYPE
-Options::invoke_type (void)
+Options::invoke_type ()
 {
   return this->invoke_type_;
 }
 
 CORBA::ULong
-Options::loop_count (void)
+Options::loop_count ()
 {
   return this->loop_count_;
 }
diff --git a/TAO/tests/Alt_Mapping/options.h b/TAO/tests/Alt_Mapping/options.h
index 8a6796c3cef..23a36cf6720 100644
--- a/TAO/tests/Alt_Mapping/options.h
+++ b/TAO/tests/Alt_Mapping/options.h
@@ -40,10 +40,10 @@ public:
   };
 
   /// constructor
-  Options (void);
+  Options ();
 
   /// destructor
-  ~Options (void);
+  ~Options ();
 
   /// Parses the arguments passed on the command line.
   int parse_args (int argc, ACE_TCHAR **argv);
@@ -52,13 +52,13 @@ public:
   char const * param_test_ior () const;
 
   /// what test to run
-  TEST_TYPE test_type (void);
+  TEST_TYPE test_type ();
 
   /// whether to use SII or DII
-  INVOKE_TYPE invoke_type (void);
+  INVOKE_TYPE invoke_type ();
 
   /// number of times to run the test
-  CORBA::ULong loop_count (void);
+  CORBA::ULong loop_count ();
 
   /// whether debug option is on or not
   CORBA::Boolean debug () const;
diff --git a/TAO/tests/Alt_Mapping/results.cpp b/TAO/tests/Alt_Mapping/results.cpp
index 098370c8dcb..b6957633956 100644
--- a/TAO/tests/Alt_Mapping/results.cpp
+++ b/TAO/tests/Alt_Mapping/results.cpp
@@ -14,17 +14,17 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-Results::Results (void)
+Results::Results ()
 {
 }
 
-Results::~Results (void)
+Results::~Results ()
 {
   delete [] this->elapsed_time_;
 }
 
 void
-Results::print_stats (void)
+Results::print_stats ()
 {
   double
     avg_real_time = 0,
@@ -103,20 +103,20 @@ Results::print_exception (const char * /* call_name */)
 }
 
 void
-Results::start_timer (void)
+Results::start_timer ()
 {
   this->timer_.start ();
 }
 
 void
-Results::stop_timer (void)
+Results::stop_timer ()
 {
   this->timer_.stop ();
   this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]);
 }
 
 CORBA::ULong
-Results::call_count (void)
+Results::call_count ()
 {
   return this->call_count_;
 }
@@ -128,7 +128,7 @@ Results::call_count (CORBA::ULong c)
 }
 
 CORBA::ULong
-Results::error_count (void)
+Results::error_count ()
 {
   return this->error_count_;
 }
diff --git a/TAO/tests/Alt_Mapping/results.h b/TAO/tests/Alt_Mapping/results.h
index dd2e62756f7..0607cc430e9 100644
--- a/TAO/tests/Alt_Mapping/results.h
+++ b/TAO/tests/Alt_Mapping/results.h
@@ -33,31 +33,31 @@ class Results
 {
 public:
   /// ctor
-  Results (void);
+  Results ();
 
   /// destructor
-  ~Results (void);
+  ~Results ();
 
   /// prints the time stats
-  void print_stats (void);
+  void print_stats ();
 
   /// print the exception
   void print_exception (const char *call_name);
 
   /// start timing
-  void start_timer (void);
+  void start_timer ();
 
   /// stop timing
-  void stop_timer (void);
+  void stop_timer ();
 
   /// return call count
-  CORBA::ULong call_count (void);
+  CORBA::ULong call_count ();
 
   /// set the call count
   void call_count (CORBA::ULong);
 
   /// return the error count
-  CORBA::ULong error_count (void);
+  CORBA::ULong error_count ();
 
   /// set error count
   void error_count (CORBA::ULong);
diff --git a/TAO/tests/Alt_Mapping/ub_string.cpp b/TAO/tests/Alt_Mapping/ub_string.cpp
index a1cb328c8a5..b71967dca0f 100644
--- a/TAO/tests/Alt_Mapping/ub_string.cpp
+++ b/TAO/tests/Alt_Mapping/ub_string.cpp
@@ -17,12 +17,12 @@
 //               Test_Unbounded_String
 // ************************************************************************
 
-Test_Unbounded_String::Test_Unbounded_String (void)
+Test_Unbounded_String::Test_Unbounded_String ()
   : opname_ (CORBA::string_dup ("test_unbounded_string"))
 {
 }
 
-Test_Unbounded_String::~Test_Unbounded_String (void)
+Test_Unbounded_String::~Test_Unbounded_String ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -46,7 +46,7 @@ Test_Unbounded_String::init_parameters (Alt_Mapping_ptr)
 }
 
 int
-Test_Unbounded_String::reset_parameters (void)
+Test_Unbounded_String::reset_parameters ()
 {
   this->inout_ = this->in_.c_str ();
   this->out_.clear ();
@@ -75,7 +75,7 @@ Test_Unbounded_String::run_sii_test (Alt_Mapping_ptr objref)
 }
 
 CORBA::Boolean
-Test_Unbounded_String::check_validity (void)
+Test_Unbounded_String::check_validity ()
 {
   CORBA::ULong len = this->in_.length ();
 
@@ -98,7 +98,7 @@ Test_Unbounded_String::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_String::print_values (void)
+Test_Unbounded_String::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Alt_Mapping/ub_string.h b/TAO/tests/Alt_Mapping/ub_string.h
index 7326aa8f5de..7af096f8bf8 100644
--- a/TAO/tests/Alt_Mapping/ub_string.h
+++ b/TAO/tests/Alt_Mapping/ub_string.h
@@ -22,10 +22,10 @@ class Test_Unbounded_String
 {
 public:
   /// ctor
-  Test_Unbounded_String (void);
+  Test_Unbounded_String ();
 
   /// dtor
-  ~Test_Unbounded_String (void);
+  ~Test_Unbounded_String ();
 
   /// run the SII test
   int run_sii_test (Alt_Mapping_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Alt_Mapping_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
 private:
   /// operation name
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
index 95673f39d4b..3b3c0c7e8ba 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
@@ -63,7 +63,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr)
 }
 
 int
-Test_Unbounded_Struct_Sequence::reset_parameters (void)
+Test_Unbounded_Struct_Sequence::reset_parameters ()
 {
   this->inout_.clear ();
   this->out_.clear ();
@@ -87,13 +87,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Unbounded_Struct_Sequence::check_validity (void)
+Test_Unbounded_Struct_Sequence::check_validity ()
 {
   return (this->compare (this->in_, this->inout_)
           && this->compare (this->in_, this->out_)
@@ -101,7 +100,7 @@ Test_Unbounded_Struct_Sequence::check_validity (void)
 }
 
 void
-Test_Unbounded_Struct_Sequence::print_values (void)
+Test_Unbounded_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.h b/TAO/tests/Alt_Mapping/ub_struct_seq.h
index 973f9a0f186..4579bef5674 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.h
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.h
@@ -23,10 +23,10 @@ class Test_Unbounded_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Unbounded_Struct_Sequence (void);
+  Test_Unbounded_Struct_Sequence ();
 
   /// dtor
-  ~Test_Unbounded_Struct_Sequence (void);
+  ~Test_Unbounded_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Alt_Mapping_ptr objref);
@@ -38,13 +38,13 @@ public:
   int init_parameters (Alt_Mapping_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
 protected:
   /// compare
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h
index a5a13ea2723..97d878316d8 100644
--- a/TAO/tests/Any/Recursive/Hello.h
+++ b/TAO/tests/Any/Recursive/Hello.h
@@ -20,20 +20,17 @@ class Hello
   : public virtual POA_Test::Hello
 {
 public:
-
   /// Constructor
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The ORB which will be shutdown by Hello::shutdown().
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* HELLO_H */
diff --git a/TAO/tests/BiDirectional/README b/TAO/tests/BiDirectional/README
index 4470ea72d13..917a2220703 100644
--- a/TAO/tests/BiDirectional/README
+++ b/TAO/tests/BiDirectional/README
@@ -1,4 +1,4 @@
-This is a test that exercises the birectional GIOP connection
+This is a test that exercises the bidirectional GIOP connection
 implementation in TAO. Start the server like this
 
 $ server -o <file.ior> -i <no_iterations>
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index d9ea9fbf372..286816e91c4 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -5,7 +5,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
@@ -115,7 +115,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Send the callback object to the server
       server->callback_object (callback.in ());
 
-      // A  method to kickstart callbacks from the server
+      // A method to kickstart callbacks from the server
       CORBA::Long r =
         server->test_method (1);
 
@@ -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/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index b94de23c40e..61c908bca61 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -10,14 +10,14 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
 }
 
 void
-Callback_i::callback_method ( /**/)
+Callback_i::callback_method (/**/)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
@@ -47,7 +47,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (void)
+Simple_Server_i::call_client ()
 {
   if (this->flag_)
     {
@@ -78,7 +78,7 @@ Simple_Server_i::call_client (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index 7536e63f0d6..8444d669abe 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -28,15 +28,14 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
   CORBA::ORB_var orb_;
-
 };
 
 /**
@@ -57,9 +56,9 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
-  int call_client (void);
+  int call_client ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index 3ce3740d7ce..4ff765c785a 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -6,7 +6,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index 1ce4b4964a8..a7c003f4788 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -10,7 +10,7 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   // Shutdown the server before we shutdown our own ORB
@@ -20,7 +20,7 @@ Callback_i::shutdown (void)
 }
 
 void
-Callback_i::callback_method (void)
+Callback_i::callback_method ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
@@ -91,7 +91,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
index 7d63e09030c..5c43b5b1ed2 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
@@ -29,10 +29,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -59,7 +59,7 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *act = 0);
@@ -68,9 +68,6 @@ private:
   /// The ORB
   CORBA::ORB_var orb_;
 
-  /// Flag to indicate, whether we are ready for a remote call.
-  int flag_;
-
   /// Callback Object
   Callback_var callback_;
 
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
index aba644cae6f..00eebe89830 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
@@ -9,7 +9,6 @@ ACE_INLINE
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
                                   int no_iterations)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     flag_ (0),
      callback_ (0),
      no_iterations_ (no_iterations)
 {
diff --git a/TAO/tests/BiDirectional_MultipleORB/README b/TAO/tests/BiDirectional_MultipleORB/README
index 6a228884e62..7d8df42e5f4 100644
--- a/TAO/tests/BiDirectional_MultipleORB/README
+++ b/TAO/tests/BiDirectional_MultipleORB/README
@@ -1,4 +1,4 @@
-This is a test that creates a birectional GIOP policy for a POA and then
+This is a test that creates a bidirectional GIOP policy for a POA and then
 attempts to repeat this, after destructing and re-creating the ORB. This used to
 fail by breaking an assertion, because the second ORB was trying to register a policy
 validator object instance, which lingered since the time the first ORB was created.
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
index f3446e8b98c..bdbc66000a2 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -16,14 +16,12 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
 
-
 int
 test_with_bidir_poa (int argc,
                      ACE_TCHAR **argv,
                      const char *orb_name,
                      int destroy_orb)
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 7e84160fe48..daa8ef6e573 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -6,7 +6,7 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-void do_nothing (void)
+void do_nothing ()
 {
 }
 
@@ -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/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index fb14458b6e6..8ac743bb376 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -9,14 +9,14 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Callback_i::shutdown (void)
+Callback_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
   this->orb_->shutdown (false);
 }
 
 void
-Callback_i::callback_method ( /**/)
+Callback_i::callback_method (/**/)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
@@ -63,7 +63,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
index 8051d1c805a..9c99a0644bd 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
@@ -28,10 +28,10 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
 
   /// Safe way to shutdown
-  void shutdown (void);
+  void shutdown ();
 
   /// The callback method
-  void callback_method (void);
+  void callback_method ();
 
 private:
   /// The orb
@@ -56,15 +56,12 @@ public:
 
   void callback_object (Callback_ptr callback);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
   CORBA::ORB_var orb_;
 
-  /// Flag to indicate, whether we are ready for a remote call.
-  int flag_;
-
   /// Callback Object
   Callback_var callback_;
 
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
index d29fbb9f970..566fe0d303c 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
@@ -8,7 +8,6 @@ ACE_INLINE
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
                                   int no_iterations)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     flag_ (0),
      callback_ (0),
      no_iterations_ (no_iterations)
 {
diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp
index 08a56b206e7..45a6662936f 100644
--- a/TAO/tests/Big_AMI/ami_test_i.cpp
+++ b/TAO/tests/Big_AMI/ami_test_i.cpp
@@ -37,7 +37,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h
index 843c2e2648c..4a4597272ce 100644
--- a/TAO/tests/Big_AMI/ami_test_i.h
+++ b/TAO/tests/Big_AMI/ami_test_i.h
@@ -32,7 +32,7 @@ public:
                    const char* in_str,
                    const A::Payload &the_payload);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 9824af20cbb..355ead34c61 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -65,10 +65,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler (void) : reply_count_ (0) {};
+  Handler () : reply_count_ (0) {};
 
   /// Destructor.
-  ~Handler (void) {};
+  ~Handler () = default;
 
   /// Get the reply count
   long reply_count () const
@@ -212,8 +212,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                       );
+                        0);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 7b5cb6645c6..70bc80cdf48 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -8,7 +8,7 @@ Coordinator::Coordinator (CORBA::ULong peer_count)
   ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]);
 }
 
-Coordinator::~Coordinator (void)
+Coordinator::~Coordinator ()
 {
   delete[] this->peers_;
 }
@@ -42,7 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
 }
 
 void
-Coordinator::shutdown_all_peers (void)
+Coordinator::shutdown_all_peers ()
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 72e79a9389e..5995c27e2ac 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -25,14 +25,14 @@ public:
                             Test::Session_List &session_list);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (void);
+  void shutdown_all_peers ();
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected Destructor, call _remove_ref() instead
-  virtual ~Coordinator (void);
+  virtual ~Coordinator ();
 
 private:
   /// Store a reference to each peer
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index be8124c5d82..d81779cec2d 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -6,7 +6,7 @@ Peer::Peer (CORBA::ORB_ptr orb)
 {
 }
 
-Peer::~Peer (void)
+Peer::~Peer ()
 {
 }
 
@@ -41,7 +41,7 @@ Peer::create_session (Test::Session_Control_ptr control,
 }
 
 void
-Peer::shutdown (void)
+Peer::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 9188396fcce..61ce3f84a50 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -14,7 +14,7 @@ public:
   Peer (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~Peer (void);
+  virtual ~Peer ();
 
   // = The skeleton methods
   virtual Test::Session_ptr create_session (Test::Session_Control_ptr control,
@@ -22,7 +22,7 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index 5f205cd73a8..5baadc17457 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -18,12 +18,12 @@ Session::Session (Test::Session_Control_ptr control,
 {
 }
 
-Session::~Session (void)
+Session::~Session ()
 {
 }
 
 int
-Session::svc (void)
+Session::svc ()
 {
   this->barrier_.wait ();
   CORBA::ULong i = 0;
@@ -86,7 +86,7 @@ Session::svc (void)
 }
 
 void
-Session::validate_connections (void)
+Session::validate_connections ()
 {
   CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -151,7 +151,7 @@ Session::start (const Test::Session_List &other_sessions)
 }
 
 void
-Session::ping (void)
+Session::ping ()
 {
 }
 
@@ -197,7 +197,7 @@ Session::receive_payload (const Test::Payload &the_payload)
 
 
 void
-Session::destroy (void)
+Session::destroy ()
 {
   // Make sure local resources are released
 
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 13fe7148e09..826f35db6f8 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -26,19 +26,19 @@ public:
            CORBA::ULong peer_count);
 
   /// Destructor
-  virtual ~Session (void);
+  virtual ~Session ();
 
   /// Run one of the experiment threads
-  int svc (void);
+  int svc ();
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions);
 
-  virtual void ping (void);
+  virtual void ping ();
 
   virtual void receive_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// Helper function used to report any problems and destroy local
@@ -50,7 +50,7 @@ private:
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
-  void validate_connections (void);
+  void validate_connections ();
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index bccb40f881d..dcf22af2c38 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -12,7 +12,7 @@ Session_Control::all_sessions_finished () const
   return this->session_count_ == 0;
 }
 
-Session_Control::~Session_Control (void)
+Session_Control::~Session_Control ()
 {
   if (this->session_count_ == 0 && this->success_)
     {
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 7b7791f5f67..bd9e1d24bbd 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -17,7 +17,7 @@ public:
   Session_Control (CORBA::ULong session_count);
 
   /// Destructor
-  virtual ~Session_Control (void);
+  virtual ~Session_Control ();
 
   /// Return 1 when all sessions have finished
   int all_sessions_finished () const;
diff --git a/TAO/tests/Big_Oneways/Session_Task.cpp b/TAO/tests/Big_Oneways/Session_Task.cpp
index d457a3b146a..cdd2ec01d07 100644
--- a/TAO/tests/Big_Oneways/Session_Task.cpp
+++ b/TAO/tests/Big_Oneways/Session_Task.cpp
@@ -8,7 +8,7 @@ Session_Task::Session_Task (Session *session)
 }
 
 int
-Session_Task::svc (void)
+Session_Task::svc ()
 {
   return this->session_->svc ();
 }
diff --git a/TAO/tests/Big_Oneways/Session_Task.h b/TAO/tests/Big_Oneways/Session_Task.h
index a2b151ece63..a12710923c2 100644
--- a/TAO/tests/Big_Oneways/Session_Task.h
+++ b/TAO/tests/Big_Oneways/Session_Task.h
@@ -19,7 +19,7 @@ public:
   Session_Task (Session *session);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
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_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 957614f04d6..87529585baf 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -7,12 +7,12 @@ Big_Reply_i::Big_Reply_i (CORBA::ORB_ptr orb,
 {
 }
 
-Big_Reply_i::~Big_Reply_i (void)
+Big_Reply_i::~Big_Reply_i ()
 {
 }
 
 Test::Octet_Seq *
-Big_Reply_i::get_big_reply ( /**/)
+Big_Reply_i::get_big_reply (/**/)
 {
   Test::Octet_Seq_var reply_mesg =
     new Test::Octet_Seq (this->length_);
@@ -23,12 +23,12 @@ Big_Reply_i::get_big_reply ( /**/)
 }
 
 void
-Big_Reply_i::ping ( /**/)
+Big_Reply_i::ping (/**/)
 {
 }
 
 void
-Big_Reply_i::shutdown ( /**/)
+Big_Reply_i::shutdown (/**/)
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index 2139368bea6..0d6d2b93c2c 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -26,14 +26,14 @@ public:
                CORBA::ULong length);
 
   ///Destructor
-  virtual ~Big_Reply_i (void);
+  virtual ~Big_Reply_i ();
 
   // = The skeleton methods
-  virtual Test::Octet_Seq *get_big_reply (void);
+  virtual Test::Octet_Seq *get_big_reply ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Our local ORB ptr
@@ -44,7 +44,6 @@ private:
 
   /// The reply message
   Test::Octet_Seq_var reply_message_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index 36a76b6f73b..e2c1a4c2aa2 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -2,7 +2,6 @@
 #include "Client_Task.h"
 
 
-
 Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
                           int event_count,
                           ACE_Thread_Manager *thr_mgr)
@@ -14,7 +13,7 @@ Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -44,7 +43,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Validating connection ..\n"));
 
diff --git a/TAO/tests/Big_Reply/Client_Task.h b/TAO/tests/Big_Reply/Client_Task.h
index 993a98cc4b9..b487b05b1ca 100644
--- a/TAO/tests/Big_Reply/Client_Task.h
+++ b/TAO/tests/Big_Reply/Client_Task.h
@@ -20,15 +20,13 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   /// Validate the connection
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
-
   /// Reference to the test interface
   Test::Big_Reply_var reply_gen_;
 
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 3ddf68ada38..2889ffc3928 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -2,7 +2,6 @@
 #include "ace/Get_Opt.h"
 
 
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 bool server_shutdown = false;
 
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index f9518505a01..020e73d2120 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -4,7 +4,6 @@
 #include "ace/Task.h"
 
 
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 // We can change this value if wanted..
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index df1cd5a53b2..9846d0ba5d6 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -44,7 +44,7 @@ Client_Task::ID () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ++tasks_running_;
   if (TAO_debug_level > 0)
@@ -138,7 +138,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 0b130075d98..1ab52fa9b08 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -28,7 +28,7 @@ public:
                const ACE_CString& ident);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   bool done() const;
   const char *ID () const;
@@ -36,7 +36,7 @@ public:
 private:
   /// Make sure that all threads have connections available to
   /// workaround bug 189
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index b55f11f3bfc..f901863619d 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -1,6 +1,6 @@
 #include "Payload_Receiver.h"
 
-Payload_Receiver::Payload_Receiver (void)
+Payload_Receiver::Payload_Receiver ()
   : message_count_ (0)
   , maybe_lost_count_ (0)
 {
@@ -25,7 +25,7 @@ Payload_Receiver::more_data (
 }
 
 void
-Payload_Receiver::ping (void)
+Payload_Receiver::ping ()
 {
 }
 
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index de55d042079..706ee6371ed 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -13,13 +13,13 @@ class Payload_Receiver
   : public virtual POA_Test::Payload_Receiver
 {
 public:
-  Payload_Receiver (void);
+  Payload_Receiver ();
 
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload,
                           CORBA::Boolean maybe_lost);
 
-  virtual void ping (void);
+  virtual void ping ();
 
   int count (bool maybe_lost = false) const;
 
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 7813458813f..36507c31cb2 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -8,7 +8,7 @@ Coordinator::Coordinator (CORBA::ULong peer_count)
   ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]);
 }
 
-Coordinator::~Coordinator (void)
+Coordinator::~Coordinator ()
 {
   delete[] this->peers_;
 }
@@ -42,7 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
 }
 
 void
-Coordinator::shutdown_all_peers (void)
+Coordinator::shutdown_all_peers ()
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 15809cba47e..5eea7e62c33 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -24,14 +24,14 @@ public:
                             Test::Session_List &session_list);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (void);
+  void shutdown_all_peers ();
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected destructor, call _remove_ref() to delete
-  virtual ~Coordinator (void);
+  virtual ~Coordinator ();
 
 private:
   /// Store a reference to each peer
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index a7df3f550ec..2024fb17cc6 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -6,7 +6,7 @@ Peer::Peer (CORBA::ORB_ptr orb)
 {
 }
 
-Peer::~Peer (void)
+Peer::~Peer ()
 {
 }
 
@@ -31,7 +31,7 @@ Peer::create_session (Test::Session_Control_ptr control,
 }
 
 void
-Peer::shutdown (void)
+Peer::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index 9188396fcce..61ce3f84a50 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -14,7 +14,7 @@ public:
   Peer (CORBA::ORB_ptr orb);
 
   /// Destructor
-  virtual ~Peer (void);
+  virtual ~Peer ();
 
   // = The skeleton methods
   virtual Test::Session_ptr create_session (Test::Session_Control_ptr control,
@@ -22,7 +22,7 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 13edf85c678..9ca05f2e34a 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -18,12 +18,12 @@ Session::Session (Test::Session_Control_ptr control,
 {
 }
 
-Session::~Session (void)
+Session::~Session ()
 {
 }
 
 int
-Session::svc (void)
+Session::svc ()
 {
   this->barrier_.wait ();
 
@@ -183,7 +183,7 @@ Session::echo_payload (const Test::Payload &the_payload)
 
 
 void
-Session::destroy (void)
+Session::destroy ()
 {
   // Make sure local resources are released
 
@@ -206,7 +206,7 @@ Session::more_work () const
 }
 
 void
-Session::validate_connections (void)
+Session::validate_connections ()
 {
   const CORBA::ULong session_count =
     this->other_sessions_.length ();
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 7ee8c297f2e..9288200e1b3 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -26,18 +26,18 @@ public:
            CORBA::ULong peer_count);
 
   /// Run one of the experiment threads
-  int svc (void);
+  int svc ();
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions);
 
   virtual Test::Payload* echo_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
   /// Protected destructor, call _remove_ref() to delete
-  virtual ~Session (void);
+  virtual ~Session ();
 
 private:
   /// Helper function used to report any problems and destroy local
@@ -48,7 +48,7 @@ private:
   int more_work () const;
 
   /// Validate all the connections
-  void validate_connections (void);
+  void validate_connections ();
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 027bd658625..59a9f6a04ef 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -12,7 +12,7 @@ Session_Control::all_sessions_finished () const
   return this->session_count_ == 0;
 }
 
-Session_Control::~Session_Control (void)
+Session_Control::~Session_Control ()
 {
   if (this->session_count_ == 0 && this->success_)
     {
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 7b7791f5f67..bd9e1d24bbd 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -17,7 +17,7 @@ public:
   Session_Control (CORBA::ULong session_count);
 
   /// Destructor
-  virtual ~Session_Control (void);
+  virtual ~Session_Control ();
 
   /// Return 1 when all sessions have finished
   int all_sessions_finished () const;
diff --git a/TAO/tests/Big_Twoways/Session_Task.cpp b/TAO/tests/Big_Twoways/Session_Task.cpp
index d457a3b146a..cdd2ec01d07 100644
--- a/TAO/tests/Big_Twoways/Session_Task.cpp
+++ b/TAO/tests/Big_Twoways/Session_Task.cpp
@@ -8,7 +8,7 @@ Session_Task::Session_Task (Session *session)
 }
 
 int
-Session_Task::svc (void)
+Session_Task::svc ()
 {
   return this->session_->svc ();
 }
diff --git a/TAO/tests/Big_Twoways/Session_Task.h b/TAO/tests/Big_Twoways/Session_Task.h
index a2b151ece63..a12710923c2 100644
--- a/TAO/tests/Big_Twoways/Session_Task.h
+++ b/TAO/tests/Big_Twoways/Session_Task.h
@@ -19,7 +19,7 @@ public:
   Session_Task (Session *session);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
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/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index 64b3444a447..75ff94e7e8c 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -15,7 +15,7 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 }
 
 void
-Blocking_Sync_None::shutdown (void)
+Blocking_Sync_None::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 76044d36263..eff1fcb4390 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -17,7 +17,7 @@ public:
   virtual void slow_operation (const Test::Payload &the_payload,
                                CORBA::ULong sleep_microseconds);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
index 743a534c959..50c18856bd1 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
@@ -6,9 +6,8 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
-
   try
     {
       this->orb_->run ();
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
index 80a2c49f14a..d98b2894ae2 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
@@ -18,10 +18,9 @@ public:
   Client_Task (CORBA::ORB_ptr orb);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   CORBA::ORB_var orb_;
 };
 
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
index cfdcab13d97..a5e49ee9bde 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
@@ -11,7 +11,6 @@
 class Echo : public POA_Test::Echo
 {
 public:
-
   Echo (CORBA::ORB_ptr orb,
         int abort_counter);
 
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index 775f68a3c18..544f7cf94e1 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -9,8 +9,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 void
 Echo_Caller::start_task(Test::Echo_ptr client)
 {
-  Server_Task task (client,
-                    32768);
+  Server_Task task (client);
 
   if (task.activate (THR_NEW_LWP | THR_JOINABLE,
                      4,
@@ -21,12 +20,10 @@ Echo_Caller::start_task(Test::Echo_ptr client)
     }
 
   ACE_Thread_Manager::instance ()->wait ();
-
-  return;
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
index 8ed7ebb0b35..3f079f0cd2f 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
@@ -14,7 +14,7 @@ public:
 
   virtual void start_task (Test::Echo_ptr client);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
index e8aae406238..636bf70bd7b 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
@@ -1,20 +1,16 @@
 #include "Server_Task.h"
 
-Server_Task::Server_Task (Test::Echo_ptr echo,
-                          size_t sz)
-  : echo_ (Test::Echo::_duplicate (echo)),
-    sz_ (sz)
-
+Server_Task::Server_Task (Test::Echo_ptr echo)
+  : echo_ (Test::Echo::_duplicate (echo))
 {
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   Test::Payload payload (32768);
   payload.length (32768);
 
-
   try
     {
       // Send messages till the remote guy crashes
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h
index 0207ca3ae3d..9ab337f4976 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h
@@ -17,10 +17,8 @@
 class Server_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
-  Server_Task (Test::Echo_ptr echo,
-               size_t sz);
+  Server_Task (Test::Echo_ptr echo);
 
   /// The thread entry point.
   virtual int svc ();
@@ -28,9 +26,6 @@ public:
 private:
   /// Reference to the test interface
   Test::Echo_var echo_;
-
-  /// Size of data that is traded
-  size_t sz_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl
index 974155d35fd..5b0df8e1a27 100755
--- a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl
+++ b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl
@@ -69,7 +69,7 @@ while($elapsed < $max_running_time) {
 
     # ... wait for the clients to die unless they did not startup,
     # ignore errors because they intentionally crash themselves!
-    $CL->WaitKill($server->ProcessStartWaitInterval() + 20) unless $client < 0;
+    $CL->WaitKill($server->ProcessStartWaitInterval() + 20, {self_crash => 1}) unless $client < 0;
 
     $elapsed = time() - $start_time;
 }
diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp
index 049b77c94c8..f46204005cc 100644
--- a/TAO/tests/Bug_1020_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Regression/Echo.cpp
@@ -6,7 +6,6 @@
 #include "Echo.h"
 
 
-
 Echo::Echo(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
index 72b42ee6a30..930327a63a8 100644
--- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
@@ -7,14 +7,13 @@
 #include "tao/Environment.h"
 
 
-
 ORB_Task::ORB_Task(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp
index 550ddb0c070..9828cbe2226 100644
--- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp
@@ -6,16 +6,14 @@
 #include "Server_Task.h"
 
 
-
 Server_Task::Server_Task(Test::Echo_ptr echo)
   : echo_(Test::Echo::_duplicate(echo))
 {
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
-
   Test::Payload pload(16); pload.length(16);
   int stop_loop = 0;
   for(int i = 0; i != 1000000 && !stop_loop; ++i)
diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.h b/TAO/tests/Bug_1020_Regression/Server_Task.h
index fbd0c089642..8562bc493fe 100644
--- a/TAO/tests/Bug_1020_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1020_Regression/Server_Task.h
@@ -17,7 +17,7 @@ public:
   Server_Task (Test::Echo_ptr echo);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1020_Regression/run_test.pl b/TAO/tests/Bug_1020_Regression/run_test.pl
index 164e3c57faa..8f292008c8f 100755
--- a/TAO/tests/Bug_1020_Regression/run_test.pl
+++ b/TAO/tests/Bug_1020_Regression/run_test.pl
@@ -111,7 +111,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 15);
+    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
@@ -120,7 +120,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 15);
+    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
@@ -128,7 +128,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 15);
+    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
index ee750de19eb..990c6dd42d7 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
@@ -26,7 +26,7 @@ BlobServerImpl::test(
 }
 
 void
-BlobServerImpl::shutdown (void)
+BlobServerImpl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index 3875b04a7f4..dfde196a963 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -15,9 +15,8 @@ public:
   // = The skeleton methods
     virtual void test(
         BlobType1& blob1,
-        BlobType2& blob2
-      );
-  virtual void shutdown (void);
+        BlobType2& blob2);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
index 9bed2cb6b47..846cb985b38 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
@@ -25,7 +25,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
index 8ae5d484754..76d1ae79a1e 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
@@ -14,7 +14,7 @@ public:
 
   virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
index 56ec581d509..82a425e5e0b 100644
--- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
@@ -15,7 +15,7 @@ Server_Timer::Server_Timer(Test::Echo_ptr echo,
 }
 
 void
-Server_Timer::activate (void)
+Server_Timer::activate ()
 {
   ACE_Time_Value tv (0, 20000);
   this->reactor()->schedule_timer (this, 0, tv);
diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.h b/TAO/tests/Bug_1269_Regression/Server_Timer.h
index b249d3afcea..f575f3ce74d 100644
--- a/TAO/tests/Bug_1269_Regression/Server_Timer.h
+++ b/TAO/tests/Bug_1269_Regression/Server_Timer.h
@@ -21,7 +21,7 @@ public:
   /// Constructor
   Server_Timer (Test::Echo_ptr echo, ACE_Reactor * reactor);
 
-  void activate (void);
+  void activate ();
 
   /// Thread entry point
   int handle_timeout(ACE_Time_Value const & tv, void const *);
diff --git a/TAO/tests/Bug_1269_Regression/run_test.pl b/TAO/tests/Bug_1269_Regression/run_test.pl
index dd9d4841c92..04acb5009c2 100755
--- a/TAO/tests/Bug_1269_Regression/run_test.pl
+++ b/TAO/tests/Bug_1269_Regression/run_test.pl
@@ -108,7 +108,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 45);
+    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
@@ -117,7 +117,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 45);
+    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
@@ -125,7 +125,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 45);
+    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
index 5d1490074c3..8756d4d29e8 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
@@ -27,7 +27,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
   orb_->shutdown(0);
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
index c480d2f76fd..bdd51cb30c5 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
@@ -15,7 +15,7 @@ public:
 
   virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
index bdb0533b1a6..4a727bce0fd 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
@@ -17,7 +17,7 @@ Server_Timer::Server_Timer(Test::Echo_ptr echo,
 }
 
 void
-Server_Timer::activate (void)
+Server_Timer::activate ()
 {
   ACE_Time_Value tv (0, 20000);
   this->reactor()->schedule_timer (this, 0, tv, tv);
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.h b/TAO/tests/Bug_1270_Regression/Server_Timer.h
index 6d3194ff4bb..b9e00941a97 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.h
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.h
@@ -21,7 +21,7 @@ public:
   /// Constructor
   Server_Timer (Test::Echo_ptr echo, ACE_Reactor * reactor);
 
-  void activate (void);
+  void activate ();
 
   /// Thread entry point
   int handle_timeout(ACE_Time_Value const & tv, void const *);
diff --git a/TAO/tests/Bug_1270_Regression/run_test.pl b/TAO/tests/Bug_1270_Regression/run_test.pl
index d22b33deb68..ece8ad06daa 100755
--- a/TAO/tests/Bug_1270_Regression/run_test.pl
+++ b/TAO/tests/Bug_1270_Regression/run_test.pl
@@ -108,27 +108,27 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 45);
+    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
-        print STDERR "ERROR: client returned $client_status\n";
+        print STDERR "ERROR: client 1 returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
-        $CL1->Kill (); $CL1->TimedWait (1);
         $CL2->Kill (); $CL2->TimedWait (1);
+        $CL3->Kill (); $CL3->TimedWait (1);
         exit 1;
     }
 
-    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 45);
+    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
-        print STDERR "ERROR: client returned $client_status\n";
+        print STDERR "ERROR: client 2 returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
         $CL1->Kill (); $CL1->TimedWait (1);
-        $CL2->Kill (); $CL2->TimedWait (1);
+        $CL3->Kill (); $CL3->TimedWait (1);
         exit 1;
     }
 
-    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 45);
+    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
-        print STDERR "ERROR: client returned $client_status\n";
+        print STDERR "ERROR: client 3 returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
         $CL1->Kill (); $CL1->TimedWait (1);
         $CL2->Kill (); $CL2->TimedWait (1);
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp
index f4c287557a5..6abc12a38d4 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp
@@ -10,12 +10,12 @@ Test_i::~Test_i()
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index 0ae7dfeface..e2b6c7e28e5 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -12,12 +12,12 @@ public:
   Test_i (CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~Test_i (void);
+  ~Test_i ();
 
   /// A method
-  virtual void test_method(void);
+  virtual void test_method();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp
index 83b309f26b3..5faa78d564c 100644
--- a/TAO/tests/Bug_1330_Regression/server.cpp
+++ b/TAO/tests/Bug_1330_Regression/server.cpp
@@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
index dc7e2595146..05649be4244 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
@@ -19,7 +19,7 @@ Echo_Caller::start_task(Test::Echo_ptr client)
 }
 
 void
-Echo_Caller::shutdown(void)
+Echo_Caller::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown message\n"));
   pool_->shutdown();
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
index 436fae8c468..bf2fb1fcd89 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
@@ -17,7 +17,7 @@ public:
 
   virtual void start_task(Test::Echo_ptr client);
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   Thread_Pool *pool_;
diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
index d8074e356af..0f72129c222 100644
--- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
@@ -12,7 +12,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 873e414d900..100c82f835e 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -26,12 +26,12 @@ Thread_Pool::Thread_Pool (CORBA::ORB_ptr orb,
                 "activate failed\n"));
 }
 
-Thread_Pool::~Thread_Pool (void)
+Thread_Pool::~Thread_Pool ()
 {
 }
 
 int
-Thread_Pool::shutdown (void)
+Thread_Pool::shutdown ()
 {
   thr_mgr_->cancel_grp (grp_id_);
 
@@ -81,7 +81,7 @@ Thread_Pool::put (ACE_Message_Block *mb,
 // for all other threads to complete this iteration.
 
 int
-Thread_Pool::svc (void)
+Thread_Pool::svc ()
 {
   // Note that the <ACE_Task::svc_run> method automatically adds us to
   // the Thread_Manager when the thread begins.
@@ -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_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
index 94e88b01841..bcd01b5a604 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
@@ -13,9 +13,9 @@ public:
                int n_threads);
   // Constructor activates <n_threads> in the thread pool.
 
-  virtual ~Thread_Pool (void);
+  virtual ~Thread_Pool ();
   // Destructor...
-  int shutdown (void);
+  int shutdown ();
 
   virtual int svc ();
 
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index b432f576dc5..9ece8d2188f 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -22,7 +22,7 @@ public:
       ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
   }
 
-  void activate (void)
+  void activate ()
   {
     ACE_Time_Value tv (150, 0);
     this->reactor()->schedule_timer (this, 0, tv, tv);
diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl
index 3052bf9f396..35e1a499994 100755
--- a/TAO/tests/Bug_1361_Regression/run_test.pl
+++ b/TAO/tests/Bug_1361_Regression/run_test.pl
@@ -73,7 +73,7 @@ if ($ARGV[0] eq '-quick')  {
 }
 
 my $client_idx = 0;
-while (($elapsed < $max_running_time) ) {
+while (($elapsed < $max_running_time)) {
     # Start all clients in parallel
     my $args_saved = $CL->Arguments ();
     $CL->Arguments ("$args_saved$client_idx.log") unless $debug_opts eq '';
@@ -90,7 +90,7 @@ while (($elapsed < $max_running_time) ) {
     }
 
     if ($client_status == 0) {
-        $CL->WaitKill($client->ProcessStartWaitInterval() + 75);
+        $CL->WaitKill($client->ProcessStartWaitInterval() + 75, {self_crash => 1});
         if ($client_status != 0) {
             print STDERR "ERROR: client returned $client_status\n";
             $status = 1;
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index 1a9e42386d4..7a50dd9f165 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.h b/TAO/tests/Bug_1476_Regression/Client_Task.h
index 7e31b950196..a0ce97ce27c 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.h
@@ -21,10 +21,9 @@ public:
                int number_of_oneways);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   /// Reference to the test interface
   Test::Sender_var sender_;
 
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index ad02084fb96..26c6fea3bfb 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -7,7 +7,7 @@ Sender_i::Sender_i (CORBA::ORB_ptr orb)
 {
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
 }
 
@@ -19,7 +19,7 @@ Sender_i::active_objects (CORBA::ULong no_threads)
 
 
 void
-Sender_i::send_ready_message (void)
+Sender_i::send_ready_message ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received a call ...\n"));
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
index d5da80805a5..9189b995034 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.h b/TAO/tests/Bug_1476_Regression/Server_Task.h
index b00eef99fbf..48fdbd39930 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
index ccb8dd6b03b..75fc7db51f9 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (Test::Hello_ptr receiver,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.h b/TAO/tests/Bug_1482_Regression/Client_Task.h
index 69e937d7249..203b18adea3 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.h
@@ -22,7 +22,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index 33e7e166cef..5a403fb9ee5 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -9,7 +9,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-Hello::next_prime (void)
+Hello::next_prime ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 1f9423f17c0..7a9e7650c39 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -14,7 +14,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong next_prime (void);
+  virtual CORBA::ULong next_prime ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index d72bfca1e54..4cf7b821414 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -8,14 +8,12 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
 void
 Reply_Handler::next_prime (CORBA::ULong)
 {
-  return;
 }
 
 void
 Reply_Handler::next_prime_excep (
     ::Messaging::ExceptionHolder *ex)
 {
-
   try
     {
       ex->raise_exception ();
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
index b491aa754fe..6dec7bc07fc 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
@@ -18,7 +18,6 @@ public:
   void next_prime_excep (::Messaging::ExceptionHolder * excep_holder);
 
 private:
-
   CORBA::ORB_var orb_;
 };
 
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
index 502da807fc9..ea1882c01a2 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
@@ -8,7 +8,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
 //   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.h b/TAO/tests/Bug_1482_Regression/Server_Task.h
index a07f998f5a1..a7faae94890 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.h
@@ -20,7 +20,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Bug_1482_Regression/run_test.pl b/TAO/tests/Bug_1482_Regression/run_test.pl
index ed1debdc4f0..33c513c74c0 100755
--- a/TAO/tests/Bug_1482_Regression/run_test.pl
+++ b/TAO/tests/Bug_1482_Regression/run_test.pl
@@ -114,7 +114,7 @@ while($elapsed < $max_running_time) {
 
     sleep (90);
 
-    $server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+    $server_status = $SV->WaitKill ($server->ProcessStopWaitInterval(), {self_crash => 1});
     if ($server_status < 0) {
         print STDERR "ERROR: server returned $server_status\n";
         $CL1->Kill (); $CL1->TimedWait (1);
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index 16ea068aeca..ffcdab9ef9d 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
@@ -18,7 +18,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index 93bda38044a..e74bea49396 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -20,9 +20,8 @@ Client_Task::Client_Task (const ACE_TCHAR *input,
     corb_ (CORBA::ORB::_duplicate (corb))
 {}
 
-
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.h b/TAO/tests/Bug_1495_Regression/Client_Task.h
index cb903f47ab4..4bc3ee6cb10 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.h
@@ -28,7 +28,7 @@ class Client_Task : public ACE_Task_Base
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point.
-  int svc (void);
+  int svc ();
 
 private:
   /// File to read in the remote IOR.
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index fa95c4361e6..7099617cadd 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
@@ -30,7 +30,7 @@ Server_ORBInitializer::post_init (
 }
 
 Echo_Server_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index 2272771c5de..7fac80332ca 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -28,7 +28,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -36,7 +36,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  Echo_Server_Request_Interceptor * server_interceptor (void);
+  Echo_Server_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index 0d526c9fe4a..65421ea9e3a 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -26,7 +26,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.h b/TAO/tests/Bug_1495_Regression/Server_Task.h
index 86383eaae2b..cefabdbc8dc 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.h
@@ -29,7 +29,7 @@ class Server_Task : public ACE_Task_Base
                  ACE_Thread_Manager *thr_mgr);
 
     /// Thread entry point
-    int svc (void);
+    int svc ();
 
   private:
     /// Output file for the server IOR
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
index a4880e7cd1b..e69d3dbf1a1 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
@@ -54,7 +54,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       ACE_Argv_Type_Converter main_args_s (argc, argv);
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index 4bc7c2cbc34..333ac2cc665 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -12,18 +12,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 2c4921837d5..ca95623f402 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index 001a894e0b4..781480882a7 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Thread.h"
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -17,7 +17,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::Object_
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
@@ -34,13 +34,13 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -48,7 +48,6 @@ void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -100,7 +99,6 @@ void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   // This will throw an exception if a location forward has not
   // occurred.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index 3073b9069b0..3338dd0fdbb 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -22,7 +22,7 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   Echo_Server_Request_Interceptor (CORBA::Object_ptr forward_location);
@@ -32,10 +32,10 @@ public:
 
   void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index ad7ed5cb1e1..a40b83d58c1 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -14,7 +14,7 @@ Bug1495_i::Bug1495_i (CORBA::ORB_ptr orb)
 {
 }
 
-Bug1495_i::~Bug1495_i (void)
+Bug1495_i::~Bug1495_i ()
 {
 }
 
@@ -27,7 +27,7 @@ Bug1495_i::get_thread_id (Bug1495_Regression::ThreadId_out thread_id)
 }
 
 void
-Bug1495_i::shutdown (void)
+Bug1495_i::shutdown ()
 {
   ACE_DEBUG ((LM_INFO,
               "Shutting down orb %Q\n",
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index ce694224731..81f28c596a9 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -37,19 +37,16 @@
 class  Bug1495_i : public virtual POA_Bug1495_Regression::Bug1495
 {
 public:
-
   Bug1495_i (CORBA::ORB_ptr orb);
 
   //Destructor
-  virtual ~Bug1495_i (void);
+  virtual ~Bug1495_i ();
 
   virtual void get_thread_id (Bug1495_Regression::ThreadId_out thread_id);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
-
   CORBA::ORB_var orb_;
-
 };
 
 
diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp
index c99cfe0aaec..6b55ca475d1 100644
--- a/TAO/tests/Bug_1535_Regression/Test.cpp
+++ b/TAO/tests/Bug_1535_Regression/Test.cpp
@@ -6,12 +6,12 @@ Hello::Hello (PortableServer::POA_ptr poa) :
 }
 
 void
-Hello::print_hello_world (void)
+Hello::print_hello_world ()
 {
 }
 
 PortableServer::POA_ptr
-Hello::_default_POA (void)
+Hello::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h
index 9e987171955..a0d9d7e2b2b 100644
--- a/TAO/tests/Bug_1535_Regression/Test.h
+++ b/TAO/tests/Bug_1535_Regression/Test.h
@@ -13,9 +13,9 @@ public:
   Hello (PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual void print_hello_world (void);
+  virtual void print_hello_world ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   PortableServer::POA_var poa_;
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_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
index 3c2f6013b86..245b9f0ecfb 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
@@ -11,12 +11,12 @@ Client_Task::Client_Task (Test::Hello_ptr receiver,
 {
 }
 
-Client_Task::~Client_Task (void)
+Client_Task::~Client_Task ()
 {
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.h b/TAO/tests/Bug_1551_Regression/Client_Task.h
index 4a942cc92b9..337d870aed1 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.h
@@ -17,10 +17,10 @@ public:
                CORBA::ORB_ptr o,
                ACE_Thread_Manager *thr_mgr);
 
-  ~Client_Task (void);
+  ~Client_Task ();
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 2885a6c62ff..4ffc42f9f65 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello(
 }
 
 void
-Hello::short_sleep (void)
+Hello::short_sleep ()
 {
   long count = atomic_counter_--;
 
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 20e535f3c6d..1e6d6718e61 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -13,7 +13,7 @@ public:
   /// Constructor
   Hello(CORBA::ORB_ptr orb, bool simulate_crashes);
 
-  virtual void short_sleep (void);
+  virtual void short_sleep ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index 5da7ffbe20b..0bb1faffc82 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -9,7 +9,7 @@ Reply_Handler::Reply_Handler (
 }
 
 void
-Reply_Handler::short_sleep (void)
+Reply_Handler::short_sleep ()
 {
   check_counter();
 
@@ -54,7 +54,7 @@ Reply_Handler::short_sleep_excep (
 }
 
 void Reply_Handler::
-check_counter(void)
+check_counter()
 {
   long const count = --counter_;
   if(count == 0)
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index 9b27bd8f04e..f71041cbf9b 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -14,12 +14,12 @@ public:
       Test::Hello_ptr hello,
       CORBA::ORB_ptr orb);
 
-  void short_sleep (void);
+  void short_sleep ();
 
   void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder);
 
 private:
-  void check_counter(void);
+  void check_counter();
 
 private:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> counter_;
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
index 75038ceb12a..b98d1fe56ca 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
@@ -8,7 +8,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   //   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.h b/TAO/tests/Bug_1551_Regression/Server_Task.h
index a35c3689b07..e0ae5464042 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.h
@@ -12,7 +12,7 @@ public:
   Server_Task (CORBA::ORB_ptr orb,
                ACE_Thread_Manager *thr_mgr);
 
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_1551_Regression/run_test.pl b/TAO/tests/Bug_1551_Regression/run_test.pl
index d27708cc7ea..ac8ee6114fe 100755
--- a/TAO/tests/Bug_1551_Regression/run_test.pl
+++ b/TAO/tests/Bug_1551_Regression/run_test.pl
@@ -114,7 +114,7 @@ while($n < $ntimes) {
 
     sleep (30);
 
-    $server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 15);
+    $server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($server_status < 0) {
         print STDERR "ERROR: server returned $server_status\n";
         $CL1->Kill (); $CL1->TimedWait (1);
@@ -123,7 +123,7 @@ while($n < $ntimes) {
         exit 1;
     }
 
-    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval());
+    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval(), {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $CL2->Kill (); $CL2->TimedWait (1);
@@ -131,14 +131,14 @@ while($n < $ntimes) {
         exit 1;
     }
 
-    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval());
+    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval(), {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $CL3->Kill (); $CL3->TimedWait (1);
         exit 1;
     }
 
-    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval());
+    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval(), {self_crash => 1});
     if ($client_status != 0) {
         print STDERR "ERROR: client returned $client_status\n";
         exit 1;
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp
index ef59e84556d..6a328d65bac 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp
@@ -11,7 +11,7 @@ Test_i::~Test_i()
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
    // Noop
 }
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h
index 80649bd8994..385f5730315 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.h
+++ b/TAO/tests/Bug_1627_Regression/Test_i.h
@@ -9,13 +9,13 @@ class Test_i: public POA_Test
 {
 public:
    /// Constructor
-   Test_i (void);
+   Test_i ();
 
    /// Destructor
-   ~Test_i (void);
+   ~Test_i ();
 
    /// A method
-   void test_method(void);
+   void test_method();
 };
 
 #endif /* ! BUG_1330_REGRESSION_TEST_I_H */
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index 211ad19cee0..d141443a91f 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/Bug_1628_Regression/run_test.pl b/TAO/tests/Bug_1628_Regression/run_test.pl
index 7f2c56bbb9f..7ed14a284a6 100755
--- a/TAO/tests/Bug_1628_Regression/run_test.pl
+++ b/TAO/tests/Bug_1628_Regression/run_test.pl
@@ -1,5 +1,3 @@
-
-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
@@ -48,7 +46,7 @@ if ($server->WaitForFileTimed ($TestCaseC_i,
 # Body_dup is there, then all the Body_* methods are also there.
 #
 $found = 0 ;
-open (I_FILE, "$server_TestCaseC_i") ;
+open (I_FILE, "$server_TestCaseC_i");
 while( <I_FILE> ){
    chomp ;
    if( $_ =~ /Body_dup/ ){
@@ -63,5 +61,4 @@ if( $found != 1 ){
 
 $server->DeleteFile($TestCaseC_i);
 
-
 exit $status;
diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp
index 38469ec3c1f..529c063fe4b 100644
--- a/TAO/tests/Bug_1635_Regression/client.cpp
+++ b/TAO/tests/Bug_1635_Regression/client.cpp
@@ -3,7 +3,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp
index 9e29e5fb013..251ecf57ffc 100644
--- a/TAO/tests/Bug_1639_Regression/struct_client.cpp
+++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp
@@ -10,10 +10,8 @@ using namespace DynamicAny;
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 //--------------------------------------------------------------------
 {
-
   // Generic catch handler
   try {
-
     // Initialize the ORB
     // ------------------
     CORBA::ORB_var orb;  // _var, so we don't need/may not CORBA::release(orb)
@@ -78,13 +76,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try {
       DynAny_var da_struct_alias = daf->create_dyn_any_from_type_code (tc_struct_alias.in());
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any_from_type_code (tc_struct_alias)" << endl;
     }
 
     try {
       DynAny_var da_struct_alias = daf->create_dyn_any (any_struct_alias);
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any (any_struct_alias)" << endl;
     }
 
@@ -92,13 +90,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     try {
       DynAny_var da_union_alias = daf->create_dyn_any_from_type_code (tc_union_alias.in());
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any_from_type_code (tc_union_alias)" << endl;
     }
 
     try {
       DynAny_var da_union_alias = daf->create_dyn_any (any_union_alias);
-    } catch ( const CORBA::UNKNOWN &) {
+    } catch (const CORBA::UNKNOWN &) {
       cout << "CORBA::UNKNOWN exception when calling create_dyn_any (any_union_alias)" << endl;
     }
 
diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp
index 04cf5fc9b90..922415c6766 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1676_Regression/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 #if 0
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
@@ -69,7 +69,7 @@ Hello::mod_stringList (::Test::StringList & iosl)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h
index 53449753f89..1c305d970a6 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.h
+++ b/TAO/tests/Bug_1676_Regression/Hello.h
@@ -20,7 +20,7 @@ public:
 
   virtual void mod_stringList (::Test::StringList & iosl);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_1676_Regression/Test.idl b/TAO/tests/Bug_1676_Regression/Test.idl
index 289fad1e325..688709b8845 100644
--- a/TAO/tests/Bug_1676_Regression/Test.idl
+++ b/TAO/tests/Bug_1676_Regression/Test.idl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 //=============================================================================
 /**
  * @file Test.idl
@@ -7,10 +5,11 @@
  * "test" IDL interface for the Uninitialized "out" param for sequence<string>
  * can cause server to core test.
  *
- * @author Kees van Marle <kvmarle@ermedy.nl>
+ * @author Kees van Marle <kvmarle@remedy.nl>
  */
 //=============================================================================
 
+#include "tao/StringSeq.pidl"
 
 module Test
 {
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index f4f86e89b64..ec66b9af10e 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -132,7 +132,5 @@ void get_stringList2(Test::Hello_var hello)
     {
       ex._tao_print_exception ("get_stringList2");
     }
-
-
-    return;
+  return;
 }
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_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp
index e3282dc75c7..a4187f33b6f 100644
--- a/TAO/tests/Bug_1869_Regression/client.cpp
+++ b/TAO/tests/Bug_1869_Regression/client.cpp
@@ -9,7 +9,6 @@ const ACE_TCHAR *port = ACE_TEXT ("12345");
 class AdderCallback
   : public POA_AMI_test::AMI_adderHandler,
     public ACE_Task_Base {
-
   public:
     AdderCallback(CORBA::ORB_ptr orb)
       : orb(CORBA::ORB::_duplicate(orb)) {
@@ -37,7 +36,6 @@ class AdderCallback
     }
 
     CORBA::ORB_var orb;
-
 };
 
 int
@@ -71,11 +69,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
-
 ACE_TCHAR address_servant[1000];
 
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
     if (parse_args (argc, argv) != 0)
@@ -122,4 +118,3 @@ ACE_TCHAR address_servant[1000];
 }
 
 
-
diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp
index ec627ac1ee2..9a9e55eb805 100644
--- a/TAO/tests/Bug_1869_Regression/server.cpp
+++ b/TAO/tests/Bug_1869_Regression/server.cpp
@@ -3,25 +3,19 @@
 
 class  AdderServant :
   public POA_AMI_test::adder {
-
 public:
-  AdderServant (void) {}
+  AdderServant () = default;
 
-  virtual ~AdderServant (void) {}
+  virtual ~AdderServant () = default;
 
   virtual
-  CORBA::Long add (
-      CORBA::Long a,
-      CORBA::Long b
-    )
+  CORBA::Long add (CORBA::Long a, CORBA::Long b)
     {
       return a + b;
     }
 };
 
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
-
   try {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 0d9904744fc..020c59454fd 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -36,8 +36,7 @@ Client_Task::svc (void)
 
       Hello *hello_impl = 0;
       ACE_NEW_RETURN (hello_impl,
-                      Hello (this->corb_.in (),
-                             ACE_Thread::self ()),
+                      Hello (this->corb_.in ()),
                       1);
 
       PortableServer::ServantBase_var owner_transfer(hello_impl);
@@ -70,7 +69,7 @@ Client_Task::svc (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n"));
 
-      evNode->registerHello( hello_servant.in() );
+      evNode->registerHello( hello_servant.in());
 
       evNode->shutdown ();
     }
@@ -81,5 +80,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.h b/TAO/tests/Bug_2084_Regression/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index cc6680548c3..a5f2ad5b655 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -10,7 +10,7 @@ EventNode::EventNode (CORBA::ORB_ptr orb, ACE_thread_t thrid)
 {
 }
 
-void EventNode::registerHello ( ::Test::Hello_ptr h )
+void EventNode::registerHello (::Test::Hello_ptr h)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) EventNode: registerHello will call get_string...\n"));
@@ -52,7 +52,7 @@ void EventNode::registerHello ( ::Test::Hello_ptr h )
 }
 
 void
-EventNode::shutdown (void)
+EventNode::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index 768200dd39e..e60f77c429c 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -18,9 +18,9 @@ public:
              ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual void registerHello ( ::Test::Hello_ptr h);
+  virtual void registerHello (::Test::Hello_ptr h);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
index 654d838d4d4..4a7e3042fb9 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2084_Regression/Hello.cpp
@@ -4,10 +4,8 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
+Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
-  , thr_id_ (thrid)
 {
 }
 
@@ -52,7 +50,7 @@ Hello::get_string (::Test::ThreadId caller_threadid)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index f7d4bc3b661..6101540e48d 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -14,20 +14,16 @@ class Hello
 {
 public:
   /// Constructor
-  Hello (CORBA::ORB_ptr orb,
-         ACE_thread_t thr_id);
+  Hello (CORBA::ORB_ptr orb);
 
-  // = The skeleton methods
-  virtual char * get_string ( ::Test::ThreadId caller_threadid);
+  virtual char * get_string (::Test::ThreadId caller_threadid);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
-
-  ACE_thread_t const thr_id_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
index 714d91a81e1..37ef71e01a6 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
@@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.h b/TAO/tests/Bug_2084_Regression/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Bug_2122_Regression/Test.idl b/TAO/tests/Bug_2122_Regression/Test.idl
index ed40e939aaf..e459fe09c9f 100644
--- a/TAO/tests/Bug_2122_Regression/Test.idl
+++ b/TAO/tests/Bug_2122_Regression/Test.idl
@@ -9,8 +9,8 @@ module Test
 
    interface Foo
    {
-      void op1( in MyStringType s );
-      void op2( in MyOtherStringType s );
+      void op1( in MyStringType s);
+      void op2( in MyOtherStringType s);
    };
 };
 
@@ -22,7 +22,7 @@ module Foo
 
       interface Whatever
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 
@@ -32,7 +32,7 @@ module Foo
 
       interface WhoCares
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 
@@ -42,7 +42,7 @@ module Foo
 
       interface WhoCares
       {
-         void someOp( in MyString s );
+         void someOp( in MyString s);
       };
    };
 };
diff --git a/TAO/tests/Bug_2124_Regression/Test.idl b/TAO/tests/Bug_2124_Regression/Test.idl
index edee92ac64d..0d006d331a2 100644
--- a/TAO/tests/Bug_2124_Regression/Test.idl
+++ b/TAO/tests/Bug_2124_Regression/Test.idl
@@ -9,8 +9,8 @@ module Test
 
    interface Foo
    {
-      void op1( in MyString s );
-      void op2( in OtherString s );
+      void op1( in MyString s);
+      void op2( in OtherString s);
    };
 };
 
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 024e702ba64..09cf9b1346c 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -4,7 +4,6 @@
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
-
 }
 
 CORBA::Long
@@ -21,7 +20,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h
index 32129102136..a175271fcd8 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.h
+++ b/TAO/tests/Bug_2174_Regression/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 9806cdd133d..f5d4054e05f 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -19,9 +19,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index 6cf8290cbb1..2bf8ddb2538 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -6,14 +6,14 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n"));
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index 46d192e5166..c53a05c1616 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   virtual void request_callback (Test::Hello_ptr call_me);
 
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp
index 0045d9c8970..4c5bd4ec6b6 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.cpp
+++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp
@@ -28,24 +28,23 @@
 #include "broken_i.h"
 
 
-
 ServerAdmin_i::ServerAdmin_i (ArrayTest_ptr target)
   :target_ (ArrayTest::_duplicate(target))
 {
 }
 
-ServerAdmin_i::~ServerAdmin_i (void)
+ServerAdmin_i::~ServerAdmin_i ()
 {
 }
 
 ArrayTest_ptr
-ServerAdmin_i::target(void)
+ServerAdmin_i::target()
 {
   return ArrayTest::_duplicate(target_.in());
 }
 
 void
-ServerAdmin_i::shutdown (void)
+ServerAdmin_i::shutdown ()
 {
   int argc = 0;
   char ** argv = 0;
@@ -54,7 +53,7 @@ ServerAdmin_i::shutdown (void)
 }
 
 // Implementation skeleton constructor
-ArrayTest_i::ArrayTest_i (void)
+ArrayTest_i::ArrayTest_i ()
   :longArray_ (LongArray_alloc()),
    ulongArray_ (ULongArray_alloc()),
    stringArray_ (StringArray_alloc()),
@@ -73,7 +72,7 @@ ArrayTest_i::ArrayTest_i (void)
 }
 
 // Implementation skeleton destructor
-ArrayTest_i::~ArrayTest_i (void)
+ArrayTest_i::~ArrayTest_i ()
 {
   LongArray_free (longArray_);
   ULongArray_free (ulongArray_);
@@ -143,7 +142,6 @@ ArrayTest_i::~ArrayTest_i (void)
   // Add your implementation here
   ::CharArray_copy(p3,p2);
   return CharArray_dup(p1);
-
 }
 
 ::OctetArray_slice * ArrayTest_i::octetArrayOp (
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index 4df02de9d58..37cb737907e 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -38,13 +38,12 @@ class ServerAdmin_i : public virtual POA_ServerAdmin
 {
 public:
   ServerAdmin_i (ArrayTest_ptr target);
-  virtual ~ServerAdmin_i (void);
-  ArrayTest_ptr target(void);
+  virtual ~ServerAdmin_i ();
+  ArrayTest_ptr target();
 
-  void shutdown (void);
+  void shutdown ();
 private:
   ArrayTest_var target_;
-
 };
 
 class  ArrayTest_i : public virtual POA_ArrayTest
@@ -68,210 +67,155 @@ private:
   CORBA::Char char_;
 public:
   //Constructor
-  ArrayTest_i (void);
+  ArrayTest_i ();
 
   //Destructor
-  virtual ~ArrayTest_i (void);
+  virtual ~ArrayTest_i ();
 
   virtual
   ::LongArray_slice * longArrayOp (
       const ::LongArray p1,
       ::LongArray p2,
-      ::LongArray_out p3
-    );
+      ::LongArray_out p3);
 
   virtual
   ::StringArray_slice * stringArrayOp (
       const ::StringArray p1,
       ::StringArray p2,
-      ::StringArray_out p3
-    );
+      ::StringArray_out p3);
 
   virtual
   ::ShortArray_slice * shortArrayOp (
       const ::ShortArray p1,
       ::ShortArray p2,
-      ::ShortArray_out p3
-    );
+      ::ShortArray_out p3);
 
   virtual
   ::UShortArray_slice * ushortArrayOp (
       const ::UShortArray p1,
       ::UShortArray p2,
-      ::UShortArray_out p3
-    );
+      ::UShortArray_out p3);
 
   virtual
   ::CharArray_slice * charArrayOp (
       const ::CharArray p1,
       ::CharArray p2,
-      ::CharArray_out p3
-    );
+      ::CharArray_out p3);
 
   virtual
   ::OctetArray_slice * octetArrayOp (
       const ::OctetArray p1,
       ::OctetArray p2,
-      ::OctetArray_out p3
-    );
+      ::OctetArray_out p3);
 
   virtual
   ::DoubleArray_slice * doubleArrayOp (
       const ::DoubleArray p1,
       ::DoubleArray p2,
-      ::DoubleArray_out p3
-    );
+      ::DoubleArray_out p3);
 
   virtual
-  ::LongArray_slice * a_longArray (
-
-    );
+  ::LongArray_slice * a_longArray ();
 
   virtual
   void a_longArray (
-      const ::LongArray a_longArray
-    );
+      const ::LongArray a_longArray);
 
   virtual
-  ::ULongArray_slice * a_ulongArray (
-
-    );
+  ::ULongArray_slice * a_ulongArray ();
 
   virtual
   void a_ulongArray (
-      const ::ULongArray a_ulongArray
-    );
+      const ::ULongArray a_ulongArray);
 
   virtual
-  ::StringArray_slice * a_stringArray (
-
-    );
+  ::StringArray_slice * a_stringArray ();
 
   virtual
   void a_stringArray (
-      const ::StringArray a_stringArray
-    );
+      const ::StringArray a_stringArray);
 
   virtual
-  ::ShortArray_slice * a_shortArray (
-
-    );
+  ::ShortArray_slice * a_shortArray ();
 
   virtual
   void a_shortArray (
-      const ::ShortArray a_shortArray
-    );
+      const ::ShortArray a_shortArray);
 
   virtual
-  ::UShortArray_slice * a_ushortArray (
-
-    );
+  ::UShortArray_slice * a_ushortArray ();
 
   virtual
   void a_ushortArray (
-      const ::UShortArray a_ushortArray
-    );
+      const ::UShortArray a_ushortArray);
 
   virtual
-  CORBA::Char a_char (
-
-    );
+  CORBA::Char a_char ();
 
   virtual
-  void a_char (
-      ::CORBA::Char a_char
-    );
+  void a_char (::CORBA::Char a_char);
 
   virtual
-  ::CharArray_slice * a_charArray (
-
-    );
+  ::CharArray_slice * a_charArray ();
 
   virtual
-  void a_charArray (
-      const ::CharArray a_charArray
-    );
+  void a_charArray (const ::CharArray a_charArray);
 
   virtual
-  ::OctetArray_slice * a_octetArray (
-
-    );
+  ::OctetArray_slice * a_octetArray ();
 
   virtual
   void a_octetArray (
-      const ::OctetArray a_octetArray
-    );
+      const ::OctetArray a_octetArray);
 
   virtual
-  ::DoubleArray_slice * a_doubleArray (
-
-    );
+  ::DoubleArray_slice * a_doubleArray ();
 
   virtual
   void a_doubleArray (
-      const ::DoubleArray a_doubleArray
-    );
+      const ::DoubleArray a_doubleArray);
 
   virtual
-  ::FloatArray_slice * a_floatArray (
-
-    );
+  ::FloatArray_slice * a_floatArray ();
 
   virtual
   void a_floatArray (
-      const ::FloatArray a_floatArray
-    );
+      const ::FloatArray a_floatArray);
 
   virtual
-  ::BucketArray_slice * a_bucketArray (
-
-    );
+  ::BucketArray_slice * a_bucketArray ();
 
   virtual
   void a_bucketArray (
-      const ::BucketArray a_bucketArray
-    );
+      const ::BucketArray a_bucketArray);
 
   virtual
-  ::AccountArray_slice * a_accountArray (
-
-    );
+  ::AccountArray_slice * a_accountArray ();
 
   virtual
   void a_accountArray (
-      const ::AccountArray a_accountArray
-    );
+      const ::AccountArray a_accountArray);
 
   virtual
-  ::BooleanArray_slice * a_booleanArray (
-
-    );
+  ::BooleanArray_slice * a_booleanArray ();
 
   virtual
   void a_booleanArray (
-      const ::BooleanArray a_booleanArray
-    );
+      const ::BooleanArray a_booleanArray);
 
   virtual
-  ::LongArrayArray_slice * a_longArrayArray (
-
-    );
+  ::LongArrayArray_slice * a_longArrayArray ();
 
   virtual
   void a_longArrayArray (
-      const ::LongArrayArray a_longArrayArray
-    );
+      const ::LongArrayArray a_longArrayArray);
 
   virtual
-  ::MyEnumArray_slice * a_myEnumArray (
-
-    );
+  ::MyEnumArray_slice * a_myEnumArray ();
 
   virtual
   void a_myEnumArray (
-      const ::MyEnumArray a_myEnumArray
-    );
+      const ::MyEnumArray a_myEnumArray);
 };
 
-
 #endif /* BROKEN_I_H_  */
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_2234_Regression/Test.idl b/TAO/tests/Bug_2234_Regression/Test.idl
index a6eab054a71..4fe9d2dc536 100644
--- a/TAO/tests/Bug_2234_Regression/Test.idl
+++ b/TAO/tests/Bug_2234_Regression/Test.idl
@@ -28,15 +28,15 @@ module Test
 
     interface Foo
     {
-       long TestLong( in long a, out long b, inout long c );
-       string TestString( in string a, out string b, inout string c );
-       MyNonVarStruct TestNonVarStruct( in MyNonVarStruct a, out MyNonVarStruct b, inout MyNonVarStruct c );
-       MyVarStruct TestVarStruct( in MyVarStruct a, out MyVarStruct b, inout MyVarStruct c );
-       MyNonVarUnion TestNonVarUnion( in MyNonVarUnion a, out MyNonVarUnion b, inout MyNonVarUnion c );
-       MyVarUnion TestVarUnion( in MyVarUnion a, out MyVarUnion b, inout MyVarUnion c );
-       MySeqOfLong TestSeqOfLong( in MySeqOfLong a, out MySeqOfLong b, inout MySeqOfLong c );
-       any TestAny( in any a, out any b, inout any c );
-       MyArray TestArray( in MyArray a, out MyArray b, inout MyArray c );
+       long TestLong( in long a, out long b, inout long c);
+       string TestString( in string a, out string b, inout string c);
+       MyNonVarStruct TestNonVarStruct( in MyNonVarStruct a, out MyNonVarStruct b, inout MyNonVarStruct c);
+       MyVarStruct TestVarStruct( in MyVarStruct a, out MyVarStruct b, inout MyVarStruct c);
+       MyNonVarUnion TestNonVarUnion( in MyNonVarUnion a, out MyNonVarUnion b, inout MyNonVarUnion c);
+       MyVarUnion TestVarUnion( in MyVarUnion a, out MyVarUnion b, inout MyVarUnion c);
+       MySeqOfLong TestSeqOfLong( in MySeqOfLong a, out MySeqOfLong b, inout MySeqOfLong c);
+       any TestAny( in any a, out any b, inout any c);
+       MyArray TestArray( in MyArray a, out MyArray b, inout MyArray c);
        Object TestObject( in Object a, out Object b, inout Object c);
        oneway void ShutdownServer();
     };
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index f9c3cab03c4..427849d9a12 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -39,7 +39,6 @@ ACE_TMAIN (
   int        argc,
   ACE_TCHAR *argv[])
 {
-
   CORBA::Boolean testFailed= 0;
   ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 (Interceptor arg list with var len out params)\n"));
   try
@@ -51,9 +50,9 @@ ACE_TMAIN (
       return 1;
 
     CORBA::Object_var
-       object= orb->string_to_object( ior );
+       object= orb->string_to_object(ior);
     Test::Foo_var
-       foo= Test::Foo::_narrow( object.in() );
+       foo= Test::Foo::_narrow( object.in());
 
     //-----------------------------------------------------------------------
     CORBA::Long
@@ -61,19 +60,19 @@ ACE_TMAIN (
        bL,
        cL= 3,
        rL= 0;
-    ACE_DEBUG( (LM_INFO, ". Long()            ") );
+    ACE_DEBUG( (LM_INFO, ". Long()            "));
     rL= foo->TestLong( aL, bL, cL);
-    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aL, bL, cL, rL) );
+    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aL, bL, cL, rL));
     if (static_cast<CORBA::Long>(1) != aL) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(2) != bL) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(4) != cL) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(7) != rL) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     CORBA::String_var
@@ -81,19 +80,19 @@ ACE_TMAIN (
        bS,
        cS= CORBA::string_dup("3"),
        rS;
-    ACE_DEBUG( (LM_INFO, ". String()          ") );
+    ACE_DEBUG( (LM_INFO, ". String()          "));
     rS= foo->TestString( aS.in(), bS.out(), cS.inout());
     ACE_DEBUG( (LM_INFO, "a is %C, b is %C, c is %C, r is %C:  ", aS.in (), bS.in (), cS.in (), rS.in ()));
     if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(aS.in(), "1"))) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(bS.in(), "2"))) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(cS.in(), "4"))) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(rS.in(), "7"))) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyNonVarStruct_var
@@ -103,19 +102,19 @@ ACE_TMAIN (
        rFS;
     aFS->val= 1;
     cFS->val= 3;
-    ACE_DEBUG( (LM_INFO, ". MyNonVarStruct()  ") );
+    ACE_DEBUG( (LM_INFO, ". MyNonVarStruct()  "));
     rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout());
-    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aFS.in().val, bFS.in().val, cFS.in().val, rFS.in().val) );
+    ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aFS.in().val, bFS.in().val, cFS.in().val, rFS.in().val));
     if (static_cast<CORBA::Long>(1) != aFS->val) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(2) != bFS->val) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(4) != cFS->val) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if (static_cast<CORBA::Long>(7) != rFS->val) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyVarStruct_var
@@ -125,19 +124,19 @@ ACE_TMAIN (
        rVS;
     aVS->val= CORBA::string_dup("1");
     cVS->val= CORBA::string_dup("3");
-    ACE_DEBUG( (LM_INFO, ". MyVarStruct()     ") );
+    ACE_DEBUG( (LM_INFO, ". MyVarStruct()     "));
     rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout());
     ACE_DEBUG( (LM_INFO, "a is %C, b is %C, c is %C, r is %C:  ", aVS->val.in(), bVS->val.in (), cVS->val.in (), rVS->val.in ()));
     if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val, "2"))) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((0 != *cVS->val) && (0 != ACE_OS::strcmp(cVS->val, "4"))) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((0 != *rVS->val) && (0 != ACE_OS::strcmp(rVS->val, "7"))) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyNonVarUnion_var
@@ -145,41 +144,41 @@ ACE_TMAIN (
        bFU= new Test::MyNonVarUnion(),
        cFU= new Test::MyNonVarUnion(),
        rFU;
-    aFU->valLong( static_cast<CORBA::Long>(1) );
-    cFU->valLong( static_cast<CORBA::Long>(3) );
-    ACE_DEBUG( (LM_INFO, ". MyNonVarUnion()   ") );
+    aFU->valLong( static_cast<CORBA::Long>(1));
+    cFU->valLong( static_cast<CORBA::Long>(3));
+    ACE_DEBUG( (LM_INFO, ". MyNonVarUnion()   "));
     rFU= foo->TestNonVarUnion( aFU.in(), bFU.out(), cFU.inout());
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (static_cast<CORBA::Short>(1) != aFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", aFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "%d", aFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (static_cast<CORBA::Short>(1) != bFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", bFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "%d", bFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (static_cast<CORBA::Short>(1) != cFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", cFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "%d", cFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (static_cast<CORBA::Short>(1) != rFU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", rFU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "%d", rFU->valLong()));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if ((static_cast<CORBA::Short>(1) != aFU->_d()) || (static_cast<CORBA::Long>(1) != aFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != bFU->_d()) || (static_cast<CORBA::Long>(2) != bFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != cFU->_d()) || (static_cast<CORBA::Long>(4) != cFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != rFU->_d()) || (static_cast<CORBA::Long>(7) != rFU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MyVarUnion_var
@@ -187,41 +186,41 @@ ACE_TMAIN (
        bVU,
        cVU= new Test::MyVarUnion(),
        rVU;
-    aVU->valLong( static_cast<CORBA::Long>(1) );
-    cVU->valLong( static_cast<CORBA::Long>(3) );
-    ACE_DEBUG( (LM_INFO, ". MyVarUnion()      ") );
+    aVU->valLong( static_cast<CORBA::Long>(1));
+    cVU->valLong( static_cast<CORBA::Long>(3));
+    ACE_DEBUG( (LM_INFO, ". MyVarUnion()      "));
     rVU= foo->TestVarUnion( aVU.in(), bVU.out(), cVU.inout());
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (static_cast<CORBA::Short>(1) != aVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", aVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "%d", aVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (static_cast<CORBA::Short>(1) != bVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", bVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "%d", bVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (static_cast<CORBA::Short>(1) != cVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", cVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "%d", cVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (static_cast<CORBA::Short>(1) != rVU->_d())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", rVU->valLong()) );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "%d", rVU->valLong()));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if ((static_cast<CORBA::Short>(1) != aVU->_d()) || (static_cast<CORBA::Long>(1) != aVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != bVU->_d()) || (static_cast<CORBA::Long>(2) != bVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != cVU->_d()) || (static_cast<CORBA::Long>(4) != cVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((static_cast<CORBA::Short>(1) != rVU->_d()) || (static_cast<CORBA::Long>(7) != rVU->valLong())) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     Test::MySeqOfLong_var
@@ -233,39 +232,39 @@ ACE_TMAIN (
     aSL[0]= static_cast<CORBA::Long>(1);
     cSL->length(1);
     cSL[0]= static_cast<CORBA::Long>(3);
-    ACE_DEBUG( (LM_INFO, ". MySeqOfLong()     ") );
+    ACE_DEBUG( (LM_INFO, ". MySeqOfLong()     "));
     rSL= foo->TestSeqOfLong( aSL.in(), bSL.out(), cSL.inout());
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (1u != aSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", aSL[0]) );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "%d", aSL[0]));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (1u != bSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", bSL[0]) );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "%d", bSL[0]));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (1u != cSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", cSL[0]) );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "%d", cSL[0]));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (1u != rSL->length())
-       ACE_DEBUG( (LM_INFO, "?") );
+       ACE_DEBUG( (LM_INFO, "?"));
     else
-       ACE_DEBUG( (LM_INFO, "%d", rSL[0]) );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "%d", rSL[0]));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if ((1u != aSL->length()) || (static_cast<CORBA::Long>(1) != aSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if ((1u != bSL->length()) || (static_cast<CORBA::Long>(2) != bSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if ((1u != cSL->length()) || (static_cast<CORBA::Long>(4) != cSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if ((1u != rSL->length()) || (static_cast<CORBA::Long>(7) != rSL[0])) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     CORBA::Any_var
@@ -275,44 +274,44 @@ ACE_TMAIN (
        rA;
     aA<<= static_cast<CORBA::Long>(1);
     cA<<= static_cast<CORBA::Long>(3);
-    ACE_DEBUG( (LM_INFO, ". Any()             ") );
+    ACE_DEBUG( (LM_INFO, ". Any()             "));
     rA= foo->TestAny( aA.in(), bA.out(), cA.inout());
     CORBA::Boolean
        aB,
        bB,
        cB,
        rB;
-    ACE_DEBUG( (LM_INFO, "a is ") );
+    ACE_DEBUG( (LM_INFO, "a is "));
     if (0 != (aB= (aA>>= aL)))
-       ACE_DEBUG( (LM_INFO, "%d", aL) );
+       ACE_DEBUG( (LM_INFO, "%d", aL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ", b is ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ", b is "));
     if (0 != (bB= (bA>>= bL)))
-       ACE_DEBUG( (LM_INFO, "%d", bL) );
+       ACE_DEBUG( (LM_INFO, "%d", bL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ", c is ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ", c is "));
     if (0 != (cB= (cA>>= cL)))
-       ACE_DEBUG( (LM_INFO, "%d", cL) );
+       ACE_DEBUG( (LM_INFO, "%d", cL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ", r is ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ", r is "));
     if (0 != (rB= (rA>>= rL)))
-       ACE_DEBUG( (LM_INFO, "%d", rL) );
+       ACE_DEBUG( (LM_INFO, "%d", rL));
     else
-       ACE_DEBUG( (LM_INFO, "?") );
-    ACE_DEBUG( (LM_INFO, ":  ") );
+       ACE_DEBUG( (LM_INFO, "?"));
+    ACE_DEBUG( (LM_INFO, ":  "));
     if (!aB || (static_cast<CORBA::Long>(1) != aL)) {
-       ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "a is wrong\n")); testFailed= 1;}
     else if (!bB || (static_cast<CORBA::Long>(2) != bL)) {
-       ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "b is wrong\n")); testFailed= 1;}
     else if (!cB || (static_cast<CORBA::Long>(4) != cL)) {
-       ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "c is wrong\n")); testFailed= 1;}
     else if (!rB || (static_cast<CORBA::Long>(7) != rL)) {
-       ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
+       ACE_DEBUG( (LM_ERROR, "r is wrong\n")); testFailed= 1;}
     else
-       ACE_DEBUG( (LM_INFO, "OK\n") );
+       ACE_DEBUG( (LM_INFO, "OK\n"));
 
     //-----------------------------------------------------------------------
     {
@@ -330,35 +329,35 @@ ACE_TMAIN (
       arr_c[1].length (1);
       arr_c[1][0] = 9;
 
-      ACE_DEBUG( (LM_INFO, ". MyArray()     ") );
+      ACE_DEBUG( (LM_INFO, ". MyArray()     "));
       Test::MyArray_var arr_ret = foo->TestArray (arr_a, arr_b.out (), arr_c);
       CORBA::ULong zero (0), one (1); //Use ULong to avoid ambiguity
       if (arr_c[0].length () != 1 || arr_c[0][0] != 24)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_c[0] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_c[0] is wrong\n")); testFailed = 1;
         }
       else if (arr_c[1].length () != 1 || arr_c[1][0] != 10)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_c[1] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_c[1] is wrong\n")); testFailed = 1;
         }
       else if (arr_b[zero].length () != 1 || arr_b[zero][0] != 8)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_b[0] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_b[0] is wrong\n")); testFailed = 1;
         }
       else if (arr_b[one].length () != 1 || arr_b[one][0] != 22)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_b[1] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_b[1] is wrong\n")); testFailed = 1;
         }
       else if (arr_ret[zero].length () != 1 || arr_ret[zero][0] != 7)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_ret[0] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_ret[0] is wrong\n")); testFailed = 1;
         }
       else if (arr_ret[one].length () != 1 || arr_ret[one][0] != 21)
         {
-          ACE_DEBUG( (LM_ERROR, "arr_ret[1] is wrong\n") ); testFailed = 1;
+          ACE_DEBUG( (LM_ERROR, "arr_ret[1] is wrong\n")); testFailed = 1;
         }
       else
-        ACE_DEBUG( (LM_INFO, "OK\n") );
+        ACE_DEBUG( (LM_INFO, "OK\n"));
     }
 
     //-----------------------------------------------------------------------
@@ -370,11 +369,11 @@ ACE_TMAIN (
     }
 
     //-----------------------------------------------------------------------
-    foo->ShutdownServer( );
+    foo->ShutdownServer();
 
     //-----------------------------------------------------------------------
-    orb->shutdown( true );
-    orb->destroy( );
+    orb->shutdown(true);
+    orb->destroy();
   }
   catch (const CORBA::SystemException& ex)
   {
@@ -388,15 +387,15 @@ ACE_TMAIN (
   }
   catch (...)
   {
-    ACE_DEBUG( (LM_ERROR, "Unexpected general exception!\n") );
+    ACE_DEBUG( (LM_ERROR, "Unexpected general exception!\n"));
     testFailed= 1;
   }
 
-  ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 ") );
+  ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 "));
   if (testFailed)
-    ACE_DEBUG( (LM_ERROR, "Failed\n") );
+    ACE_DEBUG( (LM_ERROR, "Failed\n"));
   else
-    ACE_DEBUG( (LM_INFO, "Passed\n") );
+    ACE_DEBUG( (LM_INFO, "Passed\n"));
 
   return testFailed? -1 : 0;
 }
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index 0fc3e0396fa..3901b1ea1c4 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -60,8 +60,8 @@ CORBA::ORB_ptr orb;
 class FooImpl : public POA_Test::Foo
 {
 public:
-  FooImpl() {}
-  ~FooImpl() {}
+  FooImpl() = default;
+  ~FooImpl() = default;
 
   //-----------------------------------------------------------
 
@@ -71,22 +71,22 @@ public:
     CORBA::Long &c
  )
   {
-    ACE_DEBUG( (LM_INFO, ". in TestLong\n") );
-    if (static_cast<CORBA::Long>( 1 ) != a)
+    ACE_DEBUG( (LM_INFO, ". in TestLong\n"));
+    if (static_cast<CORBA::Long>(1) != a)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c)
+    if (static_cast<CORBA::Long>(3) != c)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
-    b= static_cast<CORBA::Long>(  a << 1 );
+    b= static_cast<CORBA::Long>(  a << 1);
 
-    c+= static_cast<CORBA::Long>( 1 );
-    return static_cast<CORBA::Long>( 7 );
+    c+= static_cast<CORBA::Long>( 1);
+    return static_cast<CORBA::Long>( 7);
   }
 
   //-----------------------------------------------------------
@@ -97,46 +97,46 @@ public:
     char *&c
  )
   {
-    ACE_DEBUG( (LM_INFO, ". in TestString\n") );
+    ACE_DEBUG( (LM_INFO, ". in TestString\n"));
     if (0 == a)
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('1' != *a)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (0 == c)
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('3' != *c)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
-    b= CORBA::string_dup( "0" ); // Create a one character output buffer
+    b= CORBA::string_dup("0"); // Create a one character output buffer
     *b= a[0] + 1;
     *c+= 1;
-    return CORBA::string_dup( "7" );
+    return CORBA::string_dup("7");
   }
 
   //-----------------------------------------------------------
@@ -150,22 +150,22 @@ public:
     Test::MyNonVarStruct
       newret;
 
-    ACE_DEBUG( (LM_INFO, ". in TestNonVarStruct\n") );
-    if (static_cast<CORBA::Long>( 1 ) != a.val)
+    ACE_DEBUG( (LM_INFO, ". in TestNonVarStruct\n"));
+    if (static_cast<CORBA::Long>(1) != a.val)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c.val)
+    if (static_cast<CORBA::Long>(3) != c.val)
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
-    newret.val= static_cast<CORBA::Long>( 7 );
+    newret.val= static_cast<CORBA::Long>( 7);
 
     Test::MyNonVarStruct *newval_p;
-    ACE_NEW_RETURN( newval_p, Test::MyNonVarStruct, newret );
+    ACE_NEW_RETURN( newval_p, Test::MyNonVarStruct, newret);
     Test::MyNonVarStruct_var
       newval= newval_p;
 
@@ -184,39 +184,39 @@ public:
     Test::MyVarStruct &c
  )
   {
-    ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n") );
+    ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n"));
     if (0 == a.val.in())
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a.val.in() ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('1' != *a.val.in())
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (0 == c.val.in())
     {
       //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
       //FUZZ: enable check_for_NULL
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c.val.in() ))
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect string length for parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if ('3' != *c.val.in())
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
 
@@ -226,18 +226,18 @@ public:
     Test::MyVarStruct_var
       newval_p,
       newret_p;
-    ACE_NEW_RETURN( newval_p, Test::MyVarStruct(), 0 );
+    ACE_NEW_RETURN( newval_p, Test::MyVarStruct(), 0);
     Test::MyVarStruct_var
       newval= newval_p;
-    ACE_NEW_RETURN( newret_p, Test::MyVarStruct(), 0 );
+    ACE_NEW_RETURN( newret_p, Test::MyVarStruct(), 0);
     Test::MyVarStruct_var
       newret= newret_p;
 
-    newval->val= CORBA::string_dup( ca );
+    newval->val= CORBA::string_dup( ca);
 
     *c.val.inout()+= 1;
 
-    newret->val= CORBA::string_dup( "7" );
+    newret->val= CORBA::string_dup( "7");
 
     b= newval._retn();
     return newret._retn();
@@ -248,29 +248,28 @@ public:
   Test::MyNonVarUnion TestNonVarUnion(
     const Test::MyNonVarUnion &a,
     Test::MyNonVarUnion_out b,
-    Test::MyNonVarUnion &c
- )
+    Test::MyNonVarUnion &c)
   {
     Test::MyNonVarUnion
       newret;
 
-    ACE_DEBUG( (LM_INFO, ". in TestNonVarUnion\n") );
-    if (static_cast<CORBA::Short>( 1 ) != a._d())
+    ACE_DEBUG( (LM_INFO, ". in TestNonVarUnion\n"));
+    if (static_cast<CORBA::Short>(1) != a._d())
     {
-      ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n") );
+      ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 1 ) != a.valLong())
+    if (static_cast<CORBA::Long>(1) != a.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Short>( 1 ) != c._d())
+    if (static_cast<CORBA::Short>(1) != c._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c.valLong())
+    if (static_cast<CORBA::Long>(3) != c.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -284,7 +283,7 @@ public:
     newval->valLong( a.valLong() << 1 );
     c.valLong( c.valLong() + 1 );
 
-    newret.valLong( static_cast<CORBA::Long>( 7 ) );
+    newret.valLong( static_cast<CORBA::Long>(7));
 
     b= newval._retn();
     return newret;
@@ -299,22 +298,22 @@ public:
  )
   {
     ACE_DEBUG( (LM_INFO, ". in TestVarUnion\n") );
-    if (static_cast<CORBA::Short>( 1 ) != a._d())
+    if (static_cast<CORBA::Short>(1) != a._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 1 ) != a.valLong())
+    if (static_cast<CORBA::Long>(1) != a.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Short>( 1 ) != c._d())
+    if (static_cast<CORBA::Short>(1) != c._d())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect type of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c.valLong())
+    if (static_cast<CORBA::Long>(3) != c.valLong())
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -330,10 +329,10 @@ public:
 
     Test::MyVarUnion_var
       newret_p;
-    ACE_NEW_RETURN( newret_p, Test::MyVarUnion(), 0 );
+    ACE_NEW_RETURN( newret_p, Test::MyVarUnion(), 0);
     Test::MyVarUnion_var
       newret= newret_p;
-    newret->valLong( static_cast<CORBA::Short>( 7 ) );
+    newret->valLong( static_cast<CORBA::Short>(7) );
 
     b= newval._retn();
     return newret._retn();
@@ -353,7 +352,7 @@ public:
       ACE_DEBUG( (LM_INFO, "* Incorrect length of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 1 ) != a[0])
+    if (static_cast<CORBA::Long>(1) != a[0])
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -363,7 +362,7 @@ public:
       ACE_DEBUG( (LM_INFO, "* Incorrect length of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
-    if (static_cast<CORBA::Long>( 3 ) != c[0])
+    if (static_cast<CORBA::Long>(3) != c[0])
     {
       ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -402,7 +401,7 @@ public:
     CORBA::Long cL;
     if (a >>= aL)
     {
-      if (static_cast<CORBA::Long>( 1 ) != aL)
+      if (static_cast<CORBA::Long>(1) != aL)
       {
         ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter a\n") );
         throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
@@ -415,7 +414,7 @@ public:
     }
     if (c >>= cL)
     {
-      if (static_cast<CORBA::Long>( 3 ) != cL)
+      if (static_cast<CORBA::Long>(3) != cL)
       {
         ACE_DEBUG( (LM_INFO, "* Incorrect input value of parameter c\n") );
         throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
index 419c8e44bbb..f0a1d3f3180 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   CORBA::Boolean exception = false;
   try
@@ -57,5 +57,4 @@ Client_Task::svc (void)
       ACE_ERROR ((LM_ERROR, "(ERROR: Client_Task::svc Expected exception not received\n"));
     }
   return 0;
-
 }
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.h b/TAO/tests/Bug_2241_Regression/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Bug_2241_Regression/Hello.cpp b/TAO/tests/Bug_2241_Regression/Hello.cpp
index 69ad5eda998..a171be3fec9 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2241_Regression/Hello.cpp
@@ -3,15 +3,13 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-  Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
+Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_ERROR ((LM_ERROR,
               "(%P|%t) ERROR: Unexpected Upcall in process ..\n"));
@@ -20,7 +18,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h
index 043a6968853..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.h
+++ b/TAO/tests/Bug_2241_Regression/Hello.h
@@ -11,20 +11,17 @@ class Hello
 {
 public:
   /// Constructor
-  Hello (CORBA::ORB_ptr orb,
-         ACE_thread_t thr_id);
+  Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
-
-  ACE_thread_t thr_id_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.cpp b/TAO/tests/Bug_2241_Regression/Server_Task.cpp
index 7a26f5fcf0c..4f6c3814cd9 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
@@ -36,8 +36,7 @@ Server_Task::svc (void)
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
-                     Hello (this->sorb_.in (),
-                            ACE_Thread::self ()),
+                     Hello (this->sorb_.in ()),
                      1);
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.h b/TAO/tests/Bug_2241_Regression/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index 6cad968abdb..91cc45715f8 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -8,7 +8,6 @@
 #include "TestC.h"
 
 int num_calls = 10; // total calls client is going to make
-const int sleep_time = 1; // sleep for  1 sec on each call
 
 // This should equal num_calls within 'sleep * num_calls' seconds
 int calls_received = 0;
@@ -43,7 +42,7 @@ protected:
 class ST_AMH_Server
 {
 public:
-  ST_AMH_Server (void);
+  ST_AMH_Server () = default;
   virtual ~ST_AMH_Server ();
 
   /// ORB inititalisation stuff
@@ -56,7 +55,6 @@ public:
   virtual void run_event_loop ();
 
 public:
-
 protected:
   CORBA::ORB_ptr orb_;
   PortableServer::POA_var root_poa_;
@@ -124,12 +122,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr,
 
 // ------------------------------------------------------------------------
 //
-ST_AMH_Server::ST_AMH_Server (void)
-{
-}
-
-// ------------------------------------------------------------------------
-//
 ST_AMH_Server::~ST_AMH_Server ()
 {
   try
diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp
index fbe2727b368..5e12c81c450 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2328_Regression/Hello.cpp
@@ -13,7 +13,7 @@ Hello::get_string (const char * A, const char * B, const char * C)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index 14f9189feb0..6d6ec0fc1ef 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual char * get_string (const char * A, const char * B, const char * C);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp
index 73cea2da610..364d105983d 100644
--- a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp
@@ -36,7 +36,7 @@ AMI_Test_i::foo (CORBA::Long value)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.h b/TAO/tests/Bug_2356_Regression/ami_test_i.h
index 1df67e21f06..8b94350193b 100644
--- a/TAO/tests/Bug_2356_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_2356_Regression/ami_test_i.h
@@ -29,7 +29,7 @@ public:
   // The AMI_Test methods.
   void foo (CORBA::Long value);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index a856b824816..5d9afb6e56b 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -54,18 +54,17 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler (void) {};
+  Handler () = default;
 
   /// Destructor.
-    ~Handler (void) {};
+  ~Handler () = default;
 
-  void foo (void)
+  void foo ()
     {
     };
 
   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"
                   "Testing proper exception handling ...\n"));
diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp
index c7a97c174ca..f3f7da7d409 100644
--- a/TAO/tests/Bug_2375_Regression/test.cpp
+++ b/TAO/tests/Bug_2375_Regression/test.cpp
@@ -2,7 +2,7 @@
 class  MyTestValuetypeFactory : public TestValuetype_init {
 public:
   virtual TestValuetype* create (::CORBA::Boolean, ::CORBA::Short) {return 0;};
-  virtual TAO_OBV_CREATE_RETURN_TYPE (TestValuetype) create_for_unmarshal (void) {return 0;};
+  virtual TAO_OBV_CREATE_RETURN_TYPE (TestValuetype) create_for_unmarshal () {return 0;};
 };
 int ACE_TMAIN (int, ACE_TCHAR *[]) {
   MyTestValuetypeFactory myFactory;
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index afa4ffda9d5..c20afbb4460 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -104,7 +104,7 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
 {
 }
 
-int ThreadPool::svc (void)
+int ThreadPool::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index b7d1239cf03..19e887398db 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -50,7 +50,7 @@ void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber)
   s.count = 0;
 }
 
-int Publisher_impl::Worker::svc (void)
+int Publisher_impl::Worker::svc ()
 {
   double data = 0.0;
   bool doShutdown = false;
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 246554ac593..b9fa51e3b41 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -84,8 +84,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate();
 
-      const CORBA::Object_var pmobj (orb->resolve_initial_references("ORBPolicyManager" ) );
-      CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(pmobj.in() );
+      const CORBA::Object_var pmobj (orb->resolve_initial_references("ORBPolicyManager" ));
+      CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(pmobj.in());
 
       CORBA::Any orb_level;
       orb_level <<= Messaging::SYNC_NONE;
@@ -122,7 +122,7 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
 {
 }
 
-int ThreadPool::svc (void)
+int ThreadPool::svc ()
 {
   try
   {
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 7614508edcf..b2714df57a5 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -13,7 +13,7 @@ class Reply_Handler
     }
 
    virtual void
-   childMethod (void)
+   childMethod ()
     {
     }
 
@@ -32,12 +32,11 @@ class Reply_Handler
     }
 
    virtual void
-   parentMethod (void)
+   parentMethod ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "client: parentMethod reply %d @ %T\n",
                   ++parentMethod_count));
-
     }
 
    virtual void
@@ -58,7 +57,7 @@ class Reply_Handler
         }
    }
 
-   CORBA::ULong reply_count (void) { return parentMethod_count + parentMethod_excep_count; };
+   CORBA::ULong reply_count () { return parentMethod_count + parentMethod_excep_count; };
 
  private:
    // Count of replies and excep
@@ -99,7 +98,6 @@ client_parse_args(int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   CORBA::ORB_var orb;
 
   try
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index 31ee3c945c9..f5c8e4f1fee 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -54,7 +54,6 @@ namespace
 
 struct Worker : ACE_Task_Base
 {
-
   Worker (Simple_Server_ptr srv)
     : srv_(Simple_Server::_duplicate(srv))
   {
@@ -89,7 +88,6 @@ struct Worker : ACE_Task_Base
       }
     return 0;
   }
-
 };
 
 int
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 710fdc31597..95e93bbebc2 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -143,7 +143,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp
index c95290efda2..93e443fc1f7 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2503_Regression/test_i.cpp
@@ -36,7 +36,7 @@ create_and_activate_server()
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   if (!CORBA::is_nil (this->orb_.in ()))
     this->orb_->shutdown (false);
diff --git a/TAO/tests/Bug_2503_Regression/test_i.h b/TAO/tests/Bug_2503_Regression/test_i.h
index d4d4131ed76..5750eec636c 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.h
+++ b/TAO/tests/Bug_2503_Regression/test_i.h
@@ -11,9 +11,9 @@ public:
 
   virtual void the_operation(CORBA::Long & x);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  char * create_and_activate_server(void);
+  char * create_and_activate_server();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
index 7ade799ab81..b50261e9d9d 100644
--- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
+++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
@@ -3,7 +3,6 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/Bug_2560_Regression/Quoter.idl b/TAO/tests/Bug_2560_Regression/Quoter.idl
index 755b72240ad..d3ba6eb7904 100644
--- a/TAO/tests/Bug_2560_Regression/Quoter.idl
+++ b/TAO/tests/Bug_2560_Regression/Quoter.idl
@@ -27,7 +27,6 @@ module Quoter
     // = DESCRIPTION
     //   Return the price and name of a single stock
     //
-
     typedef sequence<double> StockHistory ;
 
     readonly attribute string symbol;
@@ -39,7 +38,6 @@ module Quoter
     double price ();
     // Get the price
 
-    StockHistory history() ;
-
+    StockHistory history();
   };
 };
diff --git a/TAO/tests/Bug_2560_Regression/Stock_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_i.cpp
index dd3e473e8f8..0df17c0ef9b 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_i.cpp
@@ -38,14 +38,14 @@ Quoter_Stock_i::history ()
 
   // delay a little bit so we have chance to kill client
   // before this method returns
-  ACE_OS::sleep(5) ;
+  ACE_OS::sleep(5);
 
   const unsigned hsize = 200000 ;
-  hist->length(hsize) ;
-  for ( unsigned int i = 0 ; i < hsize ; ++ i ) {
-    hist[i] = double(i+1) ;
+  hist->length(hsize);
+  for (unsigned int i = 0 ; i < hsize ; ++ i) {
+    hist[i] = double(i+1);
   }
 
   ACE_DEBUG ((LM_DEBUG, "Returning method in server\n"));
-  return hist._retn() ;
+  return hist._retn();
 }
diff --git a/TAO/tests/Bug_2560_Regression/Stock_i.h b/TAO/tests/Bug_2560_Regression/Stock_i.h
index 15088b20536..8cdefb39ed3 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_i.h
+++ b/TAO/tests/Bug_2560_Regression/Stock_i.h
@@ -16,7 +16,7 @@ public:
   CORBA::Double price ();
   Quoter::Stock::StockHistory * history ();
 
-  static void set_default_POA ( PortableServer::POA_ptr poa )
+  static void set_default_POA (PortableServer::POA_ptr poa)
   {
     Quoter_Stock_i::_poa = PortableServer::POA::_duplicate (poa);
   }
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index 183a0b9f114..c6d21dbae1d 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -38,11 +38,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         // Now get the price
         CORBA::Double price = stock->price ();
 
-        Quoter::Stock::StockHistory_var history = stock->history() ;
+        Quoter::Stock::StockHistory_var history = stock->history();
 
         cout << "The price of a stock in \"" << full_name.in () << "\" is $" << price << endl;
-        cout << "  history: " << history[0] << " " << history[1] << " ... " << history[history->length()-1] << 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_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp
index c7011f548d0..bd68c25006e 100644
--- a/TAO/tests/Bug_2560_Regression/server.cpp
+++ b/TAO/tests/Bug_2560_Regression/server.cpp
@@ -47,21 +47,21 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     poa_manager->activate ();
 
     // Make policies for child POA
-    CORBA::PolicyList policies(2) ;
-    policies.length(2) ;
-    policies[0] = root_poa->create_lifespan_policy ( PortableServer::PERSISTENT ) ;
-    policies[1] = root_poa->create_id_assignment_policy ( PortableServer::USER_ID ) ;
+    CORBA::PolicyList policies(2);
+    policies.length(2);
+    policies[0] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
+    policies[1] = root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
-    PortableServer::POA_var poa = root_poa->create_POA ( "MyPOA", poa_manager.in(), policies );
+    PortableServer::POA_var poa = root_poa->create_POA ("MyPOA", poa_manager.in(), policies);
 
     // Creation of the new POAs over, so destroy the Policy_ptr's.
-    for ( CORBA::ULong i = 0 ; i < policies.length (); ++i ) {
+    for (CORBA::ULong i = 0 ; i < policies.length (); ++i) {
       CORBA::Policy_ptr policy = policies[i];
       policy->destroy ();
     }
 
     // use this poa for making system objects
-    Quoter_Stock_i::set_default_POA ( poa.in() ) ;
+    Quoter_Stock_i::set_default_POA (poa.in());
 
     // Create the servant
     Quoter_Stock_Factory_i *stock_factory_i = 0;
diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2593_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp
index b37ab6fb634..a3c0d15f54d 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2595_Regression/Hello.cpp
@@ -17,7 +17,7 @@ Hello::op (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h
index 4274d994541..bda9c7d4f53 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.h
+++ b/TAO/tests/Bug_2595_Regression/Hello.h
@@ -17,7 +17,7 @@ public:
         ::Test::Fls_out fstruct,
         ::Test::Vls_out vstruct);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index b01a90b4eee..f4cefb31674 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -23,7 +23,7 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 class Callback_i : public POA_Test::CallBack
 {
 public:
-  void method2(void)
+  void method2()
   {
     ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n"));
   }
@@ -43,12 +43,12 @@ private:
   int busy_threads_;
   CORBA::Short message_counter_;
 
-  int run_test (void);
+  int run_test ();
 public:
   Worker( int ot);
   ~Worker();
 
-  int svc (void);
+  int svc ();
 };
 
 Worker::Worker(int ot)
@@ -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..ef9002835a6 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -33,15 +33,15 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class ChildHandler : public POA_ChildModule::AMI_ChildInterfaceHandler
 {
 public:
-  ChildHandler (void) {};
-  ~ChildHandler (void) {};
+  ChildHandler () = default;
+  ~ChildHandler () = default;
 };
 
 class NonRelatedChildHandler : public POA_AMI_ChildInterfaceHandler
 {
 public:
-  NonRelatedChildHandler (void) {};
-  ~NonRelatedChildHandler (void) {};
+  NonRelatedChildHandler () = default;
+  ~NonRelatedChildHandler () = default;
 };
 
 int
@@ -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_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp
index 2df14afddd0..ab2b7bb796e 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp
@@ -4,14 +4,14 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-DllORB::DllORB (void)
+DllORB::DllORB ()
  : failPrePostInit_ (3),
    mv_orb_ (),
    mv_rootPOA_ ()
 {
 }
 
-DllORB::~DllORB (void)
+DllORB::~DllORB ()
 {
 }
 
@@ -103,7 +103,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllORB::fini (void)
+DllORB::fini ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h
index fc561ccfdd4..93ba2a11f46 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.h
+++ b/TAO/tests/Bug_2677_Regression/DllORB.h
@@ -9,8 +9,8 @@
 class bug_2677_regression_Export DllORB: public ACE_Service_Object
 {
 public:
-  DllORB (void);
-  virtual ~DllORB (void);
+  DllORB ();
+  virtual ~DllORB ();
 
   CORBA::ORB_ptr orb () const;
 
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp
index 1a40df86114..f1b3a445bd8 100644
--- a/TAO/tests/Bug_2678_Regression/server.cpp
+++ b/TAO/tests/Bug_2678_Regression/server.cpp
@@ -9,7 +9,7 @@ public:
   virtual AnySeq *RunTest(const AnySeq &params);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual void shutdown (void);
+  virtual void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 private:
   CORBA::ORB_var orb_;
@@ -20,7 +20,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb))
 }
 
 void
-Test_impl::shutdown(void)
+Test_impl::shutdown()
 {
   this->orb_->shutdown (false);
 }
@@ -117,5 +117,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
 
-
-
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index f14e73c7679..b2204a920f1 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -20,7 +20,7 @@ public:
   {
   }
 
-  int svc (void)
+  int svc ()
   {
     bool keep_going = true;
     while (keep_going && !this->stop_)
@@ -63,7 +63,6 @@ public:
   {
     stop_ = true;
   }
-
 };
 
 int port = 0;
@@ -132,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_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index a6104342c1c..5b508e5c809 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -45,7 +45,7 @@ public:
   {
   }
 
-  int svc (void)
+  int svc ()
   {
     try
       {
@@ -58,7 +58,6 @@ public:
       }
     return 0;
   }
-
 };
 
 int
diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp
index 879bf15ecd3..11c4d65deeb 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2683_Regression/test_i.cpp
@@ -7,13 +7,12 @@ test_i::test_i (ORB_Killer *k)
 }
 
 void
-test_i::ping (void)
+test_i::ping ()
 {
-
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown\n"));
   this->killer_->activate ();
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index 61ceecfc642..8809d548b0d 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -26,9 +26,9 @@ public:
   test_i (ORB_Killer *k);
 
   // = The skeleton methods
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2702_Regression/fakeserver.pm b/TAO/tests/Bug_2702_Regression/fakeserver.pm
index ac6a954178c..ca99be36a8f 100644
--- a/TAO/tests/Bug_2702_Regression/fakeserver.pm
+++ b/TAO/tests/Bug_2702_Regression/fakeserver.pm
@@ -17,7 +17,7 @@ sub run {
   my $self = shift;
   my $timeoutafter = shift; # in seconds
   my $rout;
-  while ( 1 ) {
+  while (1) {
     print STDERR "fakeserver: Loop\n";
 
     select( undef, undef, undef, 1 );
@@ -31,7 +31,7 @@ sub run {
     my $routs = unpack("b*", $rout);
     print STDERR "fakeserver: Select $routs\n";
     my $pos = index( $routs,'1');
-    while ( $pos >= 0 ) {
+    while ( $pos >= 0) {
       $self->HandleFile( $pos );
       $pos = index( $routs,'1', $pos+1);
     }
@@ -73,7 +73,7 @@ sub OpenServer {
 
 sub SendMessage {
   my $self = shift;
-  my( $message ) = @_;
+  my( $message) = @_;
 
   print STDERR "fakeserver: SendMessage $message\n";
   $message .= "\r\n";
@@ -88,7 +88,7 @@ sub SendMessage {
 
 sub HandleFile {
   my $self = shift;
-  my ( $fileno ) = @_;
+  my ($fileno) = @_;
 
   print STDERR "fakeserver: HandleFile $fileno\n";
   if ( $fileno == $self->{'server_fileno'} ) {
diff --git a/TAO/tests/Bug_2734_Regression/test_i.cpp b/TAO/tests/Bug_2734_Regression/test_i.cpp
index d615af9689d..a240a7d9e6c 100644
--- a/TAO/tests/Bug_2734_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2734_Regression/test_i.cpp
@@ -33,7 +33,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Bug_2734_Regression/test_i.h b/TAO/tests/Bug_2734_Regression/test_i.h
index 32129102136..a175271fcd8 100644
--- a/TAO/tests/Bug_2734_Regression/test_i.h
+++ b/TAO/tests/Bug_2734_Regression/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
index c8370491fd3..11fd77533fc 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
@@ -5,7 +5,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 {
 }
 
-void Messenger_i::send (void)
+void Messenger_i::send ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h
index de582704c66..221ba2054d7 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h
@@ -7,7 +7,7 @@ class Messenger_i : public POA_SimpleMessenger::Messenger
 {
 public:
   Messenger_i (CORBA::ORB_ptr orb);
-  virtual void send (void);
+  virtual void send ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_2791_Regression/MessageFactory.h b/TAO/tests/Bug_2791_Regression/MessageFactory.h
index f2d862c99eb..26de1758006 100644
--- a/TAO/tests/Bug_2791_Regression/MessageFactory.h
+++ b/TAO/tests/Bug_2791_Regression/MessageFactory.h
@@ -5,7 +5,6 @@
 class MessageFactory : public virtual CORBA::ValueFactoryBase
 {
   public:
-
     static int destructorInvoked_;
 
     ~MessageFactory ();
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp
index 2a1af32e41a..86356a1cc64 100644
--- a/TAO/tests/Bug_2791_Regression/Message_i.cpp
+++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp
@@ -12,7 +12,7 @@ MessageImpl::MessageImpl (const char *user, const char *subject, const char *tex
 }
 
 ::CORBA::ValueBase *
-MessageImpl::_copy_value (void)
+MessageImpl::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
@@ -22,8 +22,7 @@ MessageImpl::_copy_value (void)
       subject_ (),
       text_ ()
     ),
-    ::CORBA::NO_MEMORY ()
-  );
+    ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.h b/TAO/tests/Bug_2791_Regression/Message_i.h
index ecf5ed5958b..055640bd849 100644
--- a/TAO/tests/Bug_2791_Regression/Message_i.h
+++ b/TAO/tests/Bug_2791_Regression/Message_i.h
@@ -7,7 +7,7 @@ class MessageImpl : public virtual OBV_Message,
   public:
     MessageImpl ();
     MessageImpl (const char *user, const char *subject, const char *text);
-    virtual ::CORBA::ValueBase *_copy_value (void);
+    virtual ::CORBA::ValueBase *_copy_value ();
 
     virtual char *user ();
     virtual void user (const char *);
diff --git a/TAO/tests/Bug_2804_Regression/Hello.cpp b/TAO/tests/Bug_2804_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_2804_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2804_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2804_Regression/Hello.h b/TAO/tests/Bug_2804_Regression/Hello.h
index a5a13ea2723..97d878316d8 100644
--- a/TAO/tests/Bug_2804_Regression/Hello.h
+++ b/TAO/tests/Bug_2804_Regression/Hello.h
@@ -20,20 +20,17 @@ class Hello
   : public virtual POA_Test::Hello
 {
 public:
-
   /// Constructor
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The ORB which will be shutdown by Hello::shutdown().
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp
index 9cdf85c1e6f..d852e043aa6 100644
--- a/TAO/tests/Bug_2804_Regression/client.cpp
+++ b/TAO/tests/Bug_2804_Regression/client.cpp
@@ -87,7 +87,6 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
 
   ::perform_invocation<Test::NonRecursiveUnionWithStringStruct3> (hello,
                                                                   the_any);
-
 }
 
 /**
diff --git a/TAO/tests/Bug_2805_Regression/README.txt b/TAO/tests/Bug_2805_Regression/README.txt
index 9770264edf2..3d79f95c5ca 100644
--- a/TAO/tests/Bug_2805_Regression/README.txt
+++ b/TAO/tests/Bug_2805_Regression/README.txt
@@ -1,3 +1 @@
-
-
 This test is a reproducer for bug 2805 and bug 2806.
diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
index 08ca555dd4e..a703eca40cd 100644
--- a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
@@ -19,7 +19,6 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         const char * in_str,
                         bool check_params)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     number_ ((CORBA::Long) 931232),
      yadda_ ((CORBA::Long) 140474),
      in_l_ (in_l),
      in_str_(CORBA::string_dup(in_str)),
@@ -62,14 +61,14 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.h b/TAO/tests/Bug_2805_Regression/ami_test_i.h
index a019bf37775..2a6fbf3e3af 100644
--- a/TAO/tests/Bug_2805_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_2805_Regression/ami_test_i.h
@@ -24,18 +24,16 @@ class AMI_Test_i : public POA_A::AMI_Test
 {
 public:
   /// ctor
-  AMI_Test_i (CORBA::ORB_ptr orb,
-        CORBA::Long in_l = 0, const char * in_str = 0,
-  bool check_params = false);
+  AMI_Test_i (CORBA::ORB_ptr orb, CORBA::Long in_l = 0, const char * in_str = 0, bool check_params = false);
 
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
@@ -44,8 +42,6 @@ public:
 private:
   CORBA::ORB_var orb_;
 
-  CORBA::Long number_;
-
   CORBA::Long yadda_;
 
   CORBA::Long in_l_;
diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index 19cffd46fb1..faaef059824 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Atomic_Op.h"
@@ -96,9 +95,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
-  {
-  };
+  Handler () = default;
 
   void foo (CORBA::Long result,
             CORBA::Long out_l)
@@ -124,7 +121,6 @@ public:
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"));
       try
@@ -150,7 +146,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -161,9 +157,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     };
-  ~Handler (void)
-  {
-  };
+  ~Handler () = default;
 
   void inout_arg_test (const char *)
   {
@@ -296,7 +290,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
index 4d2a19ed788..c98d22f8e0c 100644
--- a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
+++ b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -83,7 +83,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::TRANSIENT);
 
     PortableServer::POA_var fooPoa = rootPOA->create_POA (
-      "FOO_POA", poaMgr.in (), policies );
+      "FOO_POA", poaMgr.in (), policies);
 
     for (CORBA::ULong i = 0; i < policies.length (); ++i)
     {
@@ -91,7 +91,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
     Foo_i servant;
-    PortableServer::ObjectId_var oid = fooPoa->activate_object( &servant );
+    PortableServer::ObjectId_var oid = fooPoa->activate_object( &servant);
 
     CORBA::Object_var obj = fooPoa->id_to_reference (oid.in ());
 
@@ -105,7 +105,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-    fooPoa->deactivate_object (oid.in () );  //servant is gone
+    fooPoa->deactivate_object (oid.in ());  //servant is gone
 
     if (vc_check(client.in(), false))  //exception expected
     {
diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2844_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2844_Regression/Hello.h b/TAO/tests/Bug_2844_Regression/Hello.h
index a5a13ea2723..97d878316d8 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.h
+++ b/TAO/tests/Bug_2844_Regression/Hello.h
@@ -20,20 +20,17 @@ class Hello
   : public virtual POA_Test::Hello
 {
 public:
-
   /// Constructor
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The ORB which will be shutdown by Hello::shutdown().
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp
index f845a6894e5..29fe9fa32c2 100644
--- a/TAO/tests/Bug_2844_Regression/client.cpp
+++ b/TAO/tests/Bug_2844_Regression/client.cpp
@@ -86,7 +86,6 @@ nested_recursive_struct_test (CORBA::ORB_ptr /* orb */,
   the_any <<= foo5;
 
   ::perform_invocation<Test::NestedRecursiveStruct5> (hello, the_any);
-
 }
 
 /**
diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp
index 3e9f7c047f6..1626a15b166 100644
--- a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp
@@ -38,7 +38,7 @@ AMI_Test_i::foo (CORBA::Long value)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.h b/TAO/tests/Bug_2909_Regression/ami_test_i.h
index 1df67e21f06..8b94350193b 100644
--- a/TAO/tests/Bug_2909_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_2909_Regression/ami_test_i.h
@@ -29,7 +29,7 @@ public:
   // The AMI_Test methods.
   void foo (CORBA::Long value);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp
index ccdafd2ecb5..2d46e423e5e 100644
--- a/TAO/tests/Bug_2909_Regression/client.cpp
+++ b/TAO/tests/Bug_2909_Regression/client.cpp
@@ -93,11 +93,11 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void) : request_ (0)
+  Handler () : request_ (0)
   {
   };
 
-  void foo (void)
+  void foo ()
     {
       int const reply = --number_of_replies;
 
@@ -152,7 +152,7 @@ public:
       ++request_;
     };
 
-  ~Handler (void)
+  ~Handler ()
   {
   };
 private:
@@ -279,7 +279,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_2918_Regression/Hello.cpp b/TAO/tests/Bug_2918_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_2918_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2918_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2918_Regression/Hello.h b/TAO/tests/Bug_2918_Regression/Hello.h
index a5a13ea2723..97d878316d8 100644
--- a/TAO/tests/Bug_2918_Regression/Hello.h
+++ b/TAO/tests/Bug_2918_Regression/Hello.h
@@ -20,20 +20,17 @@ class Hello
   : public virtual POA_Test::Hello
 {
 public:
-
   /// Constructor
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The ORB which will be shutdown by Hello::shutdown().
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2935_Regression/middle.cpp b/TAO/tests/Bug_2935_Regression/middle.cpp
index 0ca31fd3a57..f9dc1eb24bb 100644
--- a/TAO/tests/Bug_2935_Regression/middle.cpp
+++ b/TAO/tests/Bug_2935_Regression/middle.cpp
@@ -74,7 +74,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc,
                          argv);
 
-      if ( ! parse_args (argc, argv))
+      if (!parse_args (argc, argv))
         {
           return -1;
         }
diff --git a/TAO/tests/Bug_2935_Regression/middle_i.h b/TAO/tests/Bug_2935_Regression/middle_i.h
index 60388ac8d2c..67ce47a4f5f 100644
--- a/TAO/tests/Bug_2935_Regression/middle_i.h
+++ b/TAO/tests/Bug_2935_Regression/middle_i.h
@@ -31,7 +31,7 @@ public:
   Middle_i (CORBA::ORB_ptr orb, ThreeTier_ptr target);
   ~Middle_i ();
 
-  bool parse_args (int argc, ACE_TCHAR* argv[] );
+  bool parse_args (int argc, ACE_TCHAR* argv[]);
 
   //////////////////////////////////////
   /// Implement the ThreeTier interface
diff --git a/TAO/tests/Bug_2935_Regression/sink.cpp b/TAO/tests/Bug_2935_Regression/sink.cpp
index fa13971ef3f..3677b28d347 100644
--- a/TAO/tests/Bug_2935_Regression/sink.cpp
+++ b/TAO/tests/Bug_2935_Regression/sink.cpp
@@ -59,7 +59,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc,
                          argv);
 
-      if ( ! parse_args (argc, argv))
+      if (!parse_args (argc, argv))
         {
           return -1;
         }
diff --git a/TAO/tests/Bug_2935_Regression/source.cpp b/TAO/tests/Bug_2935_Regression/source.cpp
index 2c47c3ebe47..8b688662a21 100644
--- a/TAO/tests/Bug_2935_Regression/source.cpp
+++ b/TAO/tests/Bug_2935_Regression/source.cpp
@@ -47,7 +47,6 @@ bool parse_args (int & argc, ACE_TCHAR *argv[])
       return false;
     }
   return true;
-
 }
 
 
diff --git a/TAO/tests/Bug_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_2935_Regression/source_i.h b/TAO/tests/Bug_2935_Regression/source_i.h
index 203664e4ae3..35785b21bf7 100644
--- a/TAO/tests/Bug_2935_Regression/source_i.h
+++ b/TAO/tests/Bug_2935_Regression/source_i.h
@@ -41,7 +41,6 @@ private:
 
   // Number of messages to send (make this configurable)
   unsigned long counter_;
-
 };
 
 
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
index 1c54c14eb97..97e8ee72f65 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
@@ -9,15 +9,15 @@
 const ACE_TCHAR *POAname_ = 0;
 const ACE_TCHAR *ORBname_ = 0;
 
-PersistentPoa::PersistentPoa ( )
+PersistentPoa::PersistentPoa ()
 {
-} /* end of PersistentPoa::PersistentPoa ( ) */
+}
 
 
-PersistentPoa::~PersistentPoa ( )
+PersistentPoa::~PersistentPoa ()
   throw ()
 {
-} /* end of PersistentPoa::~PersistentPoa ( ) */
+}
 
 
 int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
@@ -71,8 +71,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
     mv_thisPOA = mv_rootPOA->create_POA(
       ACE_TEXT_ALWAYS_CHAR(POAname_),
       PortableServer::POAManager::_nil(),
-      policies
-    );
+      policies);
     if (CORBA::is_nil(mv_thisPOA.in()))
     {
       ACE_DEBUG((
@@ -113,10 +112,10 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
   ));
 
   return result;
-} /* end of PersistentPoa::init ( ) */
+}
 
 
-int PersistentPoa::fini (void)
+int PersistentPoa::fini ()
 {
   int result = 0;
 
@@ -141,7 +140,6 @@ int PersistentPoa::fini (void)
   ));
 
   return result;
-} /* end of PersistentPoa::fini ( ) */
-
+}
 
 ACE_FACTORY_DEFINE (bug2936, PersistentPoa)
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
index 1bd7c53e109..4bf9951ab43 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
@@ -15,10 +15,10 @@ class bug2936_Export PersistentPoa
   // public types and methods
   public:
     /// Default constructor.
-    PersistentPoa ( );
+    PersistentPoa ();
 
     /// Destructor.
-    ~PersistentPoa ( )
+    ~PersistentPoa ()
       throw ();
 
   // protected types and methods
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp
index 1223e7c0876..bec89c55495 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.cpp
+++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp
@@ -2,8 +2,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_unistd.h"
 
-char const * const scpc_orbId = "testDllOrb";
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug2936",
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.cpp b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
index 48327cc41ca..db5bae4319d 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
@@ -8,14 +8,14 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 }
 
 void
-Client_Task::terminate_loop (void)
+Client_Task::terminate_loop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->terminate_loop_ = 1;
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   try
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.h b/TAO/tests/Bug_2953_Regression/Client_Task.h
index 631aae096d2..b4b64869a89 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.h
@@ -18,10 +18,10 @@ public:
   Client_Task (CORBA::ORB_ptr orb);
 
   /// Terminate the loop
-  void terminate_loop (void);
+  void terminate_loop ();
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Bug_2953_Regression/server.cpp b/TAO/tests/Bug_2953_Regression/server.cpp
index 5c55c057945..3b5c22692a5 100644
--- a/TAO/tests/Bug_2953_Regression/server.cpp
+++ b/TAO/tests/Bug_2953_Regression/server.cpp
@@ -129,7 +129,7 @@ RTCORBA::RTORB_ptr getRTORB(CORBA::ORB_ptr orb, const char *id)
 {
   CORBA::Object_var obj = orb->resolve_initial_references("RTORB");
   RTCORBA::RTORB_ptr rtorb = RTCORBA::RTORB::_narrow(obj.in());
-  if ( CORBA::is_nil(rtorb))
+  if (CORBA::is_nil(rtorb))
     {
       ACE_ERROR ((LM_ERROR,
                   "Failed getting RTORB for orb <%C>\n",
@@ -142,7 +142,7 @@ PortableServer::POA_ptr getRootPoa(CORBA::ORB_ptr orb, const char *id)
 {
   CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
   PortableServer::POA_ptr poa = PortableServer::POA::_narrow(obj.in());
-  if ( CORBA::is_nil(poa) )
+  if (CORBA::is_nil(poa))
     {
       ACE_ERROR ((LM_ERROR,
                   "Failed getting RootPOA for orb <%C>\n",
diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp
index cd0f84a435b..6d827808c88 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2966_Regression/Hello.cpp
@@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_2966_Regression/Hello.h b/TAO/tests/Bug_2966_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.h
+++ b/TAO/tests/Bug_2966_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3000_Regression/Callback.cpp b/TAO/tests/Bug_3000_Regression/Callback.cpp
index fbf466a8735..93de0784405 100644
--- a/TAO/tests/Bug_3000_Regression/Callback.cpp
+++ b/TAO/tests/Bug_3000_Regression/Callback.cpp
@@ -1,12 +1,12 @@
 #include "Callback.h"
 
-Callback::Callback (void)
+Callback::Callback ()
   : received_callback_ (false)
 {
 }
 
 void
-Callback::test_oneway (void)
+Callback::test_oneway ()
 {
   received_callback_ = true;
 
@@ -15,7 +15,7 @@ Callback::test_oneway (void)
 }
 
 bool
-Callback::received_callback (void)
+Callback::received_callback ()
 {
   return received_callback_;
 }
diff --git a/TAO/tests/Bug_3000_Regression/Callback.h b/TAO/tests/Bug_3000_Regression/Callback.h
index e667bd5f4ff..178b4ff21dd 100644
--- a/TAO/tests/Bug_3000_Regression/Callback.h
+++ b/TAO/tests/Bug_3000_Regression/Callback.h
@@ -11,11 +11,11 @@ class Callback
 {
 public:
   /// Constructor
-  Callback (void);
+  Callback ();
 
-  virtual void test_oneway (void);
+  virtual void test_oneway ();
 
-  bool received_callback (void);
+  bool received_callback ();
 
  private:
   bool received_callback_;
diff --git a/TAO/tests/Bug_3000_Regression/Service.cpp b/TAO/tests/Bug_3000_Regression/Service.cpp
index db024beb115..53b0f4ec0d7 100644
--- a/TAO/tests/Bug_3000_Regression/Service.cpp
+++ b/TAO/tests/Bug_3000_Regression/Service.cpp
@@ -12,7 +12,7 @@ Service::run_test (Test::Callback_ptr callback)
 }
 
 void
-Service::shutdown (void)
+Service::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Shuting down self (server)\n"));
 
diff --git a/TAO/tests/Bug_3000_Regression/Service.h b/TAO/tests/Bug_3000_Regression/Service.h
index c34f4c98f46..cf310f3a4bc 100644
--- a/TAO/tests/Bug_3000_Regression/Service.h
+++ b/TAO/tests/Bug_3000_Regression/Service.h
@@ -16,10 +16,9 @@ public:
   // = The skeleton methods
   virtual void run_test (Test::Callback_ptr callback);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Use an ORB reference to shutdown the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3068_Regression/README b/TAO/tests/Bug_3068_Regression/README
index 63080498b54..4b708190dd7 100644
--- a/TAO/tests/Bug_3068_Regression/README
+++ b/TAO/tests/Bug_3068_Regression/README
@@ -1,5 +1,3 @@
-
-
 This test is for validating the fix for a race condition exposed in the
 Transport_Cache_Manager. The problem is that an internal pointer used
 to test intermediate return values to the cache may be deleted by one
diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp
index b6c71320485..a1ddc8d3806 100644
--- a/TAO/tests/Bug_3068_Regression/server.cpp
+++ b/TAO/tests/Bug_3068_Regression/server.cpp
@@ -7,12 +7,11 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
 const ACE_TCHAR *ior_output_file = 0;
-int iterations = 10;
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:i:"));
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -21,13 +20,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case 'o':
         ior_output_file = get_opts.opt_arg ();
         break;
-      case 'i':
-        iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
       case '?':
       default:
-        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -o <iorfile>")
-                           ACE_TEXT ("-i <iterations>\n"), argv [0]),
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -o <iorfile>\n"), argv [0]),
                           -1);
       }
   // Indicates successful parsing of the command line
@@ -89,7 +84,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      Simple_Server_i server_impl (orb.in (), iterations);
+      Simple_Server_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("simple_server");
diff --git a/TAO/tests/Bug_3068_Regression/test_i.h b/TAO/tests/Bug_3068_Regression/test_i.h
index c64bc84d507..3eaeba850d6 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.h
+++ b/TAO/tests/Bug_3068_Regression/test_i.h
@@ -58,7 +58,6 @@ public:
 private:
   /// The orb
   CORBA::ORB_var orb_;
-
 };
 
 /**
@@ -71,10 +70,9 @@ private:
  */
 class Simple_Server_i : public POA_Simple_Server
 {
-
 public:
   /// ctor
-  Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
+  Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
   void ow_test ();
@@ -89,14 +87,10 @@ private:
   /// The ORB
   CORBA::ORB_var orb_;
 
-  /// Flag to indicate, whether we are ready for a remote call.
-  int flag_;
-
   /// Callback Object
   Caller *caller_;
 
   /// Number of times the callback needs to be called
-  int iterations_;
   int ow_count_;
 };
 
diff --git a/TAO/tests/Bug_3068_Regression/test_i.inl b/TAO/tests/Bug_3068_Regression/test_i.inl
index 99c25e480f0..72fba134549 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.inl
+++ b/TAO/tests/Bug_3068_Regression/test_i.inl
@@ -5,10 +5,8 @@ Callback_i::Callback_i (CORBA::ORB_ptr orb)
 }
 
 ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations)
+Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     flag_ (0),
-     caller_ (0),
-     iterations_ (no_iterations)
+     caller_ (0)
 {
 }
diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp
index 3a34daed57b..8e63098454f 100644
--- a/TAO/tests/Bug_3108_Regression/client.cpp
+++ b/TAO/tests/Bug_3108_Regression/client.cpp
@@ -60,7 +60,7 @@ Client::Client (test_ptr server)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3108_Regression/test_i.cpp b/TAO/tests/Bug_3108_Regression/test_i.cpp
index cebacc2a5a4..79a511af2f3 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3108_Regression/test_i.cpp
@@ -14,7 +14,7 @@ test_i::test_method ()
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3108_Regression/test_i.h b/TAO/tests/Bug_3108_Regression/test_i.h
index a81166bf3e3..7d68c511511 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.h
+++ b/TAO/tests/Bug_3108_Regression/test_i.h
@@ -11,7 +11,7 @@ public:
 
   /// Test method.
   CORBA::Long test_method ();
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3154_Regression/README b/TAO/tests/Bug_3154_Regression/README
index 13ae957af22..0c3de9b9ae3 100644
--- a/TAO/tests/Bug_3154_Regression/README
+++ b/TAO/tests/Bug_3154_Regression/README
@@ -1,5 +1,3 @@
-
-
 This test uses newly implemented -Se feature of tao_idl. Using this feature
 user can prohibit custom endings (e.g. -hs or -hc) for TAO specific include fils.
 
@@ -8,7 +6,6 @@ __Regression Output__
 [vzykov@glasgow tao566_regression]$ ./run_test.pl
 ERROR: Custom endings are incorrectly applied.
 
-
 __Successful Output__
 
 [vzykov@glasgow tao563_regression]$ ./run_test.pl
diff --git a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
index 17ace4b9f2b..a067f40a607 100644
--- a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
+++ b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
@@ -311,8 +311,8 @@ module CosNotification
      *   implemented or is invalid.  The exception contents describe
      *   the problem(s) in detail.
      */
-    void set_qos ( in QoSProperties qos)
-      raises ( UnsupportedQoS );
+    void set_qos (in QoSProperties qos)
+      raises (UnsupportedQoS);
 
     /// Validate a set of QoS properties
     /**
@@ -327,7 +327,7 @@ module CosNotification
      */
     void validate_qos (in QoSProperties required_qos,
                        out NamedPropertyRangeSeq available_qos )
-      raises ( UnsupportedQoS );
+      raises (UnsupportedQoS);
   };
 
   //@{
@@ -380,7 +380,7 @@ module CosNotification
      *   cannot be implemented or are invalid
      */
     void set_admin (in AdminProperties admin)
-      raises ( UnsupportedAdmin);
+      raises (UnsupportedAdmin);
   };
 
 };
diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp
index 987ec1ea579..3085980d408 100644
--- a/TAO/tests/Bug_3163_Regression/server.cpp
+++ b/TAO/tests/Bug_3163_Regression/server.cpp
@@ -51,7 +51,7 @@ public:
 
     return 0;
   }
-  void shutdown (void)
+  void shutdown ()
   {
     this->orb_->shutdown (false);
   }
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 92c4e1532bb..5acca9c4bfe 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -69,7 +69,7 @@ class MyORBinitializer
 {
 public:
   MyORBinitializer( ACE_CString orbID )
-    : orbID_( orbID ) {};
+    : orbID_(orbID) {};
 
   virtual
   void
@@ -104,7 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     if (parse_args (argc, argv) != 0)
       return 1;
 
-    if ( g_initInMain )
+    if (g_initInMain)
     {
       initORB(0);
     }
@@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                           1);
 
       worker.thr_mgr ()->wait ();
-
     }
     ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
   }
@@ -139,7 +138,7 @@ Worker::Worker ()
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   static int threadID = 0;
 
@@ -158,18 +157,18 @@ initORB(int threadID)
 
     ACE_DEBUG ((LM_DEBUG, "Initializing ORB \"%C\"\n", ORBid));
 
-    if ( g_registerORBinitializer )
+    if (g_registerORBinitializer)
     {
       ACE_DEBUG ((LM_DEBUG, "Creating ORB initializer\n"));
       PortableInterceptor::ORBInitializer_var rCOI(
-        new MyORBinitializer( ORBid ) );
-      PortableInterceptor::register_orb_initializer( rCOI.in() );
+        new MyORBinitializer(ORBid));
+      PortableInterceptor::register_orb_initializer( rCOI.in());
     }
 
     ACE_DEBUG ((LM_DEBUG, "Creating TAO_ORB_Manager\n"));
     TAO_ORB_Manager* pORBmgr = new TAO_ORB_Manager;
 
-    if ( -1 == pORBmgr->init( g_argc, g_argv, ORBid ) )
+    if (-1 == pORBmgr->init(g_argc, g_argv, ORBid))
     {
       ACE_DEBUG ((LM_DEBUG, "Failed to initialize ORB \"%C\"\n", ORBid));
       throw CORBA::INTERNAL();
@@ -177,7 +176,7 @@ initORB(int threadID)
 
     ACE_DEBUG ((LM_DEBUG, "ORB \"%C\" initialized\n", ORBid));
 
-    if ( g_setTimeout )
+    if (g_setTimeout)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting connection timeout policy for ORB \"%C\"\n",
@@ -191,12 +190,10 @@ initORB(int threadID)
       CORBA::Any any;
       any <<= connectionTimeout;
 
-      CORBA::ULong l( policyList.length() );
-      policyList.length( l+1 );
+      CORBA::ULong l( policyList.length());
+      policyList.length(l+1);
 
-      policyList[l] = orb->create_policy(
-        TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
-        any );
+      policyList[l] = orb->create_policy(TAO::CONNECTION_TIMEOUT_POLICY_TYPE, any);
 
       ACE_DEBUG ((LM_DEBUG, "Connection timeout policy set for ORB \"%C\"\n",
                   ORBid));
diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
index b4c93c1b20b..40e905106ff 100644
--- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
+++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
@@ -94,13 +94,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
 
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index 85a1701db36..b10f270e0b7 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -5,7 +5,7 @@
 #include "tao/TAO_Singleton_Manager.h"
 
 
-DllOrb::DllOrb (void)
+DllOrb::DllOrb ()
  :
    ma_barrier_(),
    mv_orb_ (),
@@ -14,7 +14,7 @@ DllOrb::DllOrb (void)
 }
 
 
-DllOrb::~DllOrb (void)
+DllOrb::~DllOrb ()
 {
 }
 
@@ -78,8 +78,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
@@ -89,7 +88,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllOrb::fini (void)
+DllOrb::fini ()
 {
   try
   {
@@ -129,7 +128,7 @@ DllOrb::fini (void)
 }
 
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
@@ -165,7 +164,7 @@ int DllOrb::svc (void)
   }
 
   return 0;
-} /* end of DllOrb::svc ( ) */
+} /* end of DllOrb::svc () */
 
 
 ACE_FACTORY_DEFINE (bug_3251, DllOrb)
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h
index d057b189e85..a13e85e847d 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.h
@@ -13,8 +13,8 @@
 class bug_3251_Export DllOrb : public ACE_Task_Base
 {
 public:
-  DllOrb (void);
-  virtual ~DllOrb (void);
+  DllOrb ();
+  virtual ~DllOrb ();
 
   CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate (mv_orb_.in ()); }
 
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index fa78847117a..ab58e626593 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -4,14 +4,14 @@
 
 #include "PersistentPoa.h"
 
-PersistentPoa::PersistentPoa ( )
+PersistentPoa::PersistentPoa ()
 {
-} /* end of PersistentPoa::PersistentPoa ( ) */
+}
 
-PersistentPoa::~PersistentPoa ( )
+PersistentPoa::~PersistentPoa ()
   throw ()
 {
-} /* end of PersistentPoa::~PersistentPoa ( ) */
+}
 
 int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
 {
@@ -45,8 +45,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
     mv_thisPOA = mv_rootPOA->create_POA (
       m_poaName.c_str (),
       PortableServer::POAManager::_nil (),
-      policies
-    );
+      policies);
 
     mv_poaManager = mv_thisPOA->the_POAManager ();
     mv_poaManager->activate ();
@@ -60,10 +59,10 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_ERROR, ACE_TEXT ("POA activated\n")));
 
   return 0;
-} /* end of PersistentPoa::init ( ) */
+}
 
 
-int PersistentPoa::fini (void)
+int PersistentPoa::fini ()
 {
   try
   {
@@ -82,7 +81,7 @@ int PersistentPoa::fini (void)
   ACE_DEBUG ((LM_ERROR, ACE_TEXT ("POA deactivated\n")));
 
   return 0;
-} /* end of PersistentPoa::fini ( ) */
+}
 
 
 ACE_FACTORY_DEFINE (bug_3251, PersistentPoa)
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
index cb43a653b55..33402ea49d1 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
@@ -14,9 +14,9 @@ class bug_3251_Export PersistentPoa:  public ACE_Service_Object
 {
   // public types and methods
   public:
-    PersistentPoa ( );
+    PersistentPoa ();
 
-    ~PersistentPoa ( )
+    ~PersistentPoa ()
       throw ();
 
   // protected types and methods
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 835c6b05060..aca19bf2b19 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -103,26 +103,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
   : orb_ (0),
     new_poa_var_ (0)
 {
   //no-op
 }
 
-Manager::~Manager (void)
+Manager::~Manager ()
 {
   this->orb_->destroy ();
 }
 
 CORBA::ORB_ptr
-Manager::orb (void)
+Manager::orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_.in ());
 }
 
 CORBA::Object_ptr
-Manager::server (void)
+Manager::server ()
 {
   return CORBA::Object::_duplicate (this->server_.in ());
 }
diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h
index abf99ba5968..c6fbcdc80de 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.h
+++ b/TAO/tests/Bug_3276_Regression/Manager.h
@@ -6,24 +6,24 @@
 class Manager
 {
 public:
-  Manager (void);
+  Manager ();
   // Ctor
 
-  ~Manager (void);
+  ~Manager ();
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the ORB, POA etc.
 
-  int activate_servant (void);
+  int activate_servant ();
   // Activate the servant etc.
 
-  int run (void);
+  int run ();
   // Run the ORB's event loop.
 
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
   // ORB's accessor.
 
-  CORBA::Object_ptr server (void);
+  CORBA::Object_ptr server ();
   // Server's accessor.
 
 private:
diff --git a/TAO/tests/Bug_3299_Regression/Hello.cpp b/TAO/tests/Bug_3299_Regression/Hello.cpp
index 0f49115aca0..ff1b7c0678c 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3299_Regression/Hello.cpp
@@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   static int our_count = 0;
 
@@ -21,7 +21,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3299_Regression/Hello.h b/TAO/tests/Bug_3299_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.h
+++ b/TAO/tests/Bug_3299_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.cpp b/TAO/tests/Bug_3384_Regression/Client_i.cpp
index 9c421896d23..20a1ade9fc1 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Client_i.cpp
@@ -1,7 +1,5 @@
 #include "Client_i.h"
 
-Client::~Client () {}
-
 void Client::reply (const char * msg)
 {
   this->reply_count_++;
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.h b/TAO/tests/Bug_3384_Regression/Client_i.h
index ef594f641b5..9c3bcce2581 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.h
+++ b/TAO/tests/Bug_3384_Regression/Client_i.h
@@ -6,7 +6,7 @@ public:
   Client ()
     : POA_Test::Client(),
       reply_count_ (0) {}
-  virtual ~Client ();
+  virtual ~Client () = default;
 
   virtual void reply (
     const char * msg);
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp
index 9c9a314321e..3b988326a3c 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp
@@ -1,15 +1,11 @@
 #include "Server_i.h"
 
-Server::~Server () {}
-
-void Server::setup (
-  ::Test::Client_ptr cli)
+void Server::setup (::Test::Client_ptr cli)
 {
   this->cli_ = Test::Client::_duplicate (cli);
 }
 
-void Server::request (
-  ::CORBA::Long sel)
+void Server::request (::CORBA::Long sel)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server::request -> %d\n", sel));
   if (! CORBA::is_nil (this->cli_.in ()))
@@ -18,8 +14,7 @@ void Server::request (
   }
 }
 
-void Server::shutdown (
-  void)
+void Server::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.h b/TAO/tests/Bug_3384_Regression/Server_i.h
index c801fc07d8b..b4ad651c6b5 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.h
+++ b/TAO/tests/Bug_3384_Regression/Server_i.h
@@ -6,16 +6,13 @@ public:
   Server (CORBA::ORB_ptr orb)
     : POA_Test::Server(),
       orb_ (CORBA::ORB::_duplicate (orb)) {}
-  virtual ~Server ();
+  virtual ~Server () = default;
 
-  virtual void setup (
-    ::Test::Client_ptr cli);
+  virtual void setup (::Test::Client_ptr cli);
 
-  virtual void request (
-    ::CORBA::Long sel);
+  virtual void request (::CORBA::Long sel);
 
-  virtual void shutdown (
-    void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp
index 70a5ed3f812..5cc5cd4a1f3 100644
--- a/TAO/tests/Bug_3384_Regression/client.cpp
+++ b/TAO/tests/Bug_3384_Regression/client.cpp
@@ -197,7 +197,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3430_Regression/Hello.cpp b/TAO/tests/Bug_3430_Regression/Hello.cpp
index 2e2666c0c72..5da11424d96 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3430_Regression/Hello.cpp
@@ -13,7 +13,7 @@ Hello::method(Test::Hello_out r)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3430_Regression/Hello.h b/TAO/tests/Bug_3430_Regression/Hello.h
index e7318b30deb..c32a65ae46d 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.h
+++ b/TAO/tests/Bug_3430_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void method (Test::Hello_out r);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3470_Regression/test.cpp b/TAO/tests/Bug_3470_Regression/test.cpp
index e8a0b7b4cf4..ea15591c628 100644
--- a/TAO/tests/Bug_3470_Regression/test.cpp
+++ b/TAO/tests/Bug_3470_Regression/test.cpp
@@ -18,8 +18,8 @@ int ACE_TMAIN( int argc, ACE_TCHAR * argv[] )
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::ORB_ObjectIdList_var listsrv = orb->list_initial_services();
-      for (CORBA::ULong index = 0 ; index < listsrv->length() ; index++ )
-        if ( ACE_OS::strcmp(listsrv[index],"MyObjectId") == 0)
+      for (CORBA::ULong index = 0 ; index < listsrv->length(); index++ )
+        if (ACE_OS::strcmp(listsrv[index],"MyObjectId") == 0)
           retcode = 0;
 
       orb->destroy();
diff --git a/TAO/tests/Bug_3471_Regression/Hello.cpp b/TAO/tests/Bug_3471_Regression/Hello.cpp
index 383b6049261..1a29e8a8844 100644
--- a/TAO/tests/Bug_3471_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3471_Regression/Hello.cpp
@@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 Test::ObjectSeq*
-Hello::get_objects (void)
+Hello::get_objects ()
 {
   Test::ObjectSeq_var my_seq = new Test::ObjectSeq (1);
   my_seq->length (1);
@@ -16,7 +16,7 @@ Hello::get_objects (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3471_Regression/Hello.h b/TAO/tests/Bug_3471_Regression/Hello.h
index 5235bc0fe8f..786fca746de 100644
--- a/TAO/tests/Bug_3471_Regression/Hello.h
+++ b/TAO/tests/Bug_3471_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::ObjectSeq* get_objects (void);
+  virtual Test::ObjectSeq* get_objects ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3479_Regression/Hello.cpp b/TAO/tests/Bug_3479_Regression/Hello.cpp
index 674e81b64e0..06899bdaadc 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3479_Regression/Hello.cpp
@@ -12,7 +12,7 @@ Hello::get_string (CORBA::String_out string_out)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3479_Regression/Hello.h b/TAO/tests/Bug_3479_Regression/Hello.h
index bdce42f931d..f92e1ee2fb6 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.h
+++ b/TAO/tests/Bug_3479_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void get_string (CORBA::String_out string_out);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
index 6b98c90e75b..7f05a4ce4da 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
@@ -1,13 +1,11 @@
 #include "DLL_Service.h"
 
-ACE_DLL_Service::ACE_DLL_Service (void)
+ACE_DLL_Service::ACE_DLL_Service ()
 {
-
 }
 
-ACE_DLL_Service::~ACE_DLL_Service (void)
+ACE_DLL_Service::~ACE_DLL_Service ()
 {
-
 }
 
 int ACE_DLL_Service::init (int, ACE_TCHAR *[])
@@ -15,12 +13,12 @@ int ACE_DLL_Service::init (int, ACE_TCHAR *[])
   return 0;
 }
 
-int ACE_DLL_Service::fini (void)
+int ACE_DLL_Service::fini ()
 {
   return 0;
 }
 
-void ACE_DLL_Service::destroy (void)
+void ACE_DLL_Service::destroy ()
 {
   delete this;
 }
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h
index 801ead231da..059127e06dd 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h
@@ -6,23 +6,23 @@
 class ACE_DLL_SERVICE_Export ACE_DLL_Service
 {
 public:
-  ACE_DLL_Service (void);
+  ACE_DLL_Service ();
 
-  virtual ~ACE_DLL_Service (void);
+  virtual ~ACE_DLL_Service ();
 
   virtual int init (int , ACE_TCHAR * []);
 
   virtual int fini ();
 
   /// This is only here for destruction purposes
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #define ACE_DLL_SERVICE_DECL(export_macro, symbol) \
-  extern "C" export_macro ACE_DLL_Service * symbol (void)
+  extern "C" export_macro ACE_DLL_Service * symbol ()
 
 #define ACE_DLL_SERVICE_IMPL(classname, symbol) \
-  ACE_DLL_Service * symbol (void) \
+  ACE_DLL_Service * symbol () \
   { \
     classname * service = 0; \
     ACE_NEW_RETURN (service, classname (), 0); \
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
index 52ea597f868..d1c4ae09bba 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
@@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv [])
                          -1);
     }
 
-    typedef ACE_DLL_Service * (*factory_type) (void);
+    typedef ACE_DLL_Service * (*factory_type) ();
     ptrdiff_t tmp_ptr = reinterpret_cast <ptrdiff_t> (symbol);
     factory_type f = reinterpret_cast <factory_type> (tmp_ptr);
 
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
index c1b1b21511a..55fbc678b2b 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
@@ -2,14 +2,14 @@
 
 ACE_DLL_SERVICE_IMPL (ACE_DLL_TAO_Service, _make_ACE_DLL_TAO_Service)
 
-ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void)
+ACE_DLL_TAO_Service::ACE_DLL_TAO_Service ()
 {
-  ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void)"));
+  ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::ACE_DLL_TAO_Service ()"));
 }
 
-ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void)
+ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service ()
 {
-  ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void)"));
+  ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service ()"));
 }
 
 int ACE_DLL_TAO_Service::init (int argc, ACE_TCHAR * argv [])
@@ -42,9 +42,9 @@ int ACE_DLL_TAO_Service::init (int argc, ACE_TCHAR * argv [])
   return 0;
 }
 
-int ACE_DLL_TAO_Service::fini (void)
+int ACE_DLL_TAO_Service::fini ()
 {
-  ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::fini (void)"));
+  ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::fini ()"));
 
   try
   {
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
index f2d26f5d3db..85f7f4f62d9 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
@@ -8,9 +8,9 @@
 class ACE_DLL_TAO_Service : public ACE_DLL_Service
 {
 public:
-  ACE_DLL_TAO_Service (void);
+  ACE_DLL_TAO_Service ();
 
-  virtual ~ACE_DLL_TAO_Service (void);
+  virtual ~ACE_DLL_TAO_Service ();
 
   virtual int init (int argc, ACE_TCHAR * argv []);
 
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_3524_Regression/README b/TAO/tests/Bug_3524_Regression/README
index db232cb3e61..636d004b6ac 100644
--- a/TAO/tests/Bug_3524_Regression/README
+++ b/TAO/tests/Bug_3524_Regression/README
@@ -1,9 +1,6 @@
-
-
-According to corba C++ mapping if bounds for IDL-bounded strings are violated
+According to CORBA C++ mapping if bounds for IDL-bounded strings are violated
 then BAD_PARAM has to be thrown. Currently MARSHAL is thrown.
 
-
 _Expected successful result_:
 
 $ ./run_test.pl
diff --git a/TAO/tests/Bug_3524_Regression/test.idl b/TAO/tests/Bug_3524_Regression/test.idl
index b4800229e6e..d1825472e58 100644
--- a/TAO/tests/Bug_3524_Regression/test.idl
+++ b/TAO/tests/Bug_3524_Regression/test.idl
@@ -1,3 +1,5 @@
+#include "tao/StringSeq.pidl"
+
 module Test
 {
   const short BOUND = 10;
diff --git a/TAO/tests/Bug_3524_Regression/test_i.h b/TAO/tests/Bug_3524_Regression/test_i.h
index 3dce672a4b6..9b098d0579c 100644
--- a/TAO/tests/Bug_3524_Regression/test_i.h
+++ b/TAO/tests/Bug_3524_Regression/test_i.h
@@ -68,7 +68,6 @@ public:
   void shutdown ();
 
 private:
-
   /// The ORB pseudo-reference (for shutdown).
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp
index 37ed18ee226..76f08066378 100644
--- a/TAO/tests/Bug_3531_Regression/client.cpp
+++ b/TAO/tests/Bug_3531_Regression/client.cpp
@@ -186,7 +186,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp
index 0988c258929..21abfe9d5c9 100644
--- a/TAO/tests/Bug_3531_Regression/server.cpp
+++ b/TAO/tests/Bug_3531_Regression/server.cpp
@@ -149,7 +149,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
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_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 44221124f40..43806234818 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -72,16 +72,16 @@ public:
 class Worker: public ACE_Task<ACE_SYNCH>
 {
 public:
-  Worker (void)
+  Worker ()
     : shutdown_ (false)
   {}
 
   virtual int svc ();
   virtual int close (u_long = 0);
   virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0);
-  int process_cmd (void);
+  int process_cmd ();
   void shutdown (bool do_shutdown);
-  bool shutdown (void);
+  bool shutdown ();
 
 private:
   bool shutdown_;
@@ -90,7 +90,7 @@ private:
 ACE_TSS<Worker> *workers_p = 0;
 #define workers (*workers_p)
 
-int Worker::svc (void)
+int Worker::svc ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread starting up.\n")));
@@ -118,7 +118,7 @@ int Worker::put (ACE_Message_Block * mblk, ACE_Time_Value * tv)
   return this->putq (mblk, tv);
 }
 
-int Worker::process_cmd (void)
+int Worker::process_cmd ()
 {
   ACE_Message_Block *mb = 0;
   if (this->getq (mb, 0) == -1)
@@ -141,7 +141,7 @@ void Worker::shutdown (bool do_shutdown)
   shutdown_ = do_shutdown;
 }
 
-bool Worker::shutdown (void)
+bool Worker::shutdown ()
 {
   return shutdown_;
 }
@@ -310,13 +310,13 @@ public:
     return 0;
   }
 
-  virtual ACE_Event_Handler * event_handler_i (void)
+  virtual ACE_Event_Handler * event_handler_i ()
   {
     return 0;
   }
 
 protected:
-  virtual TAO_Connection_Handler * connection_handler_i (void)
+  virtual TAO_Connection_Handler * connection_handler_i ()
   {
     return 0;
   }
@@ -329,7 +329,6 @@ protected:
   {
     return 0;
   }
-
 };
 
 class Shutdown: public Command
@@ -342,7 +341,6 @@ public:
     worker->shutdown (true);
     return 0;
   }
-
 };
 
 class TSS_Assert: public Command
@@ -427,7 +425,7 @@ public:
   {
     return cond_;
   }
-  virtual ACE_Message_Block *release (void)
+  virtual ACE_Message_Block *release ()
   {
     // we need to only release once both the main and worker thread
     // are done with this object - each signals this by calling this
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index e16dcfc4acb..0747038f24c 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-DllOrb::DllOrb (void)
+DllOrb::DllOrb ()
  :
    ma_barrier_(),
    mv_orb_ (),
@@ -12,7 +12,7 @@ DllOrb::DllOrb (void)
 {
 }
 
-DllOrb::~DllOrb (void)
+DllOrb::~DllOrb ()
 {
 }
 
@@ -75,8 +75,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-    threadCnt
-  );
+    threadCnt);
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("init mp_barrier->wait() done\n")));
@@ -86,7 +85,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
 
 int
-DllOrb::fini (void)
+DllOrb::fini ()
 {
   try
   {
@@ -126,7 +125,7 @@ DllOrb::fini (void)
 }
 
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n")));
   ma_barrier_->wait();
@@ -162,7 +161,7 @@ int DllOrb::svc (void)
   }
 
   return 0;
-} /* end of DllOrb::svc ( ) */
+}
 
 
 ACE_FACTORY_DEFINE (bug_3542, DllOrb)
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h
index 1824980a125..a7d44a51a05 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.h
@@ -13,8 +13,8 @@
 class bug_3542_Export DllOrb : public ACE_Task_Base
 {
 public:
-  DllOrb (void);
-  virtual ~DllOrb (void);
+  DllOrb ();
+  virtual ~DllOrb ();
 
   CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate (mv_orb_.in ()); }
 
diff --git a/TAO/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp
index a9a80b01d2e..382fe3bd19c 100644
--- a/TAO/tests/Bug_3543_Regression/master.cpp
+++ b/TAO/tests/Bug_3543_Regression/master.cpp
@@ -74,7 +74,7 @@ public:
   }
 };
 
-void Dispatcher_shutdown(void)
+void Dispatcher_shutdown()
 {
     std::list<MasterClient::Server_var> copiedlist;
     {
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
index 069664b64c3..358363115d0 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
@@ -62,10 +62,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     Stock_Quoter_var quoter = Stock_Quoter::_narrow (stock_quoter_obj.in());
 
-    memset( Msg, 1, 1000 ) ;
-    //UDP->send( 10 ) ;
+    memset(Msg, 1, 1000);
+    //UDP->send( 10 );
 
-    server->send( Msg ) ;
+    server->send(Msg);
 
     try
       {
@@ -75,7 +75,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     catch (Bad_Ticker_Symbol& e)
       {
         cerr << "Caught a bad ticker symbol exception: "
-             << e.symbol << endl;;
+             << e.symbol << endl;
       }
 
     quoter->shutdown ();
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
index 4e2e4cdaba3..17cdb2bfd72 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
@@ -11,7 +11,7 @@ Stock_Quoter_i::~Stock_Quoter_i ()
 }
 
 void
-Stock_Quoter_i::shutdown (void)
+Stock_Quoter_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
index 554f6985a87..17f37c59924 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
@@ -12,7 +12,7 @@ public:
 
    CORBA::Float get_quote (const char* stock_id);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest.idl b/TAO/tests/Bug_3547_Regression/UDPTest.idl
index 5ca1b3e2688..507eb6724fe 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest.idl
+++ b/TAO/tests/Bug_3547_Regression/UDPTest.idl
@@ -3,9 +3,9 @@
 
 interface UDPTestI
 {
-    typedef octet BufferT[1000] ;
+  typedef octet BufferT[1000] ;
 
-    oneway void send( in BufferT Msg );
+  oneway void send( in BufferT Msg);
 };
 
 
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
index e318f1ecfae..b6952f0b116 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
@@ -13,7 +13,7 @@ UDPTest_i::~UDPTest_i ()
 
 void UDPTest_i::send( const ::UDPTestI::BufferT Msg )
 {
-    memcpy( buf, Msg, 1000 ) ;
-    memset( buf, 0, 1000 ) ;
+    memcpy( buf, Msg, 1000 );
+    memset( buf, 0, 1000 );
     received_send_ = true;
 }
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.h b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
index 3ecdc41eed6..9cc4fc131d4 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.h
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
@@ -10,7 +10,7 @@ public:
    UDPTest_i ();
    virtual ~UDPTest_i ();
 
-   virtual void send( const ::UDPTestI::BufferT Msg );
+   virtual void send(const ::UDPTestI::BufferT Msg);
 
    bool received_send_;
 };
diff --git a/TAO/tests/Bug_3548_Regression/client.cpp b/TAO/tests/Bug_3548_Regression/client.cpp
index 94b05e0b766..c72b9a0927e 100644
--- a/TAO/tests/Bug_3548_Regression/client.cpp
+++ b/TAO/tests/Bug_3548_Regression/client.cpp
@@ -20,7 +20,7 @@ void eat_my_memory()
   else
     {
       _message_buffer->length(1);
-      (*_message_buffer)[0] = CORBA::string_dup( output_string );
+      (*_message_buffer)[0] = CORBA::string_dup( output_string);
     }
 }
 
diff --git a/TAO/tests/Bug_3553_Regression/Hello.cpp b/TAO/tests/Bug_3553_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3553_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3553_Regression/Hello.h b/TAO/tests/Bug_3553_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.h
+++ b/TAO/tests/Bug_3553_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3558_Regression/Hello.cpp b/TAO/tests/Bug_3558_Regression/Hello.cpp
index 789e72c09a4..95810f9386f 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3558_Regression/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("%D get_string: sleep 5 seconds before returning\n")));
   ACE_OS::sleep (5);
@@ -15,7 +15,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3558_Regression/Hello.h b/TAO/tests/Bug_3558_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.h
+++ b/TAO/tests/Bug_3558_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
index 6dbdd973f19..0caeb772223 100644
--- a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
@@ -20,7 +20,6 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         const char * in_str,
                         bool check_params)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     number_ ((CORBA::Long) 931232),
      yadda_ ((CORBA::Long) 140474),
      in_l_ (in_l),
      in_str_(CORBA::string_dup(in_str)),
@@ -63,14 +62,14 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.h b/TAO/tests/Bug_3567_Regression/ami_test_i.h
index 22f9b58728f..6487e77d505 100644
--- a/TAO/tests/Bug_3567_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_3567_Regression/ami_test_i.h
@@ -34,9 +34,9 @@ public:
                    CORBA::Long in_l,
                    const char* in_str);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
@@ -45,8 +45,6 @@ public:
 private:
   CORBA::ORB_var orb_;
 
-  CORBA::Long number_;
-
   CORBA::Long yadda_;
 
   CORBA::Long in_l_;
diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp
index 5f5ed1c9e56..42fa8210ad8 100644
--- a/TAO/tests/Bug_3567_Regression/client.cpp
+++ b/TAO/tests/Bug_3567_Regression/client.cpp
@@ -93,7 +93,7 @@ public:
   /// ctor
   Client (A::AMI_Test_ptr server, int niterations, A::AMI_AMI_TestHandler_ptr hnd);
   /// dtor
-  ~Client () ;
+  ~Client ();
 
   /// The thread entry point.
   virtual int svc ();
@@ -112,7 +112,7 @@ public:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   }
 
@@ -145,7 +145,6 @@ public:
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"));
       try
@@ -171,7 +170,7 @@ public:
                   "Callback method <get_yadda_excep> called:\n"));
     }
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called:\n"));
@@ -182,7 +181,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called:\n"));
     }
-  ~Handler (void)
+  ~Handler ()
   {
   }
 
@@ -326,7 +325,7 @@ Client::~Client ()
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
@@ -354,7 +353,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   while (number_of_replies > 0)
     {
diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp
index 63e4c806ef1..c59bb94fb57 100644
--- a/TAO/tests/Bug_3567_Regression/server.cpp
+++ b/TAO/tests/Bug_3567_Regression/server.cpp
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #include "ami_test_i.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
@@ -28,15 +27,15 @@ int nthreads = 5;
 class Worker : public ACE_Task_Base
 {
 public:
-  Worker (CORBA::ORB_ptr orb);
   // ctor
+  Worker (CORBA::ORB_ptr orb);
 
-  virtual int svc ();
   // The thread entry point.
+  virtual int svc ();
 
 private:
-  CORBA::ORB_var orb_;
   // The orb
+  CORBA::ORB_var orb_;
 };
 
 int
@@ -153,7 +152,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp
index 23276610023..355db9e5c56 100644
--- a/TAO/tests/Bug_3597_Regression/server.cpp
+++ b/TAO/tests/Bug_3597_Regression/server.cpp
@@ -13,9 +13,9 @@ public:
 
   virtual int open (const ACE_TCHAR *logger_key);
 
-  virtual int reset (void);
+  virtual int reset ();
 
-  virtual int close (void);
+  virtual int close ();
 
   virtual ssize_t log (ACE_Log_Record &log_record);
 
@@ -34,13 +34,13 @@ Backend::open (const ACE_TCHAR *key)
 }
 
 int
-Backend::reset (void)
+Backend::reset ()
 {
   return 0;
 }
 
 int
-Backend::close (void)
+Backend::close ()
 {
   return 0;
 }
diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
index 45d43b27eca..04d12398ace 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
@@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
     client_interceptor = cri;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h
index 55063792acd..346b31b2b5a 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h
+++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h
@@ -33,7 +33,6 @@ class ClientORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
index 520d8bb3495..2a7e8712c25 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
@@ -7,12 +7,12 @@
   CORBA::Boolean
   ClientRequest_Interceptor::success_flag_ = 0;
 
-  ClientRequest_Interceptor::ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::ClientRequest_Interceptor ()
     : name_ ("ClientRequest_Interceptor")
   {
   }
 
-  ClientRequest_Interceptor::~ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::~ClientRequest_Interceptor ()
   {
   }
 
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
index 53d5ad3bed2..1ba41d68aba 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
@@ -28,10 +28,9 @@ class ClientRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
+ClientRequest_Interceptor ();
 
-ClientRequest_Interceptor (void);
-
-~ClientRequest_Interceptor (void);
+~ClientRequest_Interceptor ();
 
 /// Canonical name of the interceptor.
 virtual char * name ();
@@ -52,10 +51,8 @@ virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 static CORBA::Boolean success_flag_;
 
 private:
-
 /// Name of the interceptor
 const char *name_;
-
 };
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.cpp b/TAO/tests/Bug_3598a_Regression/Hello.cpp
index 2e31783440f..16f276e957c 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3598a_Regression/Hello.cpp
@@ -14,5 +14,5 @@ Hello::get_string ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_3598a_Regression/client.cpp b/TAO/tests/Bug_3598a_Regression/client.cpp
index cd707ae672f..bdd21dc4fca 100644
--- a/TAO/tests/Bug_3598a_Regression/client.cpp
+++ b/TAO/tests/Bug_3598a_Regression/client.cpp
@@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         orb->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp
index f9ddf6315dc..7aa4336608b 100644
--- a/TAO/tests/Bug_3598a_Regression/server.cpp
+++ b/TAO/tests/Bug_3598a_Regression/server.cpp
@@ -41,10 +41,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,7 +67,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/tests/Bug_3636_Regression/Hello.cpp b/TAO/tests/Bug_3636_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3636_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3636_Regression/Hello.h b/TAO/tests/Bug_3636_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.h
+++ b/TAO/tests/Bug_3636_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
index 496ebdac06c..10e4128d235 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
@@ -10,11 +10,6 @@ Backend_Impl(CORBA::ORB_ptr orb, bool verbose)
 {
 }
 
-Bug_3647_Regression::Backend_Impl::
-~Backend_Impl()
-{
-}
-
 void Bug_3647_Regression::Backend_Impl::
 startup_test()
 {
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h
index 9593832e0de..94d97c0d747 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.h
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.h
@@ -5,7 +5,6 @@
 
 namespace Bug_3647_Regression
 {
-
 /**
  * @class Backend
  *
@@ -15,7 +14,7 @@ class Backend_Impl : public POA_Bug_3647_Regression::Backend
 {
 public:
   Backend_Impl(CORBA::ORB_ptr orb, bool verbose);
-  virtual ~Backend_Impl();
+  virtual ~Backend_Impl() = default;
 
   virtual void startup_test();
   virtual void ping(Bug_3647_Regression::Payload const & the_payload);
@@ -30,7 +29,6 @@ private:
   /// Use this flag to decide if the program should produce any output.
   bool verbose_;
 };
-
 } // namespace Bug_3647_Regression
 
 #endif // Bug_3647_Regression_Backend_h
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
index c5904345484..d63515c023c 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
@@ -5,18 +5,11 @@ Bug_3647_Regression::Middle_Impl::
 Middle_Impl(
     Backend_ptr backend,
     CORBA::ORB_ptr orb,
-    bool verbose,
-    long timeout)
+    bool verbose)
   : POA_Bug_3647_Regression::Middle()
   , backend_(Bug_3647_Regression::Backend::_duplicate(backend))
   , orb_(CORBA::ORB::_duplicate(orb))
   , verbose_(verbose)
-  , timeout_(timeout)
-{
-}
-
-Bug_3647_Regression::Middle_Impl::
-~Middle_Impl()
 {
 }
 
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h
index 57fa2ec799a..8c551e21c7b 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.h
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.h
@@ -5,7 +5,6 @@
 
 namespace Bug_3647_Regression
 {
-
 /**
  * @class Middle
  *
@@ -17,9 +16,8 @@ public:
   Middle_Impl(
       Backend_ptr backend,
       CORBA::ORB_ptr orb,
-      bool verbose,
-      long timeout);
-  virtual ~Middle_Impl();
+      bool verbose);
+  virtual ~Middle_Impl() = default;
 
   virtual void startup_test();
   virtual void ping();
@@ -35,11 +33,7 @@ private:
 
   /// Use this flag to decide if the program should produce any output.
   bool verbose_;
-
-  /// Control the freeze time based on the timeout time
-  long timeout_;
 };
-
 } // namespace Bug_3647_Regression
 
 #endif // Bug_3647_Regression_Middle_hpp
diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp
index 3c19504187c..28fc2dcc382 100644
--- a/TAO/tests/Bug_3647_Regression/middle_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp
@@ -167,8 +167,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       using namespace Bug_3647_Regression;
       PortableServer::ServantBase_var impl(
-          new Middle_Impl(backend.in(), orb.in(), verbose,
-                          timeout));
+          new Middle_Impl(backend.in(), orb.in(), verbose));
 
       PortableServer::ObjectId_var id =
           root_poa->activate_object (impl.in());
diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
index 4c15a619ad5..6b5a75c0f35 100644
--- a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
@@ -31,7 +31,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   ACE_OS::sleep (5);
 
diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.h b/TAO/tests/Bug_3672_Regression/ami_test_i.h
index f648ca5fe34..167b2b062dc 100644
--- a/TAO/tests/Bug_3672_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_3672_Regression/ami_test_i.h
@@ -29,7 +29,7 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp
index 6e604fc1de7..4e4ee1ddf23 100644
--- a/TAO/tests/Bug_3672_Regression/client.cpp
+++ b/TAO/tests/Bug_3672_Regression/client.cpp
@@ -96,7 +96,7 @@ private:
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
-  Handler (void)
+  Handler ()
   {
   };
 
@@ -122,7 +122,6 @@ public:
 
    void foo_excep (::Messaging::ExceptionHolder * excep_holder)
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called:\n"));
       try
@@ -135,7 +134,7 @@ public:
         }
     };
 
-  ~Handler (void)
+  ~Handler ()
   {
   };
 };
@@ -271,7 +270,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ex._tao_print_exception ("Caught exception:");
       return 1;
-
     }
 
   return parameter_corruption;
@@ -295,7 +293,7 @@ Client::Client (A::AMI_Test_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3676_Regression/Hello.cpp b/TAO/tests/Bug_3676_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3676_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3676_Regression/Hello.h b/TAO/tests/Bug_3676_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.h
+++ b/TAO/tests/Bug_3676_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
index 456ee812712..e62b854ae01 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
@@ -7,13 +7,13 @@
 // This is the interface program that accesses the remote object
 
 // Constructor.
-Echo_Client_i::Echo_Client_i (void) : payload_length_ (0)
+Echo_Client_i::Echo_Client_i () : payload_length_ (0)
 {
   //no-op
 }
 
 //Destructor.
-Echo_Client_i::~Echo_Client_i (void)
+Echo_Client_i::~Echo_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
index 141a23106ed..c419bf51425 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
@@ -29,10 +29,10 @@ class Echo_Client_i
 {
 public:
   /// Constructor
-  Echo_Client_i (void);
+  Echo_Client_i ();
 
   /// Destructor
-  ~Echo_Client_i (void);
+  ~Echo_Client_i ();
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
index c96b220634c..e0cfc3b3fc6 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
@@ -2,13 +2,13 @@
 
 // Constructor.
 
-Echo_i::Echo_i (void)
+Echo_i::Echo_i ()
 {
 }
 
 // Destructor.
 
-Echo_i::~Echo_i (void)
+Echo_i::~Echo_i ()
 {
 }
 
@@ -44,7 +44,7 @@ Echo_i::echo_list (const char *)
     orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(1)] =
-    orb_->resolve_initial_references ("NameService");;
+    orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(2)] =
     orb_->resolve_initial_references ("NameService");
@@ -80,7 +80,7 @@ Echo_i::echo_string (const char *mesg)
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (void)
+Echo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe echo server is shutting down\n")));
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.h b/TAO/tests/Bug_3683_Regression/Echo_i.h
index 0cd222b57eb..6160644d8b9 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.h
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.h
@@ -30,10 +30,10 @@ class Echo_i : public POA_Echo
 {
 public:
   /// Constructor.
-  Echo_i (void);
+  Echo_i ();
 
   /// Destructor.
-  virtual ~Echo_i (void);
+  virtual ~Echo_i ();
 
   /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
@@ -42,7 +42,7 @@ public:
   virtual char *echo_string (const char *mesg);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 85475c11224..186b561ecbf 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -11,7 +11,7 @@
 
 // Constructor.
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : servant_ (0)
   , ior_output_file_ (0)
   , ins_ (0)
@@ -25,13 +25,13 @@ Server<Servant>::Server (void)
 
 // Destructor.
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_,
                         ACE_TEXT ("do:i:"), 1, 0,
@@ -165,7 +165,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
   // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -178,7 +178,7 @@ Server<Servant>::run (void)
 
 // Constructor.
 template <class ServerInterface>
-Client<ServerInterface>::Client (void)
+Client<ServerInterface>::Client ()
   : ior_ ("")
   , do_shutdown_ (0)
 {
@@ -218,7 +218,7 @@ Client<ServerInterface>::read_ior (ACE_TCHAR *filename)
 
 // Parses the command line arguments and returns an error status.
 template <class ServerInterface> int
-Client<ServerInterface>::parse_args (void)
+Client<ServerInterface>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_,
                         ACE_TEXT ("df:nk:x"), 1, 0,
@@ -265,7 +265,7 @@ Client<ServerInterface>::parse_args (void)
 }
 
 template <class ServerInterface>
-Client<ServerInterface>::~Client (void)
+Client<ServerInterface>::~Client ()
 {
   this->orb_->destroy ();
 }
@@ -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)
     {
@@ -322,7 +320,7 @@ Client<ServerInterface>::init (const char *,
 }
 
 template <class ServerInterface> int
-Client<ServerInterface>::do_shutdown (void)
+Client<ServerInterface>::do_shutdown ()
 {
   // Returns the shutdwon flag
   return this->do_shutdown_;
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h
index 1dc1e1c70dc..244b5b66170 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.h
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.h
@@ -34,10 +34,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -46,7 +46,7 @@ public:
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Ignore this method if you are not testing the InterOperable
   /// Naming Service.
@@ -54,7 +54,7 @@ public:
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// A holder of the servant that does ref counting for him.
   typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var;
@@ -94,10 +94,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name, int argc, ACE_TCHAR *argv[]);
@@ -106,7 +106,7 @@ public:
   ServerInterface *operator-> () { return server_.in (); }
 
   /// Returns the shutdown flag.
-  int do_shutdown (void);
+  int do_shutdown ();
 
   /// Fills in the shutdwon flag.
   void do_shutdown (int);
@@ -114,7 +114,7 @@ public:
   /// Initialize naming service
   int obtain_initial_references (const char *name);
 
-  CORBA::ORB_ptr orb (void)
+  CORBA::ORB_ptr orb ()
     {
       return CORBA::ORB::_duplicate (this->orb_.in ());
     }
@@ -124,7 +124,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3743_Regression/README b/TAO/tests/Bug_3743_Regression/README
index bc1e47b8917..e43dfb0d8b5 100644
--- a/TAO/tests/Bug_3743_Regression/README
+++ b/TAO/tests/Bug_3743_Regression/README
@@ -1,5 +1,3 @@
-
-
 -Se tao_idl option didn't work properly when idl file included
 orb.idl.
 
@@ -8,7 +6,6 @@ __Regression Output__
 [vzykov@glasgow tao771_regression]$ ./run_test.pl
 ERROR: Custom endings are incorrectly applied.
 
-
 __Successful Output__
 
 [vzykov@glasgow tao771_regression]$ ./run_test.pl
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.cpp b/TAO/tests/Bug_3746_Regression/Test_i.cpp
index 0bc3f69157e..e79b7e4871b 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_3746_Regression/Test_i.cpp
@@ -15,7 +15,7 @@ BoundSequences::BoundSequences (CORBA::ORB_ptr orb)
 }
 
 void
-BoundSequences::shutdown (void)
+BoundSequences::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h
index 370f09f3aba..c6e2a708285 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.h
+++ b/TAO/tests/Bug_3746_Regression/Test_i.h
@@ -16,10 +16,9 @@ public:
   // = The skeleton methods
   virtual ::CORBA::ULong SendSequenceOf10Long (
     ::CORBA::ULong LengthSent,
-    const ::Test::BoundSequences::SequenceOf10Long &inSeq
-  );
+    const ::Test::BoundSequences::SequenceOf10Long &inSeq);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3748_Regression/Hello.cpp b/TAO/tests/Bug_3748_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3748_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3748_Regression/Hello.h b/TAO/tests/Bug_3748_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.h
+++ b/TAO/tests/Bug_3748_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
index 4242dc7a94c..cfd8fc63c18 100644
--- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
@@ -5,7 +5,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
index 9554057647d..e3d1af0b6df 100644
--- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
@@ -26,7 +26,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
index 4782e4214e5..7cef6cdf217 100644
--- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
+++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
@@ -3,13 +3,13 @@
 #include "Test_Protocols_Hooks.h"
 #include "TestC.h"
 
-Test_Protocols_Hooks::Test_Protocols_Hooks (void)
+Test_Protocols_Hooks::Test_Protocols_Hooks ()
   : failure_count_ (0)
 {
 }
 
 
-Test_Protocols_Hooks::~Test_Protocols_Hooks (void)
+Test_Protocols_Hooks::~Test_Protocols_Hooks ()
 {
 }
 
@@ -105,7 +105,7 @@ Test_Protocols_Hooks::client_protocol_properties_at_orb_level (
 }
 
 CORBA::Long
-Test_Protocols_Hooks::get_dscp_codepoint (void)
+Test_Protocols_Hooks::get_dscp_codepoint ()
 {
   return -1;
 }
diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
index e2adfb45ba3..222eabd6bc4 100644
--- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
+++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
@@ -17,10 +17,10 @@ class Test_Protocols_Hooks : public TAO_Protocols_Hooks
 {
 public:
   /// Constructor
-  Test_Protocols_Hooks (void);
+  Test_Protocols_Hooks ();
 
   /// Destructor
-  virtual ~Test_Protocols_Hooks (void);
+  virtual ~Test_Protocols_Hooks ();
 
   /// Initialize the protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core);
@@ -61,7 +61,7 @@ public:
   void client_protocol_properties_at_orb_level (
     TAO_SCIOP_Protocol_Properties &protocol_properties);
 
-  CORBA::Long get_dscp_codepoint (void);
+  CORBA::Long get_dscp_codepoint ();
 
   void get_selector_hook (CORBA::Policy *model_policy,
                           CORBA::Boolean
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.h b/TAO/tests/Bug_3755_Ext_Regression/common.h
index 023c2784466..35f2803c2fe 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.h
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.h
@@ -3,6 +3,6 @@
 #define FIRST_ORB_NAME "first_orb"
 #define SECOND_ORB_NAME "second_orb"
 
-typedef int (*orbs_check_callback)(void);
+typedef int (*orbs_check_callback)();
 
 int do_main (int argc, ACE_TCHAR *argv[], orbs_check_callback check);
diff --git a/TAO/tests/Bug_3766_Regression/TestI.cpp b/TAO/tests/Bug_3766_Regression/TestI.cpp
index 181c2886086..e732d7d0038 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.cpp
+++ b/TAO/tests/Bug_3766_Regression/TestI.cpp
@@ -36,7 +36,7 @@ Test_i::Test_i (CORBA::ORB_ptr o)
 }
 
 // Implementation skeleton destructor
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
 }
 
@@ -60,7 +60,7 @@ void Test_i::do_something_VariableLength (
   my_info->d = ::CORBA::string_dup("Howdy");
 }
 
-void Test_i::shutdown (void)
+void Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe server is shutting down\n")));
diff --git a/TAO/tests/Bug_3766_Regression/TestI.h b/TAO/tests/Bug_3766_Regression/TestI.h
index b731c02c884..c398592e21c 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.h
+++ b/TAO/tests/Bug_3766_Regression/TestI.h
@@ -44,7 +44,7 @@ public:
   Test_i (CORBA::ORB_ptr o);
 
   // Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
   virtual
   void do_something_FixedLength (
@@ -54,7 +54,7 @@ public:
   void do_something_VariableLength (
     ::VariableLengthInfo_out my_info);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.cpp b/TAO/tests/Bug_3768_Regression/TestCallback.cpp
index 18cca5d1db8..03aac6b348a 100644
--- a/TAO/tests/Bug_3768_Regression/TestCallback.cpp
+++ b/TAO/tests/Bug_3768_Regression/TestCallback.cpp
@@ -7,7 +7,7 @@ TestCallback::TestCallback (CORBA::ORB_ptr orb)
 }
 
 void
-TestCallback::start_threads_and_block (void)
+TestCallback::start_threads_and_block ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - start_threads_and_block\n"));
   work_.activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,10);
@@ -15,13 +15,13 @@ TestCallback::start_threads_and_block (void)
 }
 
 void
-TestCallback::test_call (void)
+TestCallback::test_call ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test_call\n"));
 }
 
 void
-TestCallback::shutdown (void)
+TestCallback::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test completed\n"));
   exit (0);
diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.h b/TAO/tests/Bug_3768_Regression/TestCallback.h
index ada0da87940..30c6c9f41e9 100644
--- a/TAO/tests/Bug_3768_Regression/TestCallback.h
+++ b/TAO/tests/Bug_3768_Regression/TestCallback.h
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  int svc(void)
+  int svc()
   {
     orb_->run();
     return 0;
@@ -31,9 +31,9 @@ public:
   TestCallback (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void start_threads_and_block (void);
-  virtual void test_call (void);
-  virtual void shutdown (void);
+  virtual void start_threads_and_block ();
+  virtual void test_call ();
+  virtual void shutdown ();
 
 private:
   Worker work_;
diff --git a/TAO/tests/Bug_3768_Regression/TestServer.cpp b/TAO/tests/Bug_3768_Regression/TestServer.cpp
index a3e89dca5e9..948e33a5f80 100644
--- a/TAO/tests/Bug_3768_Regression/TestServer.cpp
+++ b/TAO/tests/Bug_3768_Regression/TestServer.cpp
@@ -11,19 +11,19 @@ TestServer::pass_callback (Test::TestCallback_ptr test)
 }
 
 bool
-TestServer::got_callback (void)
+TestServer::got_callback ()
 {
   return (callback_.in() != 0);
 }
 
 void
-TestServer::make_callback (void)
+TestServer::make_callback ()
 {
   callback_->test_call();
 }
 
 void
-TestServer::shutdown_client (void)
+TestServer::shutdown_client ()
 {
   callback_->shutdown();
 }
diff --git a/TAO/tests/Bug_3768_Regression/TestServer.h b/TAO/tests/Bug_3768_Regression/TestServer.h
index ab15dcf77c0..f3bfd06a415 100644
--- a/TAO/tests/Bug_3768_Regression/TestServer.h
+++ b/TAO/tests/Bug_3768_Regression/TestServer.h
@@ -12,9 +12,9 @@ public:
   // = The skeleton methods
   virtual void pass_callback (Test::TestCallback_ptr test);
 
-  bool got_callback (void);
-  void make_callback (void);
-  void shutdown_client (void);
+  bool got_callback ();
+  void make_callback ();
+  void shutdown_client ();
 
 private:
   Test::TestCallback_var callback_;
diff --git a/TAO/tests/Bug_3768_Regression/server.cpp b/TAO/tests/Bug_3768_Regression/server.cpp
index 2cdabc37c7d..4c4913109f1 100644
--- a/TAO/tests/Bug_3768_Regression/server.cpp
+++ b/TAO/tests/Bug_3768_Regression/server.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  int svc(void)
+  int svc()
   {
     orb_->run();
     return 0;
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
index ff2df5d99e8..a2f552b0d77 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
@@ -7,7 +7,7 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Test_i::shutdown (void)
+Simple_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.h b/TAO/tests/Bug_3790_Regression/simple_test_i.h
index 9918438def1..f005511d554 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.h
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.h
@@ -12,7 +12,7 @@ public:
   Simple_Test_i (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp
index c01e37c4f96..63fb1d391e3 100644
--- a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp
@@ -27,13 +27,13 @@ AMI_Test_i::inout_arg_test (char *&)
 }
 
 void
-AMI_Test_i::shutdown (void)
+AMI_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-AMI_Test_i::yadda (void)
+AMI_Test_i::yadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
@@ -49,7 +49,7 @@ AMI_Test_i::yadda (CORBA::Long)
 }
 
 CORBA::Long
-AMI_Test_i::dadda (void)
+AMI_Test_i::dadda ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)dadda\n"));
diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.h b/TAO/tests/Bug_3801_Regression/ami_test_i.h
index 629f53a90f1..965d9e20481 100644
--- a/TAO/tests/Bug_3801_Regression/ami_test_i.h
+++ b/TAO/tests/Bug_3801_Regression/ami_test_i.h
@@ -26,13 +26,13 @@ public:
   /// ctor
   AMI_Test_i (CORBA::ORB_ptr orb);
 
-  void shutdown (void);
+  void shutdown ();
 
-  CORBA::Long yadda (void);
+  CORBA::Long yadda ();
 
   void yadda (CORBA::Long yadda);
 
-  CORBA::Long dadda (void);
+  CORBA::Long dadda ();
 
   void inout_arg_test (char *& str);
 
diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp
index 94dd6d6b5c8..b14fdb5b1d8 100644
--- a/TAO/tests/Bug_3801_Regression/simple_client.cpp
+++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp
@@ -57,10 +57,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler (void) {};
+  Handler () = default;
 
   /// Destructor.
-    ~Handler (void) {};
+    ~Handler () = default;
 
   void get_yadda (CORBA::Long result)
     {
@@ -105,7 +105,7 @@ public:
         }
     };
 
-  void set_yadda (void)
+  void set_yadda ()
     {
       ACE_ERROR ((LM_ERROR,
                   "Error: Callback method <set_yadda> called:\n"));
diff --git a/TAO/tests/Bug_3827_Regression/test.cpp b/TAO/tests/Bug_3827_Regression/test.cpp
index 1a8ebec6c85..94b828523ba 100644
--- a/TAO/tests/Bug_3827_Regression/test.cpp
+++ b/TAO/tests/Bug_3827_Regression/test.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
@@ -38,7 +38,7 @@ public:
   {
   }
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     try
       {
diff --git a/TAO/tests/Bug_3837_Regression/Hello.cpp b/TAO/tests/Bug_3837_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3837_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3837_Regression/Hello.h b/TAO/tests/Bug_3837_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.h
+++ b/TAO/tests/Bug_3837_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3845_Regression/README b/TAO/tests/Bug_3845_Regression/README
index c8b2b3f3fa9..667909aba73 100644
--- a/TAO/tests/Bug_3845_Regression/README
+++ b/TAO/tests/Bug_3845_Regression/README
@@ -1,7 +1,5 @@
 /**
 
-
-
 @page Local/Remote Mismatch Test README File
 
 	This test does not use the C++ compiler or any binaries
diff --git a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
index b41b6229938..02abc62c33b 100644
--- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
@@ -1,10 +1,6 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer ()
-{
-}
-
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
diff --git a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h
index bc637249076..0001a5a2dc9 100644
--- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer ();
+  Client_ORBInitializer () = default;
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
index f168b54de74..ead9e62ad5c 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
@@ -7,11 +7,6 @@ Demo_HelloWorld_i::Demo_HelloWorld_i (CORBA::ORB_ptr orb)
 {
 }
 
-// Implementation skeleton destructor
-Demo_HelloWorld_i::~Demo_HelloWorld_i (void)
-{
-}
-
 void Demo_HelloWorld_i::sayHello (const char * msg)
 {
   ACE_OS::sleep(1);
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.h b/TAO/tests/Bug_3853_Regression/Hello_i.h
index f7f361d02f1..3b88274a355 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.h
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.h
@@ -16,7 +16,7 @@ public:
   Demo_HelloWorld_i (CORBA::ORB_ptr orb);
 
   // Destructor
-  virtual ~Demo_HelloWorld_i (void);
+  virtual ~Demo_HelloWorld_i () = default;
 
   virtual void sayHello (const char * msg);
 
diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp
index 7428570eb11..9c8ac01825c 100644
--- a/TAO/tests/Bug_3853_Regression/client.cpp
+++ b/TAO/tests/Bug_3853_Regression/client.cpp
@@ -26,10 +26,10 @@ bool caught_exception = false;
 class ClientTask : public ACE_Task_Base
 {
 public:
-  ClientTask () {};
-  ~ ClientTask () {};
+  ClientTask () = default;
+  ~ ClientTask () = default;
 
-  virtual int svc (void)
+  virtual int svc ()
   {
     CORBA::Object_var helloObj = orb->string_to_object(server1_ior);
 
@@ -42,7 +42,6 @@ public:
     }
     else
     {
-
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ClientTask start.\n")));
       int i = 0;
       ACE_Time_Value due = ACE_OS::gettimeofday () + ACE_Time_Value (test_duration);
@@ -54,7 +53,7 @@ public:
           ++ i;
           ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)======client calling server1 sayHello %d\n"), i));
           const char* pMsg = " server1 say Hello";
-          hello->sayHello(pMsg) ;
+          hello->sayHello(pMsg);
           ACE_OS::sleep(2);
 
           if (caught_exception) {
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
index 0c0313eee35..4451032eac2 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
@@ -5,8 +5,6 @@
 extern const ACE_TCHAR *server2_ior;
 extern CORBA::ORB_var orb;
 
-const IOP::ServiceId service_id = 0xdeadbeef;
-
 int isRecursive = 0;
 extern Demo::HelloWorld_var server1_shutdownObj;
 
@@ -16,18 +14,14 @@ Echo_Client_Request_Interceptor ()
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
-{
-}
-
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -51,7 +45,6 @@ Echo_Client_Request_Interceptor::send_request (
   isRecursive ++ ;
   if (isRecursive%2 == 1 )
   {
-
     if (isRecursive == 3) {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Echo_Client_Request_Interceptor::send_request(%d) ")
                             ACE_TEXT ("shutdown server 1 now. \n"), isRecursive));
@@ -70,7 +63,7 @@ Echo_Client_Request_Interceptor::send_request (
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Echo_Client_Request_Interceptor::send_request(%d) ")
                             ACE_TEXT ("call server2 HelloWorld::sayHello() \n"), isRecursive));
       const char* pMsg = " server2 say Hello";
-      hello->sayHello(pMsg) ;
+      hello->sayHello(pMsg);
     }
   }
 }
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.h b/TAO/tests/Bug_3853_Regression/client_interceptor.h
index 2042b5f9872..7d74e98ed29 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.h
@@ -25,13 +25,13 @@ public:
   Echo_Client_Request_Interceptor ();
   // ctor.
 
-  virtual ~Echo_Client_Request_Interceptor ();
+  virtual ~Echo_Client_Request_Interceptor () = default;
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Bug_3853_Regression/server.cpp b/TAO/tests/Bug_3853_Regression/server.cpp
index 4d8dbec41a1..63ee4c947e5 100644
--- a/TAO/tests/Bug_3853_Regression/server.cpp
+++ b/TAO/tests/Bug_3853_Regression/server.cpp
@@ -59,15 +59,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     policies.length (5);
     // Lifespan policy
     policies[0] =
-      rootPOA->create_lifespan_policy (PortableServer::PERSISTENT );
+      rootPOA->create_lifespan_policy (PortableServer::PERSISTENT);
 
     // Servant Retention Policy
     policies[1] =
-      rootPOA->create_servant_retention_policy (PortableServer::RETAIN );
+      rootPOA->create_servant_retention_policy (PortableServer::RETAIN);
 
     // ID Assignment Policy
     policies[2] =
-      rootPOA->create_id_assignment_policy (PortableServer::USER_ID );
+      rootPOA->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Request Processing Policy
     policies[3] =
diff --git a/TAO/tests/Bug_3896_Regression/Hello.cpp b/TAO/tests/Bug_3896_Regression/Hello.cpp
index 1222840c1fc..8a95efcae15 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3896_Regression/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_OS::sleep (10);
 
@@ -15,7 +15,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3896_Regression/Hello.h b/TAO/tests/Bug_3896_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.h
+++ b/TAO/tests/Bug_3896_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp
index 2f09cc510f4..5916bee8932 100644
--- a/TAO/tests/Bug_3896_Regression/client.cpp
+++ b/TAO/tests/Bug_3896_Regression/client.cpp
@@ -143,7 +143,7 @@ Client::Client (CORBA::ORB_ptr orb)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3919_Regression/Hello.cpp b/TAO/tests/Bug_3919_Regression/Hello.cpp
index b1013a6061c..82d4b4724db 100644
--- a/TAO/tests/Bug_3919_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3919_Regression/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any)
 
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3919_Regression/Hello.h b/TAO/tests/Bug_3919_Regression/Hello.h
index a5a13ea2723..97d878316d8 100644
--- a/TAO/tests/Bug_3919_Regression/Hello.h
+++ b/TAO/tests/Bug_3919_Regression/Hello.h
@@ -20,20 +20,17 @@ class Hello
   : public virtual POA_Test::Hello
 {
 public:
-
   /// Constructor
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
   virtual CORBA::Any * get_any (CORBA::Any const & the_any);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The ORB which will be shutdown by Hello::shutdown().
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* HELLO_H */
diff --git a/TAO/tests/Bug_3919_Regression/client.cpp b/TAO/tests/Bug_3919_Regression/client.cpp
index c618a9c16f3..959d9b79f01 100644
--- a/TAO/tests/Bug_3919_Regression/client.cpp
+++ b/TAO/tests/Bug_3919_Regression/client.cpp
@@ -114,7 +114,6 @@ recursive_typecode_test (CORBA::ORB_ptr /* orb */,
   the_any <<= test;
 
   ::perform_invocation<Test::MyAttRefSequence> (hello, the_any);
-
 }
 
 void
@@ -159,7 +158,6 @@ nested_recursive_typecode_test (CORBA::ORB_ptr /* orb */,
   the_any <<= test;
 
   ::perform_invocation<Test2::MyAttRefSeqStruct> (hello, the_any);
-
 }
 
 /**
diff --git a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
index 7e908d06d22..1366294fcb8 100644
--- a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
@@ -16,7 +16,6 @@ class Client_ORBInitializer :
   public virtual CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
index bb010e4f324..b47883250cc 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
@@ -21,7 +21,7 @@ Client_Request_Interceptor::name ()
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
index eca718ce32a..89c14c6f499 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
@@ -19,7 +19,6 @@ class Client_Request_Interceptor
     public virtual CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *orb_id,
                               const char *forward_str);
@@ -34,9 +33,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
@@ -55,7 +54,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -69,7 +67,6 @@ private:
   /// Stringified reference to the object the initial request will be
   /// forwarded to by this interceptor.
   CORBA::String_var forward_str_;
-
 };
 
 #endif  /* CLIENT_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/Bug_3926_Regression/test_i.cpp b/TAO/tests/Bug_3926_Regression/test_i.cpp
index ba410931390..aae2649e9ca 100644
--- a/TAO/tests/Bug_3926_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3926_Regression/test_i.cpp
@@ -8,12 +8,12 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   ++this->number_;
   if (this->number_ == 3)
@@ -35,7 +35,7 @@ test_i::number (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "SERVER: Server is shutting down at %d.\n",
diff --git a/TAO/tests/Bug_3926_Regression/test_i.h b/TAO/tests/Bug_3926_Regression/test_i.h
index b906f280e9e..84d1a0fc050 100644
--- a/TAO/tests/Bug_3926_Regression/test_i.h
+++ b/TAO/tests/Bug_3926_Regression/test_i.h
@@ -26,28 +26,25 @@
 class test_i : public virtual POA_hello::GoodDay
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp
index 111fda81010..096b1866420 100644
--- a/TAO/tests/Bug_3953_Regression/client.cpp
+++ b/TAO/tests/Bug_3953_Regression/client.cpp
@@ -19,7 +19,7 @@ class Client_Task
 public:
   Client_Task (client_ptr c,
                server_ptr s);
-  int svc (void);
+  int svc ();
 
   bool exception () const;
 
@@ -36,7 +36,7 @@ Client_Task::Client_Task (client_ptr c,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp
index fc00327e5f5..bc99303785f 100644
--- a/TAO/tests/Bug_3953_Regression/server.cpp
+++ b/TAO/tests/Bug_3953_Regression/server.cpp
@@ -17,7 +17,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   Server_Task (CORBA::ORB_ptr orb);
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
@@ -29,7 +29,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
@@ -187,7 +187,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
         ++result;
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp
index 438203edd7f..5622dd31ddf 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/server_i.cpp
@@ -48,7 +48,7 @@ server_i::ping (CORBA::UShort time_to_live)
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h
index 7aa8275ab28..1ffab0f9437 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.h
+++ b/TAO/tests/Bug_3953_Regression/server_i.h
@@ -11,7 +11,7 @@ public:
   void start (client_ptr c,
               CORBA::UShort time_to_live);
 
-  void shutdown (void);
+  void shutdown ();
 
   bool exception () const;
 private:
diff --git a/TAO/tests/Bug_3954_Regression/Hello.cpp b/TAO/tests/Bug_3954_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3954_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3954_Regression/Hello.h b/TAO/tests/Bug_3954_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.h
+++ b/TAO/tests/Bug_3954_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_4010_Regression/Hello.cpp b/TAO/tests/Bug_4010_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4010_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_4010_Regression/Hello.h b/TAO/tests/Bug_4010_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.h
+++ b/TAO/tests/Bug_4010_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_4010_Regression/client.cpp b/TAO/tests/Bug_4010_Regression/client.cpp
index d54634333dd..ad27bb0f31c 100644
--- a/TAO/tests/Bug_4010_Regression/client.cpp
+++ b/TAO/tests/Bug_4010_Regression/client.cpp
@@ -45,7 +45,6 @@ ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:i:t:"));
 class PeriodicTask : public ACE_Event_Handler
 {
 public:
-
   explicit PeriodicTask(CORBA::ORB_var orbIn)
       : ACE_Event_Handler(),
       orb(orbIn),
@@ -106,9 +105,7 @@ public:
   }
 
 protected:
-
 private:
-
   PeriodicTask(const PeriodicTask &);
   PeriodicTask & operator=(const PeriodicTask &);
   CORBA::ORB_var orb;
diff --git a/TAO/tests/Bug_4059_Regression/Hello.cpp b/TAO/tests/Bug_4059_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4059_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_4059_Regression/Hello.h b/TAO/tests/Bug_4059_Regression/Hello.h
index c39a60042d7..1d85db44633 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.h
+++ b/TAO/tests/Bug_4059_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/tests/Bug_4213_Regression/Hello.cpp b/TAO/tests/Bug_4213_Regression/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Bug_4213_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4213_Regression/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_4213_Regression/Hello.h b/TAO/tests/Bug_4213_Regression/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_4213_Regression/Hello.h
+++ b/TAO/tests/Bug_4213_Regression/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Bug_933_Regression/MessengerClient.cpp b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
index 3905d3e4f05..ef5cd9894f6 100644
--- a/TAO/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -44,8 +44,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     CORBA::Object_var obj = orb->string_to_object(ior);
 
     // Narrow
-    Messenger_var messenger = Messenger::_narrow( obj.in() );
-    if(CORBA::is_nil( messenger.in() ) ) {
+    Messenger_var messenger = Messenger::_narrow( obj.in());
+    if(CORBA::is_nil( messenger.in())) {
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Panic: nil reference\n"),
                           1);
@@ -82,11 +82,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     orb->destroy ();
   }
-  catch( const CORBA::SystemException &ex ) {
+  catch( const CORBA::SystemException &ex) {
     ex._tao_print_exception ("Caught CORBA exception: ");
     return 1;
   }
-  catch( ... ) {
+  catch( ...) {
     return 1;
   }
 
diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
index af48c1b83ce..a60712b7115 100644
--- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
@@ -34,14 +34,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     //Get reference to Root POA
-    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA" );
-    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in() );
+    CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in());
 
     // Activate POA Manager
     PortableServer::POAManager_var mgr = poa->the_POAManager();
@@ -53,9 +53,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
-    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
-    CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
+      poa->activate_object( &messenger_servant);
+    CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in());
+    CORBA::String_var str = orb->object_to_string( messenger_obj.in());
     FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
index 716c221810b..5c6be02450b 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
@@ -6,7 +6,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 {
 }
 
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -52,7 +52,7 @@ Messenger_i::send_message (const CORBA::OctetSeq & user_name)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h
index 3736ecb672e..7fde917d017 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.h
@@ -13,16 +13,15 @@ class  Messenger_i : public virtual POA_Messenger
 public:
   Messenger_i (CORBA::ORB_ptr orb);
 
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual void send_message (const CORBA::OctetSeq & user_name);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
-
 };
 
 
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index 52446b05ebc..cb1b4c686de 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -33,7 +33,6 @@
  */
 class Application_Simulator
 {
-
 public:
   /// Constructor, limits the amount of fragmentation and memory this
   /// class takes.
@@ -41,7 +40,7 @@ public:
                     int max_fragment_size);
 
   /// Destructor, releases any memory left behind.
-  ~Application_Simulator (void);
+  ~Application_Simulator ();
 
   /**
    * Simulate an upcall. The class allocates some memory and then
@@ -192,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)
@@ -216,7 +214,7 @@ Application_Simulator::Application_Simulator (int max_fragments,
     *i = 0;
 }
 
-Application_Simulator::~Application_Simulator (void)
+Application_Simulator::~Application_Simulator ()
 {
   for (char** i = this->buffers_;
        i != this->buffers_ + this->max_fragments_;
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index b698505919f..e804c73abb2 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -24,7 +24,7 @@ static int nloops = 100;
 
 struct CDR_Test_Types
 {
-  CDR_Test_Types (void);
+  CDR_Test_Types ();
 
   CORBA::Octet o;
   CORBA::Short s;
@@ -40,7 +40,7 @@ struct CDR_Test_Types
   CORBA::Short a[ARRAY_SIZE];
 };
 
-CDR_Test_Types::CDR_Test_Types (void)
+CDR_Test_Types::CDR_Test_Types ()
   : o (1), s (2), l (4),
     str ("abc"), d (8)
 {
diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp
index 37c5c9a9a99..eca3d47e0bd 100644
--- a/TAO/tests/COIOP/Client_Task.cpp
+++ b/TAO/tests/COIOP/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -68,5 +68,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/tests/COIOP/Client_Task.h b/TAO/tests/COIOP/Client_Task.h
index 1f3fa76b019..6d28b35b980 100644
--- a/TAO/tests/COIOP/Client_Task.h
+++ b/TAO/tests/COIOP/Client_Task.h
@@ -14,7 +14,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
@@ -22,7 +21,7 @@ public:
                CORBA::Boolean result);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index 5874626a298..baa9705bec3 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/tests/COIOP/Hello.cpp
@@ -13,7 +13,7 @@ Hello::Hello (CORBA::ORB_ptr orb,
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -56,7 +56,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index 04abb027a27..5461b87cf73 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/COIOP/Server_Task.h b/TAO/tests/COIOP/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/COIOP/Server_Task.h
+++ b/TAO/tests/COIOP/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
index d4c95c9aba1..eb85df7cc27 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
@@ -1,5 +1,5 @@
 #include "Hello.h"
 
-Hello::Hello (void)
+Hello::Hello ()
 {
 }
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
index a2a5be4ab2d..3a8204314ae 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
@@ -11,7 +11,7 @@ class Hello
 {
 public:
   /// Constructor
-  Hello (void);
+  Hello ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index 76f15b8057c..4eb32c3e5a6 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -13,12 +13,12 @@
 
 #include "Collocation_Tester.h"
 
-Collocation_Test::Collocation_Test (void)
+Collocation_Test::Collocation_Test ()
 {
 }
 
 void
-Collocation_Test::shutdown (void)
+Collocation_Test::shutdown ()
 {
   this->root_poa_->destroy (1, 1);
   this->orb_->destroy ();
@@ -92,7 +92,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 
   return 0;
 
-
 }
 
 int
@@ -103,7 +102,7 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (void)
+Collocation_Test::test_narrow ()
 {
   Diamond::Top_var top =
     Diamond::Top::_narrow (this->diamond_obj_.in ());
@@ -133,7 +132,7 @@ Collocation_Test::test_narrow (void)
 }
 
 int
-Collocation_Test::run (void)
+Collocation_Test::run ()
 {
   this->poa_manager_->activate ();
 
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.h b/TAO/tests/CSD_Collocation/Collocation_Tester.h
index 0f9650b9d2b..03fcf224538 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.h
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.h
@@ -22,9 +22,9 @@
 class Collocation_Test
 {
 public:
-  Collocation_Test (void);
+  Collocation_Test ();
 
-  void shutdown (void);
+  void shutdown ();
 
   /// Initializing the Collocation_Test object.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -34,10 +34,10 @@ public:
 
   /// This test narrow an object reference to its base class and see
   /// if it works correctly.
-  int test_narrow (void);
+  int test_narrow ();
 
   /// Run the test.
-  int run (void);
+  int run ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.cpp b/TAO/tests/CSD_Collocation/Diamond_i.cpp
index 8210bbff906..2f0b46d5406 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.cpp
+++ b/TAO/tests/CSD_Collocation/Diamond_i.cpp
@@ -9,7 +9,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (void)
+Top_i::shape ()
 {
   return CORBA::string_dup ("a point.");
 }
@@ -25,13 +25,13 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (void)
+Left_i::shape ()
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
-Left_i::color (void)
+Left_i::color ()
 {
   return CORBA::string_dup ("black");
 }
@@ -45,20 +45,20 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (void)
+Right_i::shape ()
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
-Right_i::color (void)
+Right_i::color ()
 {
   return CORBA::string_dup ("red");
   //
 }
 
 CORBA::Long
-Right_i::width (void)
+Right_i::width ()
 {
   return 0;
 }
@@ -72,26 +72,26 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (void)
+Buttom_i::shape ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) In servant\n"));
   return CORBA::string_dup ("a diamond");
 }
 
 char *
-Buttom_i::color (void)
+Buttom_i::color ()
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
-Buttom_i::width (void)
+Buttom_i::width ()
 {
   return 100;
 }
 
 char *
-Buttom_i::name (void)
+Buttom_i::name ()
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.h b/TAO/tests/CSD_Collocation/Diamond_i.h
index 9c40c7fe247..f4f21c6fa5e 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.h
+++ b/TAO/tests/CSD_Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 };
 
 class Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index b9ae2cb7e37..9890f024599 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::poa_setup(void)
+ClientApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -86,7 +86,7 @@ ClientApp::poa_setup(void)
 
 
 void
-ClientApp::csd_setup(void)
+ClientApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -100,7 +100,7 @@ ClientApp::csd_setup(void)
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_B obj ref.
   Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
@@ -119,7 +119,7 @@ ClientApp::client_setup(void)
 
 
 void
-ClientApp::poa_activate(void)
+ClientApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -128,7 +128,7 @@ ClientApp::poa_activate(void)
 
 
 void
-ClientApp::run_clients(void)
+ClientApp::run_clients()
 {
   if (this->client_task_.open() != 0)
     {
@@ -138,7 +138,7 @@ ClientApp::run_clients(void)
 
 
 void
-ClientApp::run_orb_event_loop(void)
+ClientApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index fa005fdda5c..8160a063995 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -14,25 +14,22 @@
 class ClientApp : public TestAppBase
 {
   public:
-
     ClientApp();
     virtual ~ClientApp();
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
 
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void client_setup(void);
-    void poa_activate(void);
-    void run_clients(void);
-    void run_orb_event_loop(void);
+    void poa_setup();
+    void csd_setup();
+    void client_setup();
+    void poa_activate();
+    void run_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index ea45b56328d..97724f5a5e9 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -23,12 +23,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -82,7 +76,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -95,7 +89,7 @@ ServerApp::poa_setup(void)
 }
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -131,7 +125,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->foo_servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -141,7 +135,7 @@ ServerApp::servant_setup(void)
 
 
 void
-ServerApp::collocated_setup(void)
+ServerApp::collocated_setup()
 {
   if (this->num_collocated_clients_ == 0)
     return;
@@ -162,14 +156,14 @@ ServerApp::collocated_setup(void)
       FooServantListType::T_stub_var foo
         = this->foo_servants_.objref(servant_index);
       ClientEngine_Handle engine
-        = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id, true);
+        = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id);
       this->collocated_client_task_.add_engine(engine.in());
     }
 }
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -178,7 +172,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -191,7 +185,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index 3141df7fde7..4285af45932 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -13,31 +13,25 @@
 class ServerApp : public TestAppBase
 {
   public:
-
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
-    void collocated_setup(void);
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
+    void collocated_setup();
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
-
     // Helper methods used by the methods above.
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index 1d9c9cbc332..bf55c5cbdda 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -65,7 +65,6 @@ struct RefHelper
 
     return t_obj._retn();
   }
-
 };
 
 struct CSD_TP_Test_Export AppHelper
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
index 8690c061ff8..d9aec412d8b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
@@ -25,7 +25,7 @@ public:
   ClientEngine();
   virtual ~ClientEngine();
 
-  virtual bool execute(void) = 0;
+  virtual bool execute() = 0;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
index 4284e163ee8..bde60f3b110 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
@@ -16,7 +16,7 @@ OrbRunner::~OrbRunner()
 
 
 void
-OrbRunner::run(void)
+OrbRunner::run()
 {
   ACE_ASSERT(this->num_orb_threads_ > 0);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
index 46fabc593e8..e4b52dcaaae 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
@@ -1,7 +1,7 @@
 #include "StatisticsHelper.h"
 
 // swap function for integers
-void swap ( CORBA::Long& x, CORBA::Long& y )
+void swap (CORBA::Long& x, CORBA::Long& y)
 {
   CORBA::Long temp;
   temp = x;
@@ -10,7 +10,7 @@ void swap ( CORBA::Long& x, CORBA::Long& y )
 }
 
 
-void sort ( LongVector & vector )
+void sort (LongVector & vector)
 {
   unsigned size = vector.size ();
 
@@ -20,15 +20,15 @@ void sort ( LongVector & vector )
       unsigned pass;
       unsigned j;
 
-      for ( pass = 0; pass < size - 1; pass++ )
+      for (pass = 0; pass < size - 1; pass++ )
       {
         indexOfMin = pass;
 
-        for ( j = pass + 1; j < size; j++ )
-          if ( vector[j] < vector[indexOfMin] )
+        for (j = pass + 1; j < size; j++ )
+          if (vector[j] < vector[indexOfMin] )
             indexOfMin = j;
 
-        swap ( vector[pass], vector[indexOfMin] );
+        swap (vector[pass], vector[indexOfMin]);
       }
     }
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
index b82edcb91e3..a029fd174ca 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
@@ -11,10 +11,8 @@ typedef ACE_Vector< CORBA::Long, 1000 > LongVector;
 typedef ACE_Vector< ACE_CString, 1000 > StringVector;
 typedef ACE_Array< CORBA::Long > LongArray;
 
-extern CSD_TP_Test_Export
-void swap ( CORBA::Long& x, CORBA::Long& y );
+extern CSD_TP_Test_Export void swap (CORBA::Long& x, CORBA::Long& y);
 
-extern CSD_TP_Test_Export
-void sort ( LongVector & vector );
+extern CSD_TP_Test_Export void sort (LongVector & vector);
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
index 6b776551fd7..4c25617229e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
@@ -5,22 +5,14 @@
 #include "ace/Log_Msg.h"
 
 Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj,
-                                       unsigned  client_id,
-                                       bool collocated)
+                                       unsigned  client_id)
   : obj_(Foo_A::_duplicate(obj)),
-    client_id_ (client_id),
-    collocated_ (collocated)
+    client_id_ (client_id)
 {
 }
 
-
-Foo_A_ClientEngine::~Foo_A_ClientEngine()
-{
-}
-
-
 bool
-Foo_A_ClientEngine::execute(void)
+Foo_A_ClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
index 0eb354a8060..4ede3d6f51e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
@@ -18,17 +18,16 @@ class Foo_A_Statistics;
 class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine
 {
 public:
-  Foo_A_ClientEngine(Foo_A_ptr obj, unsigned  client_id = 0, bool collocated = false);
-  virtual ~Foo_A_ClientEngine();
+  Foo_A_ClientEngine(Foo_A_ptr obj, unsigned  client_id = 0);
+  virtual ~Foo_A_ClientEngine() = default;
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_A_Statistics& stats);
 
 private:
   Foo_A_var obj_;
   unsigned  client_id_;
-  bool      collocated_;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
index c98bd78c21b..497be9e9f05 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
@@ -11,12 +11,6 @@ Foo_A_Statistics::Foo_A_Statistics(unsigned num_clients)
     }
 }
 
-
-Foo_A_Statistics::~Foo_A_Statistics()
-{
-}
-
-
 void
 Foo_A_Statistics::expected(unsigned op_num, unsigned count)
 {
@@ -84,4 +78,3 @@ Foo_A_Statistics::actual_vs_expected()
 }
 
 
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
index f2b979cea57..af2f9ee35e7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
@@ -8,10 +8,9 @@
 class CSD_TP_Foo_A_Export Foo_A_Statistics
 {
   public:
-
     Foo_A_Statistics(unsigned num_clients);
 
-    virtual ~Foo_A_Statistics();
+    virtual ~Foo_A_Statistics() = default;
 
     void expected(unsigned op_num, unsigned count);
     void actual(unsigned op_num, unsigned count);
@@ -19,9 +18,7 @@ class CSD_TP_Foo_A_Export Foo_A_Statistics
 
     bool actual_vs_expected();
 
-
   private:
-
     unsigned num_clients_;
 
     unsigned expected_[5];
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index c6b4504db22..3162fe4fd28 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -10,14 +10,8 @@ Foo_A_i::Foo_A_i()
     }
 }
 
-
-Foo_A_i::~Foo_A_i()
-{
-}
-
-
 void
-Foo_A_i::op1(void)
+Foo_A_i::op1()
 {
   this->op_count_[0] ++;
 }
@@ -49,7 +43,7 @@ Foo_A_i::op4(CORBA::Long value)
 
 
 void
-Foo_A_i::op5(void)
+Foo_A_i::op5()
 {
   this->op_count_[4] ++;
   throw FooException();
@@ -57,7 +51,7 @@ Foo_A_i::op5(void)
 
 
 void
-Foo_A_i::done(void)
+Foo_A_i::done()
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 8f5bde6d947..f56dc876e09 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -9,11 +9,10 @@
 class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
 {
   public:
-
     Foo_A_i();
-    virtual ~Foo_A_i();
+    virtual ~Foo_A_i() = default;
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -21,14 +20,13 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
-    void gather_stats (Foo_A_Statistics& stats) ;
+    void gather_stats (Foo_A_Statistics& stats);
 
   private:
-
     LongVector in_values_ [5];
     unsigned op_count_ [5];
 };
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index 2a43feb4f6d..7e881300082 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -12,7 +12,7 @@ Callback_i::~Callback_i ()
 
 
 void
-Callback_i::test_method(void)
+Callback_i::test_method()
 {
   this->num_callbacks_ ++;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index 04b2d94c5d2..7ae01e2ec5d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -10,18 +10,16 @@ class CSD_TP_Foo_B_Export Callback_i
                               : public virtual POA_Callback
 {
   public:
-
     Callback_i();
 
     virtual ~Callback_i();
 
-    virtual void test_method(void);
+    virtual void test_method();
 
     void gather_stats(Foo_B_Statistics& stats);
 
 
   private:
-
      unsigned num_callbacks_;
 };
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index 6592f5b0720..24dc43f5124 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -9,23 +9,15 @@ const char* ONEWAY_ARG_TEST_STR = "TEST";
 
 Foo_B_ClientEngine::Foo_B_ClientEngine(Foo_B_ptr obj,
                                        Callback_ptr callback,
-                                       unsigned client_id,
-                                       bool collocated)
+                                       unsigned client_id)
   : obj_(Foo_B::_duplicate(obj)),
     callback_(Callback::_duplicate(callback)),
-    client_id_(client_id),
-    collocated_(collocated)
+    client_id_(client_id)
 {
 }
 
-
-Foo_B_ClientEngine::~Foo_B_ClientEngine()
-{
-}
-
-
 bool
-Foo_B_ClientEngine::execute(void)
+Foo_B_ClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
@@ -101,10 +93,10 @@ Foo_B_ClientEngine::execute(void)
   this->obj_->op7 (this->callback_.in ());
 
   // One-Way calls with various arguments.
-  CORBA::String_var ub_string = CORBA::string_dup( test_str );
+  CORBA::String_var ub_string = CORBA::string_dup( test_str);
   this->obj_->test_unbounded_string_arg (ub_string.in ());
 
-  CORBA::String_var bd_string = CORBA::string_dup( test_str );
+  CORBA::String_var bd_string = CORBA::string_dup( test_str);
   this->obj_->test_bounded_string_arg (bd_string.in ());
 
   Fixed_Array fixed_array;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
index 72731110b59..09dea672b18 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
@@ -21,12 +21,11 @@ class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine
 public:
   Foo_B_ClientEngine(Foo_B_ptr obj,
                       Callback_ptr callback,
-                      unsigned client_id = 0,
-                      bool collocated = false);
+                      unsigned client_id = 0);
 
-  virtual ~Foo_B_ClientEngine();
+  virtual ~Foo_B_ClientEngine() = default;
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_B_Statistics& stats);
   static unsigned expected_callbacks ();
@@ -35,7 +34,6 @@ private:
   Foo_B_var obj_;
   Callback_var callback_;
   unsigned client_id_;
-  bool collocated_;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index b6d215e0a94..427602fe60b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -9,23 +9,15 @@ extern const char* ONEWAY_ARG_TEST_STR;
 
 Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj,
                                                    Callback_ptr callback,
-                                                   unsigned client_id,
-                                                   bool collocated)
+                                                   unsigned client_id)
   : obj_(Foo_B::_duplicate(obj)),
     callback_(Callback::_duplicate(callback)),
-    client_id_(client_id),
-    collocated_(collocated)
+    client_id_(client_id)
 {
 }
 
-
-Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine()
-{
-}
-
-
 bool
-Foo_B_SimpleClientEngine::execute(void)
+Foo_B_SimpleClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
index e64bad650d9..695b38b256c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
@@ -21,12 +21,11 @@ class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine
 public:
   Foo_B_SimpleClientEngine(Foo_B_ptr obj,
                             Callback_ptr callback,
-                            unsigned client_id = 0,
-                            bool collocated = false);
+                            unsigned client_id = 0);
 
-  virtual ~Foo_B_SimpleClientEngine();
+  virtual ~Foo_B_SimpleClientEngine() = default;
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_B_Statistics& stats);
   static unsigned expected_callbacks ();
@@ -35,7 +34,6 @@ private:
   Foo_B_var obj_;
   Callback_var callback_;
   unsigned client_id_;
-  bool collocated_;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
index 79cdd00ed9b..108567a0dbe 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
@@ -19,12 +19,6 @@ Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients,
     }
 }
 
-
-Foo_B_Statistics::~Foo_B_Statistics()
-{
-}
-
-
 void
 Foo_B_Statistics::expected(unsigned op_num, unsigned count, In_Value_Type type)
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
index 6dadbe4d564..cc36cc0739b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
@@ -8,7 +8,6 @@
 class CSD_TP_Foo_B_Export Foo_B_Statistics
 {
   public:
-
     enum In_Value_Type
     {
       FOO_B_STAT_NONE,
@@ -19,7 +18,7 @@ class CSD_TP_Foo_B_Export Foo_B_Statistics
     Foo_B_Statistics(unsigned num_remote_clients,
                      unsigned num_collcated_clients);
 
-    virtual ~Foo_B_Statistics();
+    virtual ~Foo_B_Statistics() = default;
 
     void expected(unsigned op_num, unsigned count, In_Value_Type type);
     void actual(unsigned op_num, unsigned count);
@@ -33,7 +32,6 @@ class CSD_TP_Foo_B_Export Foo_B_Statistics
     bool actual_vs_expected();
 
 private:
-
     unsigned num_clients_;
     unsigned num_collcated_clients_;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 151dda93167..0137228926d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -13,13 +13,8 @@ Foo_B_i::Foo_B_i()
 }
 
 
-Foo_B_i::~Foo_B_i()
-{
-}
-
-
 void
-Foo_B_i::op1(void)
+Foo_B_i::op1()
 {
   this->op_count_[0] ++;
 }
@@ -51,7 +46,7 @@ Foo_B_i::op4(CORBA::Long value)
 
 
 void
-Foo_B_i::op5(void)
+Foo_B_i::op5()
 {
   this->op_count_[4] ++;
   throw FooException();
@@ -245,7 +240,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb)
 
 
 void
-Foo_B_i::done(void)
+Foo_B_i::done()
 {
   TheAppShutdown->client_done();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index 6ad53b221ff..1c2077132d4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -9,11 +9,10 @@
 class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
 {
   public:
-
     Foo_B_i();
-    virtual ~Foo_B_i();
+    virtual ~Foo_B_i() = default;
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -21,7 +20,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
     virtual CORBA::Boolean op6(const TimeOfDay& t,
                                char*& message);
@@ -47,12 +46,11 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
 
     virtual void test_objref_arg(Callback_ptr cb);
 
-    virtual void done(void);
+    virtual void done();
 
     void gather_stats (Foo_B_Statistics& stats);
 
   private:
-
     LongVector in_long_ [16];
     StringVector in_string_ [16];
     unsigned op_count_ [16];
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
index 3b66b5e29c9..82fe2c2df57 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
@@ -17,7 +17,7 @@ Foo_C_ClientEngine::~Foo_C_ClientEngine()
 
 
 bool
-Foo_C_ClientEngine::execute(void)
+Foo_C_ClientEngine::execute()
 {
   // Verify the return values and return the results.
   bool check_validity = true;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
index 245c72fc54a..8b741fb83e3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
@@ -21,7 +21,7 @@ public:
                       unsigned  client_id);
   virtual ~Foo_C_ClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
index 8d717ec510d..99fb50a8818 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
@@ -20,7 +20,7 @@ Foo_C_Custom_ClientEngine::~Foo_C_Custom_ClientEngine()
 
 
 bool
-Foo_C_Custom_ClientEngine::execute(void)
+Foo_C_Custom_ClientEngine::execute()
 {
   // Make sure the connection is established before making
   // remote invocations.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
index 6ef663ec30a..8ac8c275817 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
@@ -22,7 +22,7 @@ public:
                             unsigned               client_id);
   virtual ~Foo_C_Custom_ClientEngine();
 
-  virtual bool execute(void);
+  virtual bool execute();
 
   static void expected_results(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index b33c12bfa71..1166864d62e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -50,7 +50,7 @@ Foo_C_Custom_Proxy::validate_connection ()
 
 
 void
-Foo_C_Custom_Proxy::op1(void)
+Foo_C_Custom_Proxy::op1()
 {
   this->objref_->op1();
 }
@@ -79,21 +79,21 @@ Foo_C_Custom_Proxy::op4(CORBA::Long x)
 
 
 void
-Foo_C_Custom_Proxy::op5(void)
+Foo_C_Custom_Proxy::op5()
 {
   this->objref_->op5();
 }
 
 
 void
-Foo_C_Custom_Proxy::done(void)
+Foo_C_Custom_Proxy::done()
 {
   this->objref_->done();
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op1(void)
+Foo_C_Custom_Proxy::cust_op1()
 {
   Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_);
   this->strategy_->custom_synch_request(op.in());
@@ -127,7 +127,7 @@ Foo_C_Custom_Proxy::cust_op4(long x)
 
 
 void
-Foo_C_Custom_Proxy::cust_op5(void)
+Foo_C_Custom_Proxy::cust_op5()
 {
   Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_);
   this->strategy_->custom_synch_request(op.in());
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
index 3c82dd0f15a..7b61e19797b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
@@ -24,18 +24,18 @@ public:
 
   bool validate_connection ();
 
-  void op1(void);
+  void op1();
   void op2(CORBA::Long x);
   CORBA::Long op3(CORBA::Long x);
   void op4(CORBA::Long x);
-  void op5(void);
-  void done(void);
+  void op5();
+  void done();
 
-  void cust_op1(void);
+  void cust_op1();
   void cust_op2(long x);
   long cust_op3(long x);
   void cust_op4(long x);
-  void cust_op5(void);
+  void cust_op5();
 
 private:
   Foo_C_i*                        servant_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
index 6f314f493a4..1f4f3850a74 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
@@ -107,4 +107,3 @@ Foo_C_Statistics::actual_vs_expected()
 }
 
 
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
index 79de17967ee..69fdc56d3b8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
@@ -8,7 +8,6 @@
 class CSD_TP_Foo_C_Export Foo_C_Statistics
 {
   public:
-
     Foo_C_Statistics(unsigned num_remote_clients,
                      unsigned num_collocated_clients);
 
@@ -22,7 +21,6 @@ class CSD_TP_Foo_C_Export Foo_C_Statistics
 
 
   private:
-
     unsigned num_remote_clients_;
     unsigned num_collocated_clients_;
     unsigned expected_[10];
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
index 7d20b104616..fc1a91f1b9a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
@@ -37,7 +37,7 @@ Foo_C_cust_op1::~Foo_C_cust_op1()
 
 
 void
-Foo_C_cust_op1::result(void)
+Foo_C_cust_op1::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
index 27475bb4a78..13dcab071a1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op1(Foo_C_i* servant);
   virtual ~Foo_C_cust_op1();
 
-  void result(void);
+  void result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index 7a6933c5dfd..aa33a3a1e26 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -38,7 +38,7 @@ Foo_C_cust_op2::~Foo_C_cust_op2()
 
 
 void
-Foo_C_cust_op2::result(void)
+Foo_C_cust_op2::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
index f26caa26e60..02532c8b036 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op2(Foo_C_i* servant, long arg);
   virtual ~Foo_C_cust_op2();
 
-  void result(void);
+  void result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index 33d68371a87..03699cae58b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -39,7 +39,7 @@ Foo_C_cust_op3::~Foo_C_cust_op3()
 
 
 long
-Foo_C_cust_op3::result(void)
+Foo_C_cust_op3::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
index 61a034eb086..71c8931da96 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op3(Foo_C_i* servant, long arg);
   virtual ~Foo_C_cust_op3();
 
-  long result(void);
+  long result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
index 134cf755d07..45ee80c72ca 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
@@ -39,7 +39,7 @@ Foo_C_cust_op5::~Foo_C_cust_op5()
 
 
 void
-Foo_C_cust_op5::result(void)
+Foo_C_cust_op5::result()
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
index 8a3c0159bbd..37bdd4954c1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
@@ -24,7 +24,7 @@ public:
   Foo_C_cust_op5(Foo_C_i* servant);
   virtual ~Foo_C_cust_op5();
 
-  void result(void);
+  void result();
 
 protected:
   virtual void execute_i();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index 144f2027738..f7a7917dbee 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -18,7 +18,7 @@ Foo_C_i::~Foo_C_i()
 
 
 void
-Foo_C_i::op1(void)
+Foo_C_i::op1()
 {
   ++this->count_[0];
 }
@@ -50,7 +50,7 @@ Foo_C_i::op4(CORBA::Long value)
 
 
 void
-Foo_C_i::op5(void)
+Foo_C_i::op5()
 {
   ++this->count_[4];
   throw FooException();
@@ -58,14 +58,14 @@ Foo_C_i::op5(void)
 
 
 void
-Foo_C_i::done(void)
+Foo_C_i::done()
 {
   TheAppShutdown->client_done();
 }
 
 
 void
-Foo_C_i::cust_op1(void)
+Foo_C_i::cust_op1()
 {
   ++this->count_[5];
 }
@@ -97,7 +97,7 @@ Foo_C_i::cust_op4(long value)
 
 
 void
-Foo_C_i::cust_op5(void)
+Foo_C_i::cust_op5()
 {
   ++this->count_[9];
   throw CustomException();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index cd858e9c49f..0e8bb9dd2d6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -9,11 +9,10 @@
 class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
 {
   public:
-
     Foo_C_i();
     virtual ~Foo_C_i();
 
-    virtual void op1(void);
+    virtual void op1();
 
     virtual void op2(CORBA::Long value);
 
@@ -21,15 +20,15 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
 
     virtual void op4(CORBA::Long value);
 
-    virtual void op5(void);
+    virtual void op5();
 
-    virtual void done(void);
+    virtual void done();
 
-    void cust_op1(void);
+    void cust_op1();
     void cust_op2(long value);
     long cust_op3(long value);
     void cust_op4(long value);
-    void cust_op5(void);
+    void cust_op5();
 
     void gather_stats(Foo_C_Statistics& stats);
 
@@ -37,7 +36,6 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
 
 
   private:
-
     LongVector in_values_ [10];
     unsigned count_[10];
 };
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
index eeddb17762a..40ff9ea636f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
@@ -8,17 +8,14 @@
 class ClientApp : public TestAppBase
 {
   public:
-
     ClientApp();
     virtual ~ClientApp();
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     ACE_TString ior_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index b94c0b06e9c..4b32a37d000 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -16,12 +16,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index b0056a179c3..0440cc39a43 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -8,18 +8,13 @@
 class ServerApp : public TestAppBase
 {
   public:
-
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     ACE_TString ior_filename_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index abde30b72f6..78cb71484d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -50,7 +50,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_A obj ref.
   Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(this->orb_.in(),
@@ -62,7 +62,7 @@ ClientApp::client_setup(void)
 
 
 int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
 {
   bool result = this->engine_->execute();
   return result ? 0 : -1;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index 1afc33c0b6e..b45a2ba6afd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -10,20 +10,17 @@
 class ClientApp : public TestAppBase
 {
   public:
-
     ClientApp();
     virtual ~ClientApp();
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void client_setup(void);
-    int  run_engine(void);
+    void client_setup();
+    int  run_engine();
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index a9331abcc0a..99a4bb9d5d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -22,11 +22,6 @@ ServerApp::ServerApp()
 }
 
 
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -81,7 +76,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -89,7 +84,7 @@ ServerApp::poa_setup(void)
 
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -103,7 +98,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -122,14 +117,14 @@ ServerApp::collocated_setup()
       unsigned servant_index = i % this->num_servants_;
 
       ServantListType::T_stub_var obj = this->servants_.objref(servant_index);
-      ClientEngine_Handle engine = new Foo_A_ClientEngine(obj.in(), ++client_id_start, true);
+      ClientEngine_Handle engine = new Foo_A_ClientEngine(obj.in(), ++client_id_start);
       this->collocated_client_task_.add_engine(engine.in());
     }
 }
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -139,7 +134,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -152,7 +147,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 32f98b91403..0f791dc29fa 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -12,27 +12,22 @@
 class ServerApp : public TestAppBase
 {
   public:
-
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
     void collocated_setup();
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 96b4f181f3e..d48dd6938ad 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::poa_setup(void)
+ClientApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -86,7 +86,7 @@ ClientApp::poa_setup(void)
 
 
 void
-ClientApp::csd_setup(void)
+ClientApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -100,7 +100,7 @@ ClientApp::csd_setup(void)
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_B obj ref.
   Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
@@ -119,7 +119,7 @@ ClientApp::client_setup(void)
 
 
 void
-ClientApp::poa_activate(void)
+ClientApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -135,7 +135,7 @@ ClientApp::run_clients()
 
 
 void
-ClientApp::run_orb_event_loop(void)
+ClientApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index e4b0a709066..8160a063995 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -14,25 +14,22 @@
 class ClientApp : public TestAppBase
 {
   public:
-
     ClientApp();
     virtual ~ClientApp();
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
 
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void client_setup(void);
-    void poa_activate(void);
+    void poa_setup();
+    void csd_setup();
+    void client_setup();
+    void poa_activate();
     void run_clients();
-    void run_orb_event_loop(void);
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 9d43cef70aa..66d647e3d4e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -23,12 +23,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -94,7 +88,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -107,7 +101,7 @@ ServerApp::poa_setup(void)
 }
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -135,7 +129,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->foo_servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -145,7 +139,7 @@ ServerApp::servant_setup(void)
 
 
 void
-ServerApp::collocated_setup(void)
+ServerApp::collocated_setup()
 {
   if (this->num_collocated_clients_ == 0)
     return;
@@ -166,14 +160,14 @@ ServerApp::collocated_setup(void)
       FooServantListType::T_stub_var foo
         = this->foo_servants_.objref(servant_index);
       ClientEngine_Handle engine
-        = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id, true);
+        = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id);
       this->collocated_client_task_.add_engine(engine.in());
     }
 }
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -182,7 +176,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -195,7 +189,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 1be5ea37097..abec9a82630 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -9,35 +9,28 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "ace/SString.h"
 
-
 class ServerApp : public TestAppBase
 {
   public:
-
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
-
     // These are all called, in order, by the run_i() method.
     int  init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
-    void collocated_setup(void);
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
+    void collocated_setup();
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
-
     // Helper methods used by the methods above.
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
@@ -50,7 +43,6 @@ class ServerApp : public TestAppBase
     void usage_statement();
     int  arg_dependency_checks();
 
-
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
                                        const char* poa_name);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index 6c37f9ed293..c271f1cba48 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -52,7 +52,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
 {
   // Turn the ior_ into a Foo_C obj ref.
   Foo_C_var foo = RefHelper<Foo_C>::string_to_ref(this->orb_.in(),
@@ -64,7 +64,7 @@ ClientApp::client_setup(void)
 
 
 int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
 {
   bool result = this->engine_->execute();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index f89df26d866..1533218656c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -10,21 +10,18 @@
 class ClientApp : public TestAppBase
 {
   public:
-
     ClientApp();
     virtual ~ClientApp();
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
 
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void client_setup(void);
-    int  run_engine(void);
+    void client_setup();
+    int  run_engine();
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 25383409b9e..8c94b0eea4c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -23,12 +23,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -82,7 +76,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[])
 
 
 void
-ServerApp::poa_setup(void)
+ServerApp::poa_setup()
 {
   this->poa_ = this->create_poa(this->orb_.in(),
                                 "ChildPoa");
@@ -90,7 +84,7 @@ ServerApp::poa_setup(void)
 
 
 void
-ServerApp::csd_setup(void)
+ServerApp::csd_setup()
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
@@ -104,7 +98,7 @@ ServerApp::csd_setup(void)
 
 
 void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
@@ -141,7 +135,7 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
 {
   PortableServer::POAManager_var poa_manager
     = this->poa_->the_POAManager();
@@ -151,7 +145,7 @@ ServerApp::poa_activate(void)
 
 
 void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
 {
   if (this->num_collocated_clients_ > 0)
     {
@@ -164,7 +158,7 @@ ServerApp::run_collocated_clients(void)
 
 
 void
-ServerApp::run_orb_event_loop(void)
+ServerApp::run_orb_event_loop()
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
   orb_runner.run();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index 8628996fce9..088dec93600 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -12,27 +12,22 @@
 class ServerApp : public TestAppBase
 {
   public:
-
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
-
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
-    void poa_setup(void);
-    void csd_setup(void);
-    void servant_setup(void);
+    void poa_setup();
+    void csd_setup();
+    void servant_setup();
     void collocated_setup();
-    void poa_activate(void);
-    void run_collocated_clients(void);
-    void run_orb_event_loop(void);
+    void poa_activate();
+    void run_collocated_clients();
+    void run_orb_event_loop();
     bool check_validity ();
     void cleanup();
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
index eeddb17762a..40ff9ea636f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
@@ -8,17 +8,14 @@
 class ClientApp : public TestAppBase
 {
   public:
-
     ClientApp();
     virtual ~ClientApp();
 
   protected:
-
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
 
   private:
-
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
     ACE_TString ior_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 00076b5953a..4502397719b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -16,10 +16,6 @@ ServerApp::ServerApp()
 {
 }
 
-ServerApp::~ServerApp()
-{
-}
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index 4c2cf169f29..0b30f015bb5 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -6,21 +6,18 @@
 
 class ServerApp : public TestAppBase
 {
-  public:
+public:
+  ServerApp();
+  virtual ~ServerApp() = default;
 
-    ServerApp();
-    virtual ~ServerApp();
+protected:
+  virtual int run_i (int argc, ACE_TCHAR *argv[]);
 
-  protected:
+private:
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
-    virtual int run_i (int argc, ACE_TCHAR *argv[]);
-
-  private:
-
-    int parse_args (int argc, ACE_TCHAR *argv[]);
-
-    ACE_TString ior_filename_;
-    unsigned    num_clients_;
+  ACE_TString ior_filename_;
+  unsigned    num_clients_;
 };
 
 #endif
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index 1757a64b002..635e9e8c1ea 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -9,7 +9,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
     {
@@ -21,7 +21,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp
index a72878e305a..32143d1b8d7 100644
--- a/TAO/tests/CallbackTest/Callback.cpp
+++ b/TAO/tests/CallbackTest/Callback.cpp
@@ -17,14 +17,14 @@ Callback::are_you_there (CORBA::String_out answer)
 }
 
 void
-Callback::test_oneway (void)
+Callback::test_oneway ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - test_oneway!\n"));
 }
 
 void
-Callback::shutdown (void)
+Callback::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - shutdown!\n"));
diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h
index a2ae7b9064b..ea6628cd476 100644
--- a/TAO/tests/CallbackTest/Callback.h
+++ b/TAO/tests/CallbackTest/Callback.h
@@ -16,9 +16,9 @@ public:
   // = The skeleton methods
   virtual CORBA::Boolean are_you_there (CORBA::String_out answer);
 
-  virtual void test_oneway (void);
+  virtual void test_oneway ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   /// Use an ORB reference to shutdown the application.
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp
index 7b7cad946e0..4d8f0922237 100644
--- a/TAO/tests/CallbackTest/Service.cpp
+++ b/TAO/tests/CallbackTest/Service.cpp
@@ -7,7 +7,7 @@ Service::Service (CORBA::ORB_ptr orb)
 }
 
 void
-Service::dump_results (void)
+Service::dump_results ()
 {
   if (this->test_count_ == 0)
     {
diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h
index 78a6945d8d2..441a1c34370 100644
--- a/TAO/tests/CallbackTest/Service.h
+++ b/TAO/tests/CallbackTest/Service.h
@@ -17,7 +17,7 @@ public:
   /**
    * In case of failure this exposes any incomplete runs.
    */
-  void dump_results (void);
+  void dump_results ();
 
   // = The skeleton methods
   virtual void run_test (Test::Callback_ptr callback);
diff --git a/TAO/tests/ClientPortSpan/Hello.cpp b/TAO/tests/ClientPortSpan/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/ClientPortSpan/Hello.cpp
+++ b/TAO/tests/ClientPortSpan/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ClientPortSpan/Hello.h b/TAO/tests/ClientPortSpan/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/ClientPortSpan/Hello.h
+++ b/TAO/tests/ClientPortSpan/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ClientPortSpan/client.cpp b/TAO/tests/ClientPortSpan/client.cpp
index c132a448177..527ef0a537b 100644
--- a/TAO/tests/ClientPortSpan/client.cpp
+++ b/TAO/tests/ClientPortSpan/client.cpp
@@ -55,7 +55,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       try
         {
-
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - calling get_string\n"));
           CORBA::String_var the_string = hello->get_string ();
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n",
diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index bd29e654510..b49b07b1c75 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -16,7 +16,7 @@ Client_Task::successful_calls () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -55,7 +55,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
@@ -71,7 +71,7 @@ Client_Task::validate_connection (void)
 }
 
 int
-Client_Task::one_iteration (void)
+Client_Task::one_iteration ()
 {
   try
     {
diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h
index a8da84944ea..fbe0aa8b51b 100644
--- a/TAO/tests/Client_Leaks/Client_Task.h
+++ b/TAO/tests/Client_Leaks/Client_Task.h
@@ -22,14 +22,14 @@ public:
   int successful_calls () const;
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Run one iteration of the test
-  int one_iteration (void);
+  int one_iteration ();
 
   /// Make sure that the thread has a connection available
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 1c6fb507e19..5ab2b0d55ac 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -7,13 +7,13 @@ Process::Process (CORBA::ORB_ptr orb)
 }
 
 CORBA::Long
-Process::get_process_id (void)
+Process::get_process_id ()
 {
   return ACE_OS::getpid ();
 }
 
 void
-Process::shutdown (void)
+Process::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index ff42dd8d9a9..6240f83d220 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -14,9 +14,9 @@ public:
   Process (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long get_process_id (void);
+  virtual CORBA::Long get_process_id ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index c090c004da1..279f6b71802 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -9,13 +9,13 @@ Process_Factory::Process_Factory (CORBA::ORB_ptr orb)
 }
 
 int
-Process_Factory::shutdown_received (void)
+Process_Factory::shutdown_received ()
 {
   return this->shutdown_received_;
 }
 
 Test::Process_ptr
-Process_Factory::create_new_process (void)
+Process_Factory::create_new_process ()
 {
   Startup_Callback *startup_callback_impl;
   ACE_NEW_THROW_EX (startup_callback_impl,
@@ -101,12 +101,12 @@ Process_Factory::create_new_process (void)
 }
 
 void
-Process_Factory::noop (void)
+Process_Factory::noop ()
 {
 }
 
 void
-Process_Factory::shutdown (void)
+Process_Factory::shutdown ()
 {
   this->shutdown_received_ = 1;
   this->orb_->shutdown (false);
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index f21a360f019..1481290e47f 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -14,14 +14,14 @@ public:
   Process_Factory (CORBA::ORB_ptr orb);
 
   /// Return 1 if the shutdown message has been received already
-  int shutdown_received (void);
+  int shutdown_received ();
 
   // = The skeleton methods
-  virtual Test::Process_ptr create_new_process (void);
+  virtual Test::Process_ptr create_new_process ();
 
-  virtual void noop (void);
+  virtual void noop ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index c071110e1fa..99ac45c83b3 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -9,14 +9,14 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
     {
       // run the test for at most 120 seconds...
       // ACE_Time_Value tv (120, 0);
-      this->orb_->run ( /* tv, */);
+      this->orb_->run (/* tv, */);
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/tests/Client_Leaks/Server_Task.h b/TAO/tests/Client_Leaks/Server_Task.h
index 8b5f48d872c..4acef7697df 100644
--- a/TAO/tests/Client_Leaks/Server_Task.h
+++ b/TAO/tests/Client_Leaks/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index 7056173d188..66a214d2b4b 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -1,6 +1,6 @@
 #include "Startup_Callback.h"
 
-Startup_Callback::Startup_Callback (void)
+Startup_Callback::Startup_Callback ()
 {
 }
 
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index eae388467ec..58c36c5f15a 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -11,7 +11,7 @@ class Startup_Callback
 {
 public:
   /// Constructor
-  Startup_Callback (void);
+  Startup_Callback ();
 
   /// Return 1 if the process has started already
   /**
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
index 4769f62b629..7ad4be97e15 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
@@ -18,11 +18,11 @@
 
 // ****************************************************************
 
-IBM1047_ISO8859::IBM1047_ISO8859 (void)
+IBM1047_ISO8859::IBM1047_ISO8859 ()
 {
 }
 
-IBM1047_ISO8859::~IBM1047_ISO8859 (void)
+IBM1047_ISO8859::~IBM1047_ISO8859 ()
 {
 }
 
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
index 659c57cda3f..5c928d9ce2b 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
@@ -43,10 +43,10 @@ class IBM1047_ISO8859_Export IBM1047_ISO8859 : public ACE_Char_Codeset_Translato
 {
 public:
   /// A do nothing constructor.
-  IBM1047_ISO8859 (void);
+  IBM1047_ISO8859 ();
 
   /// Virtual destruction
-  virtual ~IBM1047_ISO8859 (void);
+  virtual ~IBM1047_ISO8859 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, ACE_CDR::Char &);
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
index 5daa44d3224..5d786eb231a 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
@@ -16,14 +16,12 @@
 
 // ****************************************************************
 
-WIBM1047_ISO8859::WIBM1047_ISO8859 (void)
+WIBM1047_ISO8859::WIBM1047_ISO8859 ()
 {
-
 }
 
-WIBM1047_ISO8859::~WIBM1047_ISO8859 (void)
+WIBM1047_ISO8859::~WIBM1047_ISO8859 ()
 {
-
 }
 
 // = Documented in $ACE_ROOT/ace/CDR_Stream.h
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
index 2440833184a..d1fb1095e0b 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
@@ -42,10 +42,10 @@ class IBM1047_ISO8859_Export WIBM1047_ISO8859 : public ACE_WChar_Codeset_Transla
 {
 public:
   /// A do nothing constructor.
-  WIBM1047_ISO8859 (void);
+  WIBM1047_ISO8859 ();
 
   /// Virtual destruction
-  virtual ~WIBM1047_ISO8859 (void);
+  virtual ~WIBM1047_ISO8859 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, ACE_CDR::WChar &);
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
index 58e286830c0..a8f749ecfdc 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
@@ -54,9 +54,6 @@ static const unsigned long ACE_UTF16_RAW_END = 0x00010000LU;
 // largest value that can be represented in UTF16 + 1
 static const unsigned long ACE_UTF16_END = 0x00110000LU;
 
-// largest value that can be represented in UTF-32 + 1
-static const unsigned long ACE_UTF32_END = 0x80000000LU;
-
 static const unsigned short ACE_UNICODE_SUBSTITUTE_CHARACTER = 0xFFFDU;
 static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU;
 static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU;
@@ -96,8 +93,7 @@ convert_surrogate_pair (ACE_UTF16_T high, ACE_UTF16_T low)
 {
   return static_cast<ACE_CDR::WChar> (((high - ACE_UTF16_SURROGATE_HIGH_BEGIN) << ACE_UTF16_SURROGATE_HIGH_SHIFT)
     + (low - ACE_UTF16_SURROGATE_LOW_BEGIN)
-    + ACE_UTF16_SURROGATE_OFFSET
-    );
+    + ACE_UTF16_SURROGATE_OFFSET);
 }
 
 /// load wchar from utf16 buffer
@@ -213,14 +209,12 @@ size_t count_potential_surrogates (
 /////////////////////////////
 // WUCS4_UTF16 implementation
 
-WUCS4_UTF16::WUCS4_UTF16 (void)
+WUCS4_UTF16::WUCS4_UTF16 ()
 {
-
 }
 
-WUCS4_UTF16::~WUCS4_UTF16 (void)
+WUCS4_UTF16::~WUCS4_UTF16 ()
 {
-
 }
 
 // = Documented in $ACE_ROOT/ace/CDR_Stream.h
@@ -270,7 +264,7 @@ WUCS4_UTF16::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x)
             if (! this->read_2 (cdr, &low))
               {
                 cdr.reset_byte_order (old_bo);
-                return 0;;
+                return 0;
               }
             if (low < ACE_UTF16_SURROGATE_LOW_BEGIN
               || low >= ACE_UTF16_SURROGATE_LOW_END)
@@ -390,7 +384,6 @@ WUCS4_UTF16::read_wchar_array_i (ACE_InputCDR & cdr,
       return 1;
     }
   return 0;
-
 }
 
 
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
index 539a54522d8..950318eb5a1 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
@@ -36,10 +36,10 @@ class UCS4_UTF16_Export WUCS4_UTF16 : public ACE_WChar_Codeset_Translator
 {
 public:
   /// A do nothing constructor.
-  WUCS4_UTF16 (void);
+  WUCS4_UTF16 ();
 
   /// Virtual destruction
-  virtual ~WUCS4_UTF16 (void);
+  virtual ~WUCS4_UTF16 ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
@@ -81,7 +81,6 @@ private:
       const ACE_CDR::WChar *x,
       ACE_CDR::ULong length,
       ACE_CDR::ULong transmission_length);
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
index 06c3951e83d..42a23179e06 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
@@ -42,7 +42,7 @@ UTF16_UCS2_Translator::UTF16_UCS2_Translator (CONV_FRAME::CodeSetId tcs)
          this->tcs_));
 }
 
-UTF16_UCS2_Translator::~UTF16_UCS2_Translator (void)
+UTF16_UCS2_Translator::~UTF16_UCS2_Translator ()
 {
 }
 
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h
index ccf22aabf88..f724706ee3b 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h
@@ -43,7 +43,7 @@ public:
   UTF16_UCS2_Translator (CONV_FRAME::CodeSetId tcs = ACE_CODESET_ID_ISO_UCS_2_LEVEL_1);
 
   /// Virtual destruction
-  virtual ~UTF16_UCS2_Translator (void);
+  virtual ~UTF16_UCS2_Translator ();
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
@@ -84,8 +84,6 @@ private:
 
 private:
   CONV_FRAME::CodeSetId tcs_;
-
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 6fdc8a8c1b0..04f53a4ab60 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -110,7 +110,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       outarg >>= any_reply;
 
       ACE_DEBUG ((LM_DEBUG,
-                 "Client sent %C, got %C\n", bare_string, reply.in ()) );
+                 "Client sent %C, got %C\n", bare_string, reply.in ()));
 
       if (ACE_OS::strcmp (bare_string, reply.in ()) != 0)
         {
@@ -118,7 +118,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
       ACE_DEBUG ((LM_DEBUG,
-                 "Client sent %C, got %C\n", any_string, any_reply) );
+                 "Client sent %C, got %C\n", any_string, any_reply));
 
       if (ACE_OS::strcmp (any_string, any_reply) != 0)
         {
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index 3599ee95ef2..9397fe7af7d 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -85,7 +85,7 @@ public:
   };
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void)
+  void shutdown ()
   {
     this->orb_->shutdown (false);
   };
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
index 94c6a6a242a..d8c07c14341 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
   try
@@ -56,5 +56,4 @@ Client_Task::svc (void)
     }
 
   return status;
-
 }
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
index 15951f28767..5e21009c3e4 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -57,7 +57,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
index 990e1564d52..ebd3d169b4a 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
 
@@ -55,5 +55,4 @@ Client_Task::svc (void)
     }
 
   return status;
-
 }
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
index b0feddd2c8e..c6cfa8478f0 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -63,7 +63,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
index 998b8a31cb0..bd7ac56e615 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 1;
   try
@@ -56,5 +56,4 @@ Client_Task::svc (void)
     }
 
   return status;
-
 }
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
index dabc25cce11..57283fe2995 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
@@ -12,7 +12,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -55,7 +55,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
index bbd3d5aa183..01fc08696f7 100644
--- a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
 
@@ -62,5 +62,4 @@ Client_Task::svc (void)
     }
 
   return status;
-
 }
diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.h b/TAO/tests/Collocated_DerivedIF/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_DerivedIF/Client_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp
index 93aa2c63755..d126eb34a3b 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp
@@ -10,7 +10,7 @@ HelloAgain::HelloAgain (CORBA::ORB_ptr orb,
 {
 }
 char *
-HelloAgain::get_string_again (void)
+HelloAgain::get_string_again ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall get_string_again in process ..\n"));
@@ -40,7 +40,7 @@ HelloAgain::get_string_again (void)
 }
 
 char *
-HelloAgain::get_string (void)
+HelloAgain::get_string ()
 {
     ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) HelloAgain::get_string Upcall get_string in process ..\n"));
@@ -69,7 +69,7 @@ HelloAgain::get_string (void)
     return CORBA::string_dup ("Hello there!");
 }
 void
-HelloAgain::shutdown (void)
+HelloAgain::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.h b/TAO/tests/Collocated_DerivedIF/Hello.h
index 4bb8b790558..b1ac7dacbd1 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.h
+++ b/TAO/tests/Collocated_DerivedIF/Hello.h
@@ -16,9 +16,9 @@
            ACE_thread_t thr_id);
 
     // = The skeleton methods
-    virtual char * get_string_again (void);
-    virtual char * get_string (void);
-    virtual void shutdown (void);
+    virtual char * get_string_again ();
+    virtual char * get_string ();
+    virtual void shutdown ();
 
 
   private:
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
index 6b89058c3ac..17b998b45ca 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.h b/TAO/tests/Collocated_DerivedIF/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
index 2bc503b80c1..27276d58595 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
@@ -38,7 +38,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
index 082deef36ee..67ca0a504bf 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
@@ -30,7 +30,6 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Server_ORBInitializer (CORBA::ULong request_pass_count);
 
@@ -40,10 +39,9 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
-
   /// How much requests to pass thru before forwarding.
   CORBA::ULong request_pass_count_;
 
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 548f1027c09..14472d16d26 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -36,13 +36,13 @@ Server_Request_Interceptor::forward (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   CORBA::release (this->to_);
 }
@@ -69,8 +69,6 @@ Server_Request_Interceptor::receive_request (
       // Throw forward exception
       throw PortableInterceptor::ForwardRequest (this->to_);
     }
-
-  return;
 }
 
 void
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
index 78116481ce8..cdda3618c4e 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
@@ -26,7 +26,6 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Server_Request_Interceptor (CORBA::ULong request_pass_count);
 
@@ -43,9 +42,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -64,7 +63,6 @@ public:
   //@}
 
 private:
-
   /// How much requests to pass thru before forwarding.
   CORBA::ULong request_pass_count_;
 
diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp
index 7328ee29ef7..a2c2c2425fa 100644
--- a/TAO/tests/Collocated_Forwarding/server.cpp
+++ b/TAO/tests/Collocated_Forwarding/server.cpp
@@ -93,8 +93,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-      test_i servant1 (1, direct_collocation, orb.in ());
-      test_i servant2 (2, direct_collocation, orb.in ());
+      test_i servant1 (1, orb.in ());
+      test_i servant2 (2, orb.in ());
 
       PortableServer::ObjectId_var oid1 =
         root_poa->activate_object (&servant1);
diff --git a/TAO/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp
index a2f0451bd10..4ccb5c4e7d0 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.cpp
+++ b/TAO/tests/Collocated_Forwarding/test_i.cpp
@@ -4,10 +4,8 @@
 #include "tao/PortableServer/ForwardRequestC.h"
 
 test_i::test_i (CORBA::Short id,
-                bool direct,
                 CORBA::ORB_ptr orb)
   : id_ (id)
-  , direct_ (direct)
   , orb_ (CORBA::ORB::_duplicate (orb))
   , to_ (CORBA::Object::_nil ())
   , request_pass_count_ (0)
@@ -24,7 +22,7 @@ test_i::forward (CORBA::Object_ptr to,
 }
 
 CORBA::Short
-test_i::collocated_call (void)
+test_i::collocated_call ()
 {
   this->request_count_++;
 
diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h
index 847217953d8..623e3c0b806 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.h
+++ b/TAO/tests/Collocated_Forwarding/test_i.h
@@ -14,10 +14,8 @@
 class test_i : public virtual POA_Collocated_ForwardRequestTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short id,
-          bool direct,
           CORBA::ORB_ptr orb);
 
   /// A way to setup forwarding in case of direct collocation.
@@ -25,16 +23,12 @@ public:
                 CORBA::ULong request_pass_count);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short collocated_call (void);
+  virtual CORBA::Short collocated_call ();
 
 private:
-
   /// Id of this instance.
   CORBA::Short id_;
 
-  /// An indication to throwing forward request exception.
-  bool direct_;
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_NoColl/Client_Task.cpp b/TAO/tests/Collocated_NoColl/Client_Task.cpp
index 990e1564d52..ebd3d169b4a 100644
--- a/TAO/tests/Collocated_NoColl/Client_Task.cpp
+++ b/TAO/tests/Collocated_NoColl/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
 
@@ -55,5 +55,4 @@ Client_Task::svc (void)
     }
 
   return status;
-
 }
diff --git a/TAO/tests/Collocated_NoColl/Client_Task.h b/TAO/tests/Collocated_NoColl/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_NoColl/Client_Task.h
+++ b/TAO/tests/Collocated_NoColl/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_NoColl/Hello.cpp b/TAO/tests/Collocated_NoColl/Hello.cpp
index b0feddd2c8e..c6cfa8478f0 100644
--- a/TAO/tests/Collocated_NoColl/Hello.cpp
+++ b/TAO/tests/Collocated_NoColl/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -63,7 +63,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_NoColl/Hello.h b/TAO/tests/Collocated_NoColl/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_NoColl/Hello.h
+++ b/TAO/tests/Collocated_NoColl/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.cpp b/TAO/tests/Collocated_NoColl/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.cpp
+++ b/TAO/tests/Collocated_NoColl/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.h b/TAO/tests/Collocated_NoColl/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_NoColl/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
index 8199914c81f..46a58aef3af 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   CORBA::Boolean exception = false;
   try
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
index 81c4b023077..659936a8069 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
@@ -3,15 +3,13 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-  Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
+  Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_ERROR ((LM_DEBUG,
               "(%P|%t) ERROR: Upcall in process ..\n"));
@@ -19,7 +17,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h
index 043a6968853..88fd5ffb5b8 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.h
@@ -11,20 +11,17 @@ class Hello
 {
 public:
   /// Constructor
-  Hello (CORBA::ORB_ptr orb,
-         ACE_thread_t thr_id);
+  Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
-
-  ACE_thread_t thr_id_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
index 206b5e564a0..02657c932e1 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
@@ -36,8 +36,7 @@ Server_Task::svc (void)
 
      Hello *hello_impl = 0;
      ACE_NEW_RETURN (hello_impl,
-                     Hello (this->sorb_.in (),
-                            ACE_Thread::self ()),
+                     Hello (this->sorb_.in ()),
                      1);
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
index 8199914c81f..46a58aef3af 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   CORBA::Boolean exception = false;
   try
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
index 81c4b023077..5c55d9562f1 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
@@ -3,15 +3,13 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-  Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
+Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
 {
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_ERROR ((LM_DEBUG,
               "(%P|%t) ERROR: Upcall in process ..\n"));
@@ -19,7 +17,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
index 043a6968853..88fd5ffb5b8 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
@@ -11,20 +11,17 @@ class Hello
 {
 public:
   /// Constructor
-  Hello (CORBA::ORB_ptr orb,
-         ACE_thread_t thr_id);
+  Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
-
-  ACE_thread_t thr_id_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
index 7a26f5fcf0c..4f6c3814cd9 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
@@ -36,8 +36,7 @@ Server_Task::svc (void)
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
-                     Hello (this->sorb_.in (),
-                            ACE_Thread::self ()),
+                     Hello (this->sorb_.in ()),
                      1);
 
      PortableServer::ServantBase_var owner_transfer(hello_impl);
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 9aaf7b50507..ad9ee246c16 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -13,12 +13,12 @@
 
 #include "Collocation_Tester.h"
 
-Collocation_Test::Collocation_Test (void)
+Collocation_Test::Collocation_Test ()
 {
 }
 
 void
-Collocation_Test::shutdown (void)
+Collocation_Test::shutdown ()
 {
   this->root_poa_->destroy (1, 1);
   this->orb_->destroy ();
@@ -73,7 +73,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 
   return 0;
 
-
 }
 
 int
@@ -84,7 +83,7 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (void)
+Collocation_Test::test_narrow ()
 {
   Diamond::Top_var top =
     Diamond::Top::_narrow (this->diamond_obj_.in ());
@@ -114,7 +113,7 @@ Collocation_Test::test_narrow (void)
 }
 
 int
-Collocation_Test::run (void)
+Collocation_Test::run ()
 {
   this->poa_manager_->activate ();
 
diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h
index 0f9650b9d2b..03fcf224538 100644
--- a/TAO/tests/Collocation/Collocation_Tester.h
+++ b/TAO/tests/Collocation/Collocation_Tester.h
@@ -22,9 +22,9 @@
 class Collocation_Test
 {
 public:
-  Collocation_Test (void);
+  Collocation_Test ();
 
-  void shutdown (void);
+  void shutdown ();
 
   /// Initializing the Collocation_Test object.
   int init (int argc, ACE_TCHAR *argv[]);
@@ -34,10 +34,10 @@ public:
 
   /// This test narrow an object reference to its base class and see
   /// if it works correctly.
-  int test_narrow (void);
+  int test_narrow ();
 
   /// Run the test.
-  int run (void);
+  int run ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index b28e1d0fe9c..85b39b1ad54 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -9,7 +9,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (void)
+Top_i::shape ()
 {
   return CORBA::string_dup ("a point.");
 }
@@ -23,13 +23,13 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (void)
+Left_i::shape ()
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
-Left_i::color (void)
+Left_i::color ()
 {
   return CORBA::string_dup ("black");
 }
@@ -43,20 +43,20 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (void)
+Right_i::shape ()
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
-Right_i::color (void)
+Right_i::color ()
 {
   return CORBA::string_dup ("red");
   //
 }
 
 CORBA::Long
-Right_i::width (void)
+Right_i::width ()
 {
   return 0;
 }
@@ -70,25 +70,25 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (void)
+Buttom_i::shape ()
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
-Buttom_i::color (void)
+Buttom_i::color ()
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
-Buttom_i::width (void)
+Buttom_i::width ()
 {
   return 100;
 }
 
 char *
-Buttom_i::name (void)
+Buttom_i::name ()
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 2b81c1c5906..904d2607d22 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Diamond_Export Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 };
 
 class Diamond_Export Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Diamond_Export Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Diamond_Export Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index 97aab729a41..e535dc43946 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -27,7 +27,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -57,7 +57,6 @@ namespace
 class SimpleNamingService_i : public virtual POA_SimpleNamingService
 {
 public:
-
   //FUZZ: disable check_for_lack_ACE_OS
   virtual void bind (CORBA::Object_ptr obj)
   {
@@ -72,9 +71,7 @@ public:
   }
 
 private:
-
   CORBA::Object_var obj_;
-
 };
 
 int
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
index 52ce918d128..b7f91b5c88e 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
@@ -83,7 +83,7 @@ Client_Task::test_user_exception_not_expected (
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -119,5 +119,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h
index 0e094e55f62..836ae7ef879 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h
@@ -15,14 +15,13 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   void test_system_exception (Test::Hello_ptr hello_ptr);
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp
index 5151daaab6f..c9db9959f60 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp
@@ -11,31 +11,31 @@
 }
 
 void
-Hello::system_exception_test (void)
+Hello::system_exception_test ()
 {
   throw CORBA::INTERNAL ();
 }
 
 void
-Hello::user_exception_expected (void)
+Hello::user_exception_expected ()
 {
   throw ::Test::Hello::A ();
 }
 
 void
-Hello::user_exception_not_expected (void)
+Hello::user_exception_not_expected ()
 {
   this->throw_internal_b ();
 }
 
 void
-Hello::throw_internal_b (void)
+Hello::throw_internal_b ()
 {
   throw ::Test::Hello::B ();
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -78,7 +78,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index a75d4d64ea2..913b0708fd4 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -20,18 +20,18 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void system_exception_test (void);
+  virtual void system_exception_test ();
 
-  virtual void user_exception_expected (void);
+  virtual void user_exception_expected ();
 
-  virtual void user_exception_not_expected (void);
+  virtual void user_exception_not_expected ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-  void throw_internal_b (void);
+  void throw_internal_b ();
 
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index ebe3075b8fc..21ba1d3f8e3 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index ecb276fa6cb..f2f97b4513e 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -17,7 +17,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -96,5 +96,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
index accef8a3c76..d67e7a8e46e 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
@@ -14,7 +14,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
 enum ClientSyncModeEnum {
    MODE_NONE,
    MODE_TRANSPORT,
@@ -29,7 +28,7 @@ enum ClientSyncModeEnum {
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index aa0517f8dfd..c40645c4dee 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -11,16 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb,
 }
 
 void
-Hello::onewayTest (void)
+Hello::onewayTest ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) onewayTest() Upcall in process ..\n"));
-  return;
 }
 
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -63,7 +62,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index d2b6221d4d4..bc9e3a23043 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -20,11 +20,11 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void onewayTest (void);
+  virtual void onewayTest ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index 95cb690e576..8324758b0d2 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index b2075321033..06721d060af 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -8,15 +8,14 @@ class test_i :
   public POA_test
 {
 public:
-
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
   void set_other (test_ptr test);
 
-  void method (void);
+  void method ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   CORBA::ORB_var orb_;
 
@@ -48,7 +47,7 @@ test_i::set_other (test_ptr test)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   if (this->other_.in () != test::_nil ())
     {
@@ -83,7 +82,7 @@ test_i::method (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -91,13 +90,11 @@ test_i::_default_POA (void)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (CORBA::ORB_ptr orb)
@@ -106,7 +103,7 @@ Task::Task (CORBA::ORB_ptr orb)
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp
index e99d68887d7..8352825f766 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -46,5 +46,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/tests/Collocation_Tests/Client_Task.h b/TAO/tests/Collocation_Tests/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Tests/Client_Task.h
@@ -14,20 +14,18 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp
index 6def44732c1..93b81632258 100644
--- a/TAO/tests/Collocation_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Tests/Hello.cpp
@@ -11,7 +11,7 @@
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -54,7 +54,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -15,9 +15,9 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp
index 085f655f79e..5cd3756b4dd 100644
--- a/TAO/tests/Compression/RLECompressorTest.cpp
+++ b/TAO/tests/Compression/RLECompressorTest.cpp
@@ -173,7 +173,7 @@ struct HRTimer : ACE_High_Res_Timer
     HRTimer(const ACE_TCHAR* msg) : msg_(msg) {
         this->reset(); this->start();
     }
-    ~HRTimer(void) {
+    ~HRTimer() {
         this->stop(); this->print_ave(this->msg_, 1);
     }
 };
@@ -181,7 +181,6 @@ struct HRTimer : ACE_High_Res_Timer
 static int init_compressor(::CORBA::ORB_ptr orb)
 {
     try {
-
         ::CORBA::Object_var compression_manager =
             orb->resolve_initial_references(TAO_OBJID_COMPRESSIONMANAGER);
 
@@ -197,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);
@@ -296,7 +294,6 @@ static int  testArray_compressor(const ::Compression::Compressor_var &compressor
     ACE_HEX_DUMP((LM_INFO, comp_data, (sizeof(comp_data) - 1), ACE_TEXT("Compression Data")));
 
     for (unsigned i = 0; i < sizeof(comp_data); i++) {
-
         COMP_RESULT &result = comp_result[i]; // Get A reference to our result for testing output
 
         Compression::Buffer in_data(i, i, reinterpret_cast<CORBA::Octet*>(comp_data), false), &out_data = result.out;
@@ -526,7 +523,6 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
     try {
-
         ::CORBA::ORB_var orb = ::CORBA::ORB_init(argc, argv);
 
         if (init_compressor(orb.in ()) != 0) {
@@ -571,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/Compression/run_test.pl b/TAO/tests/Compression/run_test.pl
index 9106be41dbf..a55ed826a07 100755
--- a/TAO/tests/Compression/run_test.pl
+++ b/TAO/tests/Compression/run_test.pl
@@ -13,8 +13,7 @@ my @tests = qw(
                zlibserver
                bzip2server
                lzoserver
-               rleserver
-              );
+               rleserver);
 
 foreach my $process (@tests) {
 
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.cpp
+++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Crash_On_Write/Crash_Task.cpp b/TAO/tests/Crash_On_Write/Crash_Task.cpp
index fea99bbb218..a08c78c65f5 100644
--- a/TAO/tests/Crash_On_Write/Crash_Task.cpp
+++ b/TAO/tests/Crash_On_Write/Crash_Task.cpp
@@ -10,7 +10,7 @@ Crash_Task::Crash_Task (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Crash_Task::svc (void)
+Crash_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting crash task\n"));
   ACE_OS::sleep (this->running_time_);
diff --git a/TAO/tests/Crash_On_Write/Crash_Task.h b/TAO/tests/Crash_On_Write/Crash_Task.h
index b4d9a7b63b4..c9e4516629e 100644
--- a/TAO/tests/Crash_On_Write/Crash_Task.h
+++ b/TAO/tests/Crash_On_Write/Crash_Task.h
@@ -18,7 +18,7 @@ public:
               const ACE_Time_Value &running_time);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Total running time for each thread
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
index e3610f5b633..08ec34b03c2 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -1,10 +1,10 @@
 #include "Oneway_Receiver.h"
 
-Oneway_Receiver::Oneway_Receiver (void)
+Oneway_Receiver::Oneway_Receiver ()
 {
 }
 
 void
-Oneway_Receiver::receive_oneway (void)
+Oneway_Receiver::receive_oneway ()
 {
 }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index 1e28f29784d..a19c77fe6b5 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
@@ -11,10 +11,10 @@ class Oneway_Receiver
 {
 public:
   /// Constructor
-  Oneway_Receiver (void);
+  Oneway_Receiver ();
 
   // = The skeleton methods
-  virtual void receive_oneway (void);
+  virtual void receive_oneway ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crash_On_Write/run_test.pl b/TAO/tests/Crash_On_Write/run_test.pl
index 86384663bc1..b72ebdd495d 100755
--- a/TAO/tests/Crash_On_Write/run_test.pl
+++ b/TAO/tests/Crash_On_Write/run_test.pl
@@ -63,7 +63,7 @@ if ($client_status != 0) {
 
 # The server crashes, therefore it normally exists with status != 0,
 # but a status of -1 would be a serious error.
-$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 50);
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 50, {self_crash => 1});
 
 if ($server_status == -1) {
     print STDERR "ERROR: server returned $server_status\n";
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index b76d85f7670..cb57d3ddcaf 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -1,17 +1,17 @@
 #include "Crashed_Callback.h"
 
-Crashed_Callback::Crashed_Callback (void)
+Crashed_Callback::Crashed_Callback ()
 {
 }
 
 CORBA::Boolean
-Crashed_Callback::are_you_there (void)
+Crashed_Callback::are_you_there ()
 {
   return 1;
 }
 
 void
-Crashed_Callback::crash_now_please (void)
+Crashed_Callback::crash_now_please ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application\n"));
@@ -26,6 +26,6 @@ Crashed_Callback::crash_now_please (void)
 }
 
 void
-Crashed_Callback::test_oneway (void)
+Crashed_Callback::test_oneway ()
 {
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index a6bd7ccc13f..0ba82c82b3b 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -11,14 +11,14 @@ class Crashed_Callback
 {
 public:
   /// Constructor
-  Crashed_Callback (void);
+  Crashed_Callback ();
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (void);
+  virtual CORBA::Boolean are_you_there ();
 
-  virtual void crash_now_please (void);
+  virtual void crash_now_please ();
 
-  virtual void test_oneway (void);
+  virtual void test_oneway ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index 697eddf636e..e798b7e1588 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -1,13 +1,13 @@
 #include "Service.h"
 
-Service::Service (void)
+Service::Service ()
   : orb_ (CORBA::ORB::_nil ()),
     test_count_ (0)
 {
 }
 
 void
-Service::dump_results (void)
+Service::dump_results ()
 {
   if (this->test_count_ == 0)
     {
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index 709dfb318db..9d3e4f4ffa3 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -11,13 +11,13 @@ class Service
 {
 public:
   /// Constructor
-  Service (void);
+  Service ();
 
   /// Dump the results.
   /**
    * In case of failure this exposes any incomplete runs.
    */
-  void dump_results (void);
+  void dump_results ();
 
   // = The skeleton methods
   virtual void run_test (Test::Crashed_Callback_ptr callback);
@@ -40,7 +40,6 @@ private:
 private:
   /// Count the number of tests executed
   int test_count_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crashed_Callback/run_test.pl b/TAO/tests/Crashed_Callback/run_test.pl
index 5f9d993a82d..1abc799918d 100755
--- a/TAO/tests/Crashed_Callback/run_test.pl
+++ b/TAO/tests/Crashed_Callback/run_test.pl
@@ -53,7 +53,7 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45, {self_crash => 1});
 
 # The client crashes, therefore it normally exists with status != 0,
 # but a status of -1 would be a serious error.
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
index a7ec401629a..467676c1830 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
@@ -118,6 +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_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp
index 7aa615369e8..a63a9402ebd 100644
--- a/TAO/tests/DII_AMI_Forward/client.cpp
+++ b/TAO/tests/DII_AMI_Forward/client.cpp
@@ -54,7 +54,6 @@ do_primary_test (CORBA::Object_var &server,
 {
   try
     {
-
       CORBA::Request_var req = server->_request("do_forward");
 
       if (CORBA::is_nil (server.in ()))
diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
index 345f983b3a0..8a4ec18a430 100644
--- a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
+++ b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
@@ -3,7 +3,7 @@
 #include "orb_initializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
@@ -30,7 +30,7 @@ Server_ORBInitializer::post_init (
 }
 
 ForwardTest_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.h b/TAO/tests/DII_AMI_Forward/orb_initializer.h
index 0e2986a0a93..acd48c9048a 100644
--- a/TAO/tests/DII_AMI_Forward/orb_initializer.h
+++ b/TAO/tests/DII_AMI_Forward/orb_initializer.h
@@ -28,7 +28,7 @@ class Server_ORBInitializer
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -36,7 +36,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  ForwardTest_Request_Interceptor * server_interceptor (void);
+  ForwardTest_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
index 5a6df2d5af6..e231f671307 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Thread.h"
 
-ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (void)
+ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor ()
   : myname_ ("ForwardTest_Interceptor"),
     forward_location_ (CORBA::Object::_nil ()),
     forward_location_done_ (false)
@@ -19,7 +19,7 @@ ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (CORBA::Object_
 {
 }
 
-ForwardTest_Request_Interceptor::~ForwardTest_Request_Interceptor (void)
+ForwardTest_Request_Interceptor::~ForwardTest_Request_Interceptor ()
 {
 }
 
@@ -36,13 +36,13 @@ ForwardTest_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 }
 
 char *
-ForwardTest_Request_Interceptor::name (void)
+ForwardTest_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-ForwardTest_Request_Interceptor::destroy (void)
+ForwardTest_Request_Interceptor::destroy ()
 {
 }
 
@@ -103,7 +103,6 @@ void
 ForwardTest_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   // This will throw an exception if a location forward has not
   // occurred.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.h b/TAO/tests/DII_AMI_Forward/server_interceptor.h
index a5496d72271..d862fcabdbf 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.h
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.h
@@ -21,7 +21,7 @@ class ForwardTest_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  ForwardTest_Request_Interceptor (void);
+  ForwardTest_Request_Interceptor ();
   // cotr.
 
   ForwardTest_Request_Interceptor (CORBA::Object_ptr forward_location);
@@ -31,10 +31,10 @@ public:
 
   void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/DII_AMI_Forward/test_i.cpp b/TAO/tests/DII_AMI_Forward/test_i.cpp
index 9707a29653a..a02abdb44d6 100644
--- a/TAO/tests/DII_AMI_Forward/test_i.cpp
+++ b/TAO/tests/DII_AMI_Forward/test_i.cpp
@@ -18,6 +18,6 @@ char * Forward_Test_i::do_forward (const char *text)
 void
 Forward_Test_i::shutdown ()
 {
-  ACE_OS::sleep( 2 );
+  ACE_OS::sleep(2);
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index ca5c1aa295a..71bbf2b35ee 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -25,7 +25,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -203,8 +203,6 @@ Client_Task::svc (void)
       req = obj->_request ("shutdown");
 
       req->send_oneway ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -220,7 +218,6 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
 
 CORBA::ULong
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
index cb4e4fdb7e6..130bb198807 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
@@ -14,7 +14,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                const ACE_TCHAR *simple_test_ior,
@@ -22,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index 628c447dbe2..4d4d797c70f 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND;
 }
 
 // Implementation skeleton constructor
-Test_Simple_Test_i::Test_Simple_Test_i (void)
+Test_Simple_Test_i::Test_Simple_Test_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Simple_Test_i::~Test_Simple_Test_i (void)
+Test_Simple_Test_i::~Test_Simple_Test_i ()
 {
 }
 
@@ -269,7 +269,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -324,7 +324,7 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
@@ -339,4 +339,3 @@ CORBA::ULong Hello::error_count () const
 }
 
 
-
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 8fc53671693..6114cf258d2 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -10,15 +10,13 @@ class  Test_Simple_Test_i
 {
 public:
   //Constructor
-  Test_Simple_Test_i (void);
+  Test_Simple_Test_i ();
 
   //Destructor
-  virtual ~Test_Simple_Test_i (void);
+  virtual ~Test_Simple_Test_i ();
 
   virtual
-  void test_method (
-      ::CORBA::ULong & error_count
-    );
+  void test_method (::CORBA::ULong & error_count);
 };
 
 /// Implement the Test::Hello interface
@@ -32,92 +30,66 @@ public:
 
   // = The skeleton methods
   virtual
-  void test_basic_arg (
-      ::CORBA::Long basic
-    );
+  void test_basic_arg (::CORBA::Long basic);
 
   virtual
-  void test_unbounded_string_arg (
-      const char * message
-    );
+  void test_unbounded_string_arg (const char * message);
 
   virtual
-  void test_bounded_string_arg (
-      const char * message
-    );
+  void test_bounded_string_arg (const char * message);
 
   virtual
-  void test_fixed_array_arg (
-      const ::Test::Fixed_Array message
-    );
+  void test_fixed_array_arg (const ::Test::Fixed_Array message);
 
   virtual
-  void test_var_array_arg (
-      const ::Test::Var_Array messages
-    );
+  void test_var_array_arg (const ::Test::Var_Array messages);
 
   virtual
-  void test_bounded_var_size_arg (
-      const ::Test::Bounded_Var_Size_Arg & message
-    );
+  void test_bounded_var_size_arg (const ::Test::Bounded_Var_Size_Arg & message);
 
   virtual
-  void test_unbounded_var_size_arg (
-      const ::Test::Unbounded_Var_Size_Arg & message
-    );
+  void test_unbounded_var_size_arg (const ::Test::Unbounded_Var_Size_Arg & message);
 
   virtual
-  void test_fixed_size_arg (
-      const ::Test::TimeOfDay & t
-    );
+  void test_fixed_size_arg (const ::Test::TimeOfDay & t);
 
   virtual
-  void test_special_basic_arg (
-      ::CORBA::Char value
-    );
+  void test_special_basic_arg (::CORBA::Char value);
 
   virtual
-  void test_objref_arg (
-      ::Test::Simple_Test_ptr test
-    );
+  void test_objref_arg (::Test::Simple_Test_ptr test);
 
   virtual
-  void test_object_arg (
-      ::CORBA::Object_ptr o
-    );
+  void test_object_arg (::CORBA::Object_ptr o);
 
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
-      ::Test::Simple_Test_ptr arg3
-    );
+      ::Test::Simple_Test_ptr arg3);
 
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
-      const ::Test::TimeOfDay & arg3
-    );
+      const ::Test::TimeOfDay & arg3);
 
   virtual
   void test_args_3 (
       const char * arg1,
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
-      const ::Test::Var_Array arg4
-    );
+      const ::Test::Var_Array arg4);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
   virtual
   char * test_unbounded_string (
       const char * s1,
       char *& s2,
-      CORBA::String_out s3
-    );
+      CORBA::String_out s3);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 8c44fd06667..31d7959a269 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -19,7 +19,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
index 6e6d7085452..fde0740eebe 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
@@ -28,7 +28,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index 1459ceae8b7..ab574712e41 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -26,7 +26,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -61,7 +61,7 @@ Client_Task::svc (void)
       req->invoke ();
       if (req->response_received ())
       {
-        for (CORBA::ULong count=0; count<req->arguments ()->count () ;++count)
+        for (CORBA::ULong count=0; count<req->arguments ()->count (); ++count)
         {
             CORBA::NamedValue_ptr arg = req->arguments ()->item (count);
             if (ACE_OS::strcmp (arg->name (), "x") == 0)
@@ -109,7 +109,7 @@ Client_Task::svc (void)
       req->invoke ();
       if (req->response_received ())
       {
-        for (CORBA::ULong count=0; count<req->arguments ()->count () ;++count)
+        for (CORBA::ULong count=0; count<req->arguments ()->count (); ++count)
         {
             CORBA::NamedValue_ptr arg = req->arguments ()->item (count);
             if (ACE_OS::strcmp (arg->name (), "x") == 0)
@@ -275,8 +275,6 @@ Client_Task::svc (void)
       req = obj->_request ("shutdown");
 
       req->send_oneway ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -292,7 +290,6 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
 
 CORBA::ULong
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
index cb4e4fdb7e6..130bb198807 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
@@ -14,7 +14,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                const ACE_TCHAR *simple_test_ior,
@@ -22,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index 7d1ea2c57a1..9f8445cd6b7 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND;
 }
 
 // Implementation skeleton constructor
-Test_Simple_Test_i::Test_Simple_Test_i (void)
+Test_Simple_Test_i::Test_Simple_Test_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Simple_Test_i::~Test_Simple_Test_i (void)
+Test_Simple_Test_i::~Test_Simple_Test_i ()
 {
 }
 
@@ -286,7 +286,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -341,7 +341,7 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
@@ -356,4 +356,3 @@ CORBA::ULong Hello::error_count () const
 }
 
 
-
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index 4050797f772..4d110ce65f4 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -10,15 +10,13 @@ class  Test_Simple_Test_i
 {
 public:
   //Constructor
-  Test_Simple_Test_i (void);
+  Test_Simple_Test_i ();
 
   //Destructor
-  virtual ~Test_Simple_Test_i (void);
+  virtual ~Test_Simple_Test_i ();
 
   virtual
-  void test_method (
-      ::CORBA::ULong & error_count
-    );
+  void test_method (::CORBA::ULong & error_count);
 };
 
 /// Implement the Test::Hello interface
@@ -34,97 +32,76 @@ public:
   virtual
   void test_basic_arg (
       ::CORBA::Long basic,
-      ::CORBA::Long_out x
-    );
+      ::CORBA::Long_out x);
 
   virtual
-  void test_unbounded_string_arg (
-      const char * message
-    );
+  void test_unbounded_string_arg (const char * message);
 
   virtual
   void test_unbounded_string_arg_out (
       const char * message,
-      ::CORBA::String_out out_message
-    );
+      ::CORBA::String_out out_message);
 
   virtual
   void test_bounded_string_arg (
-      const char * message
-    );
+      const char * message);
 
   virtual
   void test_fixed_array_arg (
-      const ::Test::Fixed_Array message
-    );
+      const ::Test::Fixed_Array message);
 
   virtual
   void test_var_array_arg (
-      const ::Test::Var_Array messages
-    );
+      const ::Test::Var_Array messages);
 
   virtual
   void test_bounded_var_size_arg (
-      const ::Test::Bounded_Var_Size_Arg & message
-    );
+      const ::Test::Bounded_Var_Size_Arg & message);
 
   virtual
   void test_unbounded_var_size_arg (
-      const ::Test::Unbounded_Var_Size_Arg & message
-    );
+      const ::Test::Unbounded_Var_Size_Arg & message);
 
   virtual
-  void test_fixed_size_arg (
-      const ::Test::TimeOfDay & t
-    );
+  void test_fixed_size_arg (const ::Test::TimeOfDay & t);
 
   virtual
-  void test_special_basic_arg (
-      ::CORBA::Char value
-    );
+  void test_special_basic_arg (::CORBA::Char value);
 
   virtual
-  void test_objref_arg (
-      ::Test::Simple_Test_ptr test
-    );
+  void test_objref_arg (::Test::Simple_Test_ptr test);
 
   virtual
-  void test_object_arg (
-      ::CORBA::Object_ptr o
-    );
+  void test_object_arg (::CORBA::Object_ptr o);
 
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
-      ::Test::Simple_Test_ptr arg3
-    );
+      ::Test::Simple_Test_ptr arg3);
 
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
-      const ::Test::TimeOfDay & arg3
-    );
+      const ::Test::TimeOfDay & arg3);
 
   virtual
   void test_args_3 (
       const char * arg1,
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
-      const ::Test::Var_Array arg4
-    );
+      const ::Test::Var_Array arg4);
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
   virtual
   char * test_unbounded_string (
       const char * s1,
       char *& s2,
-      CORBA::String_out s3
-    );
+      CORBA::String_out s3);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index 2f8dd3327cb..cc42498052c 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
index 690c31bb2a7..4f2b3c9adf4 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
@@ -25,7 +25,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   CORBA::ULong error_count () const;
 
diff --git a/TAO/tests/DII_Deferred_Transient/Hello.cpp b/TAO/tests/DII_Deferred_Transient/Hello.cpp
index 6d8aab734a4..a1953eae236 100644
--- a/TAO/tests/DII_Deferred_Transient/Hello.cpp
+++ b/TAO/tests/DII_Deferred_Transient/Hello.cpp
@@ -2,10 +2,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_unistd.h"
 
-Hello::Hello ()
-{
-}
-
 void
 Hello::crash ()
 {
diff --git a/TAO/tests/DII_Deferred_Transient/Hello.h b/TAO/tests/DII_Deferred_Transient/Hello.h
index 107adfda369..f077932c191 100644
--- a/TAO/tests/DII_Deferred_Transient/Hello.h
+++ b/TAO/tests/DII_Deferred_Transient/Hello.h
@@ -11,7 +11,7 @@ class Hello
 {
 public:
   /// Constructor
-  Hello ();
+  Hello () = default;
 
   // = The skeleton methods
   void crash () override;
diff --git a/TAO/tests/DII_Deferred_Transient/run_test.pl b/TAO/tests/DII_Deferred_Transient/run_test.pl
index 0937403bd21..fb4520a485e 100755
--- a/TAO/tests/DII_Deferred_Transient/run_test.pl
+++ b/TAO/tests/DII_Deferred_Transient/run_test.pl
@@ -59,7 +59,7 @@ if ($client_status != 0) {
     $status = 1;
 }
 
-$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval(), {self_crash => 1});
 
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
diff --git a/TAO/tests/DII_Discard_Deferred/Hello.cpp b/TAO/tests/DII_Discard_Deferred/Hello.cpp
index a2c5103edc3..81c558f5180 100644
--- a/TAO/tests/DII_Discard_Deferred/Hello.cpp
+++ b/TAO/tests/DII_Discard_Deferred/Hello.cpp
@@ -8,7 +8,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Hello::get_string called\n"));
   ACE_OS::sleep (2);
@@ -17,7 +17,7 @@ Hello::get_string (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/DII_Discard_Deferred/Hello.h b/TAO/tests/DII_Discard_Deferred/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/DII_Discard_Deferred/Hello.h
+++ b/TAO/tests/DII_Discard_Deferred/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp
index ec477c40297..b1bf9cc85ff 100644
--- a/TAO/tests/DIOP/UDP_Client_i.cpp
+++ b/TAO/tests/DIOP/UDP_Client_i.cpp
@@ -16,17 +16,16 @@ UDP_Client_i::UDP_Client_i (CORBA::ORB_ptr orb,
 , delay_ (msec)
 , iterations_ (iterations)
 {
-
 }
 
 //Destructor.
-UDP_Client_i::~UDP_Client_i (void)
+UDP_Client_i::~UDP_Client_i ()
 {
   //no-op
 }
 
 int
-UDP_Client_i::svc (void)
+UDP_Client_i::svc ()
 {
   ACE_CString client_name ("UDP");
 
@@ -70,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/DIOP/UDP_Client_i.h b/TAO/tests/DIOP/UDP_Client_i.h
index f7c8261fc7c..80b8800577b 100644
--- a/TAO/tests/DIOP/UDP_Client_i.h
+++ b/TAO/tests/DIOP/UDP_Client_i.h
@@ -37,7 +37,7 @@ public:
                 ACE_UINT32 iterations);
 
   /// Destructor
-  virtual ~UDP_Client_i (void);
+  virtual ~UDP_Client_i ();
 
 private:
   // Runs in a separate thread.
diff --git a/TAO/tests/DIOP/UDP_i.cpp b/TAO/tests/DIOP/UDP_i.cpp
index bf8106c29e9..dd8e91c847b 100644
--- a/TAO/tests/DIOP/UDP_i.cpp
+++ b/TAO/tests/DIOP/UDP_i.cpp
@@ -7,7 +7,7 @@ UDP_i::UDP_i (CORBA::ORB_ptr o) :
 }
 
 // Destructor
-UDP_i::~UDP_i (void)
+UDP_i::~UDP_i ()
 {
 }
 
@@ -56,7 +56,7 @@ UDP_i::invoke (const char * client_name,
 // Shutdown.
 
 void
-UDP_i::shutdown (void)
+UDP_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "UDP_i is shutting down\n"));
diff --git a/TAO/tests/DIOP/UDP_i.h b/TAO/tests/DIOP/UDP_i.h
index 110e4385d63..c0becf8bff0 100644
--- a/TAO/tests/DIOP/UDP_i.h
+++ b/TAO/tests/DIOP/UDP_i.h
@@ -37,14 +37,14 @@ public:
   UDP_i (CORBA::ORB_ptr o);
 
   /// Destructor
-  ~UDP_i (void);
+  ~UDP_i ();
 
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
                        CORBA::Long request_id);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// ORB pointer.
diff --git a/TAO/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp
index e1ba8b5ff02..ed556905685 100644
--- a/TAO/tests/DIOP/server.cpp
+++ b/TAO/tests/DIOP/server.cpp
@@ -10,7 +10,6 @@
 //=============================================================================
 
 
-
 #include "UDP_i.h"
 
 #include "tao/debug.h"
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 8d54d570503..4fbd18caa77 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -127,7 +127,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Test_Client_Module::fini (void)
+Test_Client_Module::fini ()
 {
   ACE_DEBUG ((LM_INFO,
               "Client is being finalized.\n"));
@@ -147,7 +147,7 @@ Test_Client_Module::fini (void)
 }
 
 int
-Test_Client_Module::svc (void)
+Test_Client_Module::svc ()
 {
   try
     {
@@ -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/DLL_ORB/Test_Client_Module.h b/TAO/tests/DLL_ORB/Test_Client_Module.h
index d2757f8128e..dd3b144c3b5 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.h
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.h
@@ -36,7 +36,6 @@
 class Test_Client_Module_Export Test_Client_Module : public ACE_Task_Base
 {
 public:
-
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -47,13 +46,11 @@ public:
   virtual int svc ();
 
 private:
-
   /// Reference to the ORB.
   CORBA::ORB_var orb_;
 
   /// Reference to the test object.
   Test_var test_;
-
 };
 
 ACE_FACTORY_DECLARE (Test_Client_Module, Test_Client_Module)
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 260efda2744..5e5b1e1fb47 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Test_Server_Module::~Test_Server_Module (void)
+Test_Server_Module::~Test_Server_Module ()
 {
 }
 
@@ -157,7 +157,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Test_Server_Module::fini (void)
+Test_Server_Module::fini ()
 {
   ACE_DEBUG ((LM_INFO,
               "Server is being finalized.\n"));
@@ -177,7 +177,7 @@ Test_Server_Module::fini (void)
 }
 
 int
-Test_Server_Module::svc (void)
+Test_Server_Module::svc ()
 {
   try
     {
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h
index a741049c4ad..c2011ba6c46 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.h
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.h
@@ -36,7 +36,6 @@
 class Test_Server_Module_Export Test_Server_Module : public ACE_Task_Base
 {
 public:
-
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -46,10 +45,9 @@ public:
   /// Run by a daemon thread to handle deferred processing.
   virtual int svc ();
 
-  virtual ~Test_Server_Module (void);
+  virtual ~Test_Server_Module ();
 
 private:
-
   /// Reference to the ORB.
   CORBA::ORB_var orb_;
 
@@ -61,7 +59,6 @@ private:
 
   /// The servant that implements the "Test" object.
   Test_i servant_;
-
 };
 
 ACE_FACTORY_DECLARE (Test_Server_Module, Test_Server_Module)
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index 8f808922e71..61653edb87d 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -1,20 +1,20 @@
 // -*- C++ -*-
 #include "Test_i.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
   : orb_ ()
 {
 }
 
 void
-Test_i::invoke_me ( /* */)
+Test_i::invoke_me ()
 {
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Test method invoked.\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h
index ba47c75c875..f6a20b953ee 100644
--- a/TAO/tests/DLL_ORB/Test_i.h
+++ b/TAO/tests/DLL_ORB/Test_i.h
@@ -26,26 +26,23 @@
 class Test_i : public virtual POA_Test
 {
 public:
-
   /// Constructor.
-  Test_i (void);
+  Test_i ();
 
   /// Simple two-way operation used to excercise the ORB transport
   /// internals.
-  virtual void invoke_me (void);
+  virtual void invoke_me ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB to be shutdown by the shutdown() method in this
   /// class.
   void orb (CORBA::ORB_ptr orb);
 
 private:
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp
index 37b51cccd96..7af41133463 100644
--- a/TAO/tests/DLL_ORB/client.cpp
+++ b/TAO/tests/DLL_ORB/client.cpp
@@ -32,7 +32,6 @@ ACE_TMAIN(int, ACE_TCHAR *[])
           "_make_Test_Client_Module",
           "-k file://test.ior")) != 0)
     {
-
       ACE_ERROR_RETURN ((LM_ERROR,
                          "%p\n",
                          "ERROR: Client unable to process the "
diff --git a/TAO/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp
index 74f23dad92b..a1961296db0 100644
--- a/TAO/tests/DSI_AMH/client.cpp
+++ b/TAO/tests/DSI_AMH/client.cpp
@@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
index fa74efaad3d..5e56a562068 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
@@ -77,5 +77,4 @@ My_DII_Reply_Handler::handle_excep (TAO_InputCDR &incoming,
 
   ACE_DEBUG((LM_DEBUG, "calling My_DII_Reply_Handler::handle_excep()\n"));
   this->response_handler_->gateway_exception_reply (reply_status, incoming);
-
 }
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
index 134dafde1e0..11a75754d40 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
@@ -11,7 +11,7 @@ class My_DII_Reply_Handler : public virtual TAO_DII_Reply_Handler,
 public:
   My_DII_Reply_Handler (TAO_AMH_DSI_Response_Handler_ptr rph,
                         CORBA::ORB_var orb);
-  virtual ~My_DII_Reply_Handler (void);
+  virtual ~My_DII_Reply_Handler ();
 
   // Callback method for deferred synchronous requests.
   virtual void handle_response (TAO_InputCDR &incoming);
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
index 225b4a3475e..c678877fd6f 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -130,7 +130,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (void)
+DSI_Simple_Server::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.h b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
index e1bab6f3184..957e09e5e6b 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
@@ -50,7 +50,7 @@ public:
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
index b2a50ab519d..b8493c6cc96 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
@@ -33,25 +33,25 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (void)
+Simple_Server_i::raise_user_exception ()
 {
   throw test_exception (33, "reactor meltdown", "kaput");
 }
 
 void
-Simple_Server_i::raise_system_exception (void)
+Simple_Server_i::raise_system_exception ()
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-Simple_Server_i::test_val (void)
+Simple_Server_i::test_val ()
 {
   return vlong_;
 }
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.h b/TAO/tests/DSI_AMI_Gateway/test_i.h
index 08fb539dde6..7c38878d778 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.h
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.h
@@ -32,15 +32,15 @@ public:
                            Structure_out the_out_structure,
                            char *&name);
 
-   CORBA::Long test_val (void);
+   CORBA::Long test_val ();
 
    void test_val (CORBA::Long test_val);
 
-  void raise_user_exception (void);
+  void raise_user_exception ();
 
-  void raise_system_exception (void);
+  void raise_system_exception ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   // The ORB
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index 379110de503..d008b54fac9 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -62,7 +62,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (void)
+DSI_Simple_Server::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index 62e13ed5b10..75f89b17ed7 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -36,11 +36,9 @@ public:
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-    );
+      PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index b2a50ab519d..b8493c6cc96 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -33,25 +33,25 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (void)
+Simple_Server_i::raise_user_exception ()
 {
   throw test_exception (33, "reactor meltdown", "kaput");
 }
 
 void
-Simple_Server_i::raise_system_exception (void)
+Simple_Server_i::raise_system_exception ()
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 CORBA::Long
-Simple_Server_i::test_val (void)
+Simple_Server_i::test_val ()
 {
   return vlong_;
 }
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 08fb539dde6..7c38878d778 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -32,15 +32,15 @@ public:
                            Structure_out the_out_structure,
                            char *&name);
 
-   CORBA::Long test_val (void);
+   CORBA::Long test_val ();
 
    void test_val (CORBA::Long test_val);
 
-  void raise_user_exception (void);
+  void raise_user_exception ();
 
-  void raise_system_exception (void);
+  void raise_system_exception ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   // The ORB
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index 53e4301c8b6..a42c51ca2d6 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -61,10 +61,10 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -77,14 +77,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test_i::test_method\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index 2b8ea7c7774..6fdec95c44f 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -17,7 +17,7 @@
 #include "tao/DynamicAny/DynAnyFactory.h"
 
 #define CASEE(type,CT,str) case CORBA::tk_##type: {\
-  CORBA::CT b = da->get_##type() ; \
+  CORBA::CT b = da->get_##type(); \
   tab (level_); \
   if (debug_) \
     ACE_DEBUG ((LM_DEBUG, str , b)); \
@@ -68,11 +68,11 @@ void DynAnyAnalyzer::tab (int t)
     }
 }
 
-DynAnyAnalyzer::~DynAnyAnalyzer (void)
+DynAnyAnalyzer::~DynAnyAnalyzer ()
 {
 }
 
-void DynAnyAnalyzer::resetTab (void)
+void DynAnyAnalyzer::resetTab ()
 {
   level_ = 0;
 }
diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h
index 619380af541..7da71ab4f6a 100644
--- a/TAO/tests/DynAny_Test/analyzer.h
+++ b/TAO/tests/DynAny_Test/analyzer.h
@@ -27,9 +27,9 @@ public:
 
   void tab (int t);
 
-  ~DynAnyAnalyzer (void);
+  ~DynAnyAnalyzer ();
 
-  void resetTab (void);
+  void resetTab ();
 
   void analyze (DynamicAny::DynAny_ptr da);
 
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index fb680eab82a..4aae2c73161 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -98,7 +98,7 @@ Data::Data (CORBA::ORB_var orb)
     }
 }
 
-Data::~Data (void)
+Data::~Data ()
 {
   CORBA::string_free (m_string1);
   CORBA::string_free (m_string2);
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index 164ba8df20a..e488d233e46 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -18,7 +18,7 @@ class Data
 {
 public:
   Data (CORBA::ORB_var orb);
-  ~Data (void);
+  ~Data ();
 
   CORBA::Boolean        m_bool1,      m_bool2;
   CORBA::Octet          m_octet1,     m_octet2;
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 22f195a7961..c08e10e82bb 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -57,14 +57,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 
 // constructor
-Driver::Driver (void)
+Driver::Driver ()
   : test_type_ (NO_TEST),
     debug_ (0)
 {
 }
 
 // destructor
-Driver::~Driver (void)
+Driver::~Driver ()
 {
   if (this->orb_.in () != 0)
     {
@@ -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)
     {
@@ -159,7 +158,7 @@ Driver::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Driver::run (void)
+Driver::run ()
 {
   int error_count = 0;
 
diff --git a/TAO/tests/DynAny_Test/driver.h b/TAO/tests/DynAny_Test/driver.h
index 1ca55131df9..f337213da6a 100644
--- a/TAO/tests/DynAny_Test/driver.h
+++ b/TAO/tests/DynAny_Test/driver.h
@@ -19,8 +19,8 @@ class Driver
 {
 public:
   // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
+  Driver ();
+  ~Driver ();
 
 enum TEST_TYPE
   {
@@ -43,7 +43,7 @@ enum TEST_TYPE
   /**
    * @return The number of errors detected
    */
-  int run (void);
+  int run ();
 
 private:
   /// underlying ORB (we do not own it)
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 53128689442..4bed14fab5b 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -24,7 +24,7 @@ Test_DynAny::Test_DynAny (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynAny::~Test_DynAny (void)
+Test_DynAny::~Test_DynAny ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -37,7 +37,7 @@ Test_DynAny::test_name () const
 }
 
 int
-Test_DynAny::run_test (void)
+Test_DynAny::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynany.h b/TAO/tests/DynAny_Test/test_dynany.h
index c04e394ed54..c19d5caca98 100644
--- a/TAO/tests/DynAny_Test/test_dynany.h
+++ b/TAO/tests/DynAny_Test/test_dynany.h
@@ -19,11 +19,11 @@ class Test_DynAny
 {
 public:
   Test_DynAny (CORBA::ORB_var orb, int debug);
-  ~Test_DynAny (void);
+  ~Test_DynAny ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 18a43659558..57b5ccb71e8 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -23,7 +23,7 @@ Test_DynArray::Test_DynArray (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynArray::~Test_DynArray (void)
+Test_DynArray::~Test_DynArray ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -36,7 +36,7 @@ Test_DynArray::test_name () const
 }
 
 int
-Test_DynArray::run_test (void)
+Test_DynArray::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h
index 50367b2a930..fb5b35fc827 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.h
+++ b/TAO/tests/DynAny_Test/test_dynarray.h
@@ -18,11 +18,11 @@ class Test_DynArray
 {
 public:
   Test_DynArray (CORBA::ORB_var orb, int debug);
-  ~Test_DynArray (void);
+  ~Test_DynArray ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 9980259db9b..a3878393399 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -24,7 +24,7 @@ Test_DynEnum::Test_DynEnum (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynEnum::~Test_DynEnum (void)
+Test_DynEnum::~Test_DynEnum ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -37,7 +37,7 @@ Test_DynEnum::test_name () const
 }
 
 int
-Test_DynEnum::run_test (void)
+Test_DynEnum::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynenum.h b/TAO/tests/DynAny_Test/test_dynenum.h
index e6714028824..a4e671991cd 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.h
+++ b/TAO/tests/DynAny_Test/test_dynenum.h
@@ -18,11 +18,11 @@ class Test_DynEnum
 {
 public:
   Test_DynEnum (CORBA::ORB_var orb, int debug);
-  ~Test_DynEnum (void);
+  ~Test_DynEnum ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 441ded57aca..04a4ca1b963 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -18,7 +18,6 @@
 
 namespace
 {
-
 bool
 compare_string_sequence_elements(
     CORBA::ULong i,
@@ -54,7 +53,7 @@ Test_DynSequence::Test_DynSequence (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynSequence::~Test_DynSequence (void)
+Test_DynSequence::~Test_DynSequence ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -67,7 +66,7 @@ Test_DynSequence::test_name () const
 }
 
 int
-Test_DynSequence::run_test (void)
+Test_DynSequence::run_test ()
 {
   Data data (this->orb_);
   DynAnyTests::test_seq ts (2);
@@ -230,7 +229,6 @@ Test_DynSequence::run_test (void)
       }
 
 
-
       if (this->error_count_ == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.h b/TAO/tests/DynAny_Test/test_dynsequence.h
index afe325722a6..415005fb00e 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.h
+++ b/TAO/tests/DynAny_Test/test_dynsequence.h
@@ -18,11 +18,11 @@ class Test_DynSequence
 {
 public:
   Test_DynSequence (CORBA::ORB_var orb, int debug);
-  ~Test_DynSequence (void);
+  ~Test_DynSequence ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 915835bfa73..3322bb5d0c5 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -24,7 +24,7 @@ Test_DynStruct::Test_DynStruct (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynStruct::~Test_DynStruct (void)
+Test_DynStruct::~Test_DynStruct ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -37,7 +37,7 @@ Test_DynStruct::test_name () const
 }
 
 int
-Test_DynStruct::run_test (void)
+Test_DynStruct::run_test ()
 {
   Data data (this->orb_);
 
@@ -206,8 +206,7 @@ Test_DynStruct::run_test (void)
         {
           DynamicAny::DynAny_var ftc2_base =
             dynany_factory->create_dyn_any_from_type_code (
-                                DynAnyTests::_tc_test_struct_alias
-                              );
+                                DynAnyTests::_tc_test_struct_alias);
 
           ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ());
 
@@ -315,8 +314,7 @@ Test_DynStruct::run_test (void)
 
       DynamicAny::DynAny_var sm_base =
         dynany_factory->create_dyn_any_from_type_code (
-            DynAnyTests::_tc_test_struct
-          );
+            DynAnyTests::_tc_test_struct);
 
       DynamicAny::DynStruct_var sm =
         DynamicAny::DynStruct::_narrow (sm_base.in ());
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h
index 408d626dda8..6b0a5a9099f 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.h
+++ b/TAO/tests/DynAny_Test/test_dynstruct.h
@@ -18,11 +18,11 @@ class Test_DynStruct
 {
 public:
   Test_DynStruct (CORBA::ORB_var orb, int debug);
-  ~Test_DynStruct (void);
+  ~Test_DynStruct ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index f51f05ec3b9..125a533b0fa 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -23,7 +23,7 @@ Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb, int debug)
 {
 }
 
-Test_DynUnion::~Test_DynUnion (void)
+Test_DynUnion::~Test_DynUnion ()
 {
   CORBA::string_free (this->test_name_);
   this->test_name_ = 0;
@@ -36,7 +36,7 @@ Test_DynUnion::test_name () const
 }
 
 int
-Test_DynUnion::run_test (void)
+Test_DynUnion::run_test ()
 {
   Data data (this->orb_);
 
diff --git a/TAO/tests/DynAny_Test/test_dynunion.h b/TAO/tests/DynAny_Test/test_dynunion.h
index 77ddc0eeef2..e359caac22e 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.h
+++ b/TAO/tests/DynAny_Test/test_dynunion.h
@@ -18,11 +18,11 @@ class Test_DynUnion
 {
 public:
   Test_DynUnion (CORBA::ORB_var orb, int debug);
-  ~Test_DynUnion (void);
+  ~Test_DynUnion ();
 
   const char* test_name () const;
 
-  int run_test (void);
+  int run_test ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/test_wrapper.cpp b/TAO/tests/DynAny_Test/test_wrapper.cpp
index 5befb0e0484..c95c1854038 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.cpp
+++ b/TAO/tests/DynAny_Test/test_wrapper.cpp
@@ -24,14 +24,14 @@ Test_Wrapper<T>::Test_Wrapper (T* t)
 
 // Destructor
 template <class T>
-Test_Wrapper<T>::~Test_Wrapper (void)
+Test_Wrapper<T>::~Test_Wrapper ()
 {
   delete this->test_object_;
 }
 
 template <class T>
 int
-Test_Wrapper<T>::run_test (void)
+Test_Wrapper<T>::run_test ()
 {
   const char* test_name = this->test_object_->test_name ();
 
diff --git a/TAO/tests/DynAny_Test/test_wrapper.h b/TAO/tests/DynAny_Test/test_wrapper.h
index afcf83b93ac..11abca739b0 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.h
+++ b/TAO/tests/DynAny_Test/test_wrapper.h
@@ -22,14 +22,14 @@ public:
   // constructor and destructor
   Test_Wrapper (T *);
 
-  ~Test_Wrapper (void);
+  ~Test_Wrapper ();
 
   /**
    * @brief Run the test.
    *
    * @return The number of errors detected.
    */
-  int run_test (void);
+  int run_test ();
 
 private:
   // This does all the work.
diff --git a/TAO/tests/DynValue_Test/Analyzer.cpp b/TAO/tests/DynValue_Test/Analyzer.cpp
index 02ec090d294..9dd484ea6d2 100644
--- a/TAO/tests/DynValue_Test/Analyzer.cpp
+++ b/TAO/tests/DynValue_Test/Analyzer.cpp
@@ -48,14 +48,14 @@ DynAnyAnalyzer::register_factory (
   CORBA::ValueFactoryBase_var factory)
 {
   factory_id * new_fact (
-    dynamic_cast<factory_id *> (factory.in()) );
+    dynamic_cast<factory_id *> (factory.in()));
   if (new_fact)
     {
       tab("Registering factory for ValueType ");
       ACE_DEBUG ((LM_DEBUG, "%C\n", new_fact->id ()));
       CORBA::ValueFactoryBase_var old_fact (
         orb_->register_value_factory (
-          new_fact->id (), factory.in () )  );
+          new_fact->id (), factory.in () ));
     }
 }
 
@@ -173,7 +173,7 @@ DynAnyAnalyzer::analyze (
             ACE_DEBUG ((LM_DEBUG, "{NULL} "));
           }
         ACE_DEBUG ((LM_DEBUG, "ValueBox Type: %C \"%C\": ",
-                    tc->name (), tc->id ())             );
+                    tc->name (), tc->id ()));
         if (box->is_null ())
           {
             ACE_DEBUG ((LM_DEBUG, "\n"));
diff --git a/TAO/tests/DynValue_Test/Analyzer.h b/TAO/tests/DynValue_Test/Analyzer.h
index 961d7821677..3bca5744426 100644
--- a/TAO/tests/DynValue_Test/Analyzer.h
+++ b/TAO/tests/DynValue_Test/Analyzer.h
@@ -15,7 +15,7 @@ private:
 
 public:
   DynAnyAnalyzer (int argc, ACE_TCHAR *argv[]);
-  ~DynAnyAnalyzer (void) {orb_->destroy ();}
+  ~DynAnyAnalyzer () {orb_->destroy ();}
 
   DynamicAny::DynAny_ptr DynAny_NoTrunc (const CORBA::Any &);
   DynamicAny::DynAny_ptr DynAny (const CORBA::Any &);
diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.h b/TAO/tests/DynValue_Test/ValueTypes_impl.h
index 25bd32b1323..a92c73c9e24 100644
--- a/TAO/tests/DynValue_Test/ValueTypes_impl.h
+++ b/TAO/tests/DynValue_Test/ValueTypes_impl.h
@@ -21,7 +21,7 @@ public:
   BaseValue_impl (CORBA::UShort us1, CORBA::UShort us2)
   : OBV_DynValue_Test::BaseValue (us1,us2) {}
   virtual ~BaseValue_impl ();
-  virtual CORBA::ValueBase * _copy_value (void);
+  virtual CORBA::ValueBase * _copy_value ();
   virtual void print ();
 };
 
@@ -42,7 +42,7 @@ public:
   NestedValue_impl (CORBA::Short s1, CORBA::Short s2)
   : OBV_DynValue_Test::NestedValue (s1,s2) {}
   virtual ~NestedValue_impl ();
-  virtual CORBA::ValueBase * _copy_value (void);
+  virtual CORBA::ValueBase * _copy_value ();
 };
 
 class NestedValue_Factory : public factory_id
@@ -60,7 +60,7 @@ class NullValue_impl : public virtual OBV_DynValue_Test::NullValue,
 public:
   NullValue_impl () {}
   virtual ~NullValue_impl ();
-  virtual CORBA::ValueBase * _copy_value (void);
+  virtual CORBA::ValueBase * _copy_value ();
 };
 
 class NullValue_Factory : public factory_id
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
index edb2562a0ac..0b83d53e4bf 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
@@ -91,7 +91,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
index 7d330b5d366..7c509f094ea 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
@@ -16,7 +16,7 @@ Sleeper_i::delay(CORBA::Short sec)
 }
 
 void
-Sleeper_i::shutdown (void)
+Sleeper_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -72,7 +72,7 @@ Middle_i::call_delay(CORBA::Short sec)
 }
 
 void
-Middle_i::shutdown (void)
+Middle_i::shutdown ()
 {
   sleeper_->shutdown ();
   this->orb_->shutdown (false);
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
index ac0847222d2..c1aec4fd9e9 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
@@ -17,11 +17,10 @@ public:
   // = The skeleton methods
   virtual void delay (CORBA::Short sec);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 
@@ -35,7 +34,7 @@ public:
   // = The skeleton methods
   virtual void call_delay (CORBA::Short sec);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -43,7 +42,6 @@ private:
 
   TAO_SYNCH_MUTEX lock_;
   ACE_Unbounded_Set<ACE_hthread_t> threads_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
index 19720e55059..67b6c09beb3 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
@@ -34,7 +34,7 @@ Hello::get_string (CORBA::Long client_num)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
index 751390c4e00..b721e04bb1d 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
@@ -18,7 +18,7 @@ public:
   virtual void sleep_sec (CORBA::Short sleep_sec);
   virtual char * get_string (CORBA::Long);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
index d658510f4e1..c4cda2ecdb1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
@@ -70,19 +70,18 @@ public:
     target_ (Test::Hello::_duplicate(h))
   {}
 
-  int svc (void);
+  int svc ();
 
   int replies_;
   int nis_;
   int exs_;
 
 private:
-
   ACE_Mutex lock_;
   Test::Hello_var target_;
 };
 
-int ClientTask::svc (void)
+int ClientTask::svc ()
 {
   int ndx = 0;
   {
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/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
index 19720e55059..67b6c09beb3 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
@@ -34,7 +34,7 @@ Hello::get_string (CORBA::Long client_num)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
index 751390c4e00..b721e04bb1d 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
@@ -18,7 +18,7 @@ public:
   virtual void sleep_sec (CORBA::Short sleep_sec);
   virtual char * get_string (CORBA::Long);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
index d658510f4e1..c4cda2ecdb1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
@@ -70,19 +70,18 @@ public:
     target_ (Test::Hello::_duplicate(h))
   {}
 
-  int svc (void);
+  int svc ();
 
   int replies_;
   int nis_;
   int exs_;
 
 private:
-
   ACE_Mutex lock_;
   Test::Hello_var target_;
 };
 
-int ClientTask::svc (void)
+int ClientTask::svc ()
 {
   int ndx = 0;
   {
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..fee39204ebf 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
@@ -67,7 +67,7 @@ next_parm (const ACE_TCHAR **pstart)
 }
 
 void
-set_parms ( TAO_DTP_Definition * this_config)
+set_parms (TAO_DTP_Definition * this_config)
 {
   // Get past the brace
   const ACE_TCHAR *pstart = parms + 1;
@@ -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/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h
index a61cc86259e..afeefeb30c9 100644
--- a/TAO/tests/Explicit_Event_Loop/server.h
+++ b/TAO/tests/Explicit_Event_Loop/server.h
@@ -19,7 +19,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (void);
+  virtual TimeOfDay get_gmt ();
 };
 
 #endif /* server_HH_ */
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index 0c80c2c6e3c..287dace0441 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -1,41 +1,32 @@
 #include "Counter_i.h"
 
-// Dtor-Ctor Implementation.
-
 Counter_Servant::Counter_Servant (Policy_Tester *policy_tester)
   : count_ (0),
     policy_tester_ (policy_tester)
 {
-  // No-Op.
-}
-
-Counter_Servant::~Counter_Servant (void)
-{
-  // No-Op.
 }
 
 // Counter Interface Methods Implementation.
-
 void
-Counter_Servant::increment (/**/)
+Counter_Servant::increment ()
 {
   ++this->count_;
 }
 
 CORBA::Long
-Counter_Servant::get_count (/**/)
+Counter_Servant::get_count ()
 {
   return this->count_;
 }
 
 void
-Counter_Servant::reset (/**/)
+Counter_Servant::reset ()
 {
   this->count_ = 0;
 }
 
 void
-Counter_Servant::shutdown (void)
+Counter_Servant::shutdown ()
 {
   this->policy_tester_->shutdown ();
 }
diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h
index c884f597b83..d4bed6f4ae5 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.h
+++ b/TAO/tests/Exposed_Policies/Counter_i.h
@@ -21,21 +21,19 @@
 class Counter_Servant : public POA_Counter
 {
 public:
-
   // = Ctor-Dtor Declaration
-
   Counter_Servant (Policy_Tester *policy_tester);
-  virtual ~Counter_Servant (void);
+  virtual ~Counter_Servant () = default;
 
   // = Counter Interface Methods Overloading.
 
-  virtual void increment (void);
+  virtual void increment ();
 
-  virtual CORBA::Long get_count (void);
+  virtual CORBA::Long get_count ();
 
-  virtual void reset (void);
+  virtual void reset ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
   CORBA::Long count_;
diff --git a/TAO/tests/Exposed_Policies/Object.cfg.tru64 b/TAO/tests/Exposed_Policies/Object.cfg.tru64
deleted file mode 100644
index adba1999c4a..00000000000
--- a/TAO/tests/Exposed_Policies/Object.cfg.tru64
+++ /dev/null
@@ -1 +0,0 @@
-Priority 24
diff --git a/TAO/tests/Exposed_Policies/POA.cfg.tru64 b/TAO/tests/Exposed_Policies/POA.cfg.tru64
deleted file mode 100644
index d327282c330..00000000000
--- a/TAO/tests/Exposed_Policies/POA.cfg.tru64
+++ /dev/null
@@ -1,5 +0,0 @@
-Priority 21
-
-Priority_Bands 2
-Priority_Range  20 22
-Priority_Range  23 25
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index c7b3633a048..614efa22c28 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -16,19 +16,8 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORB_Core.h"
 
-Policy_Tester::Policy_Tester (void)
-  : rt_object_properties_ (0),
-    rt_poa_properties_ (0)
-{
-  // No_Op
-}
-
-Policy_Tester::~Policy_Tester (void)
-{
-}
-
 void
-Policy_Tester::run (void)
+Policy_Tester::run ()
 {
   PortableServer::POAManager_var poa_manager =
     this->child_poa_->the_POAManager ();
@@ -127,7 +116,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (void)
+Policy_Tester::create_objects ()
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -255,7 +244,7 @@ Policy_Tester::create_objects (void)
 }
 
 void
-Policy_Tester::shutdown (void)
+Policy_Tester::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h
index 3d4df2b6460..8e34e786ca0 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.h
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.h
@@ -25,33 +25,30 @@ class Policy_Tester
 {
 public:
   // Ctor/Dtor.
-  Policy_Tester (void);
-  ~Policy_Tester (void);
+  Policy_Tester () = default;
+  ~Policy_Tester () = default;
 
   /// Runs the test.
-  void run (void);
+  void run ();
 
   int init (int argc,
             ACE_TCHAR *argv[]);
 
-  void shutdown (void);
+  void shutdown ();
 private:
   // Helper method used internally.
-  int create_objects (void);
+  int create_objects ();
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                    const char *msg);
 
 private:
-
-  int is_initialized_;
-
   RTCORBA::RTORB_var rt_orb_;
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
   RTPortableServer::POA_var child_poa_;
-  RT_Properties *rt_object_properties_;
-  RT_Properties *rt_poa_properties_;
+  RT_Properties *rt_object_properties_ {};
+  RT_Properties *rt_poa_properties_ {};
 };
 
 
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 81c07d0e08c..d1a732f7621 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,7 +1,7 @@
 #include "Policy_Verifier.h"
 #include "ace/OS_NS_string.h"
 
-Policy_Verifier::Policy_Verifier (void)
+Policy_Verifier::Policy_Verifier ()
   : rt_object_properties_ (0)
   , rt_poa_properties_ (0)
   , priority_bands_ (0)
@@ -12,7 +12,7 @@ Policy_Verifier::Policy_Verifier (void)
                   ACE_TEXT("file://overridden.ior"));
 }
 
-Policy_Verifier::~Policy_Verifier (void)
+Policy_Verifier::~Policy_Verifier ()
 {
   delete rt_object_properties_;
   delete rt_poa_properties_;
@@ -110,7 +110,7 @@ Policy_Verifier::init (int argc, ACE_TCHAR *argv[])
 }
 
 void
-Policy_Verifier::run ( )
+Policy_Verifier::run ()
 {
   this->verify_reference (this->base_object_.in (),
                           this->rt_poa_properties_);
@@ -123,7 +123,6 @@ void
 Policy_Verifier::verify_reference (Counter_ptr object,
                                    RT_Properties *rt_properties)
 {
-
   try
     {
       CORBA::Policy_var policy_var =
@@ -162,7 +161,6 @@ Policy_Verifier::verify_reference (Counter_ptr object,
       if (Policy_Verifier::check_reference (policy_var.in (),
                                           "Unable to get Priority Banded Policy\n"))
         {
-
           RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy =
             RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ());
 
@@ -170,7 +168,6 @@ Policy_Verifier::verify_reference (Counter_ptr object,
           if (Policy_Verifier::check_reference (priority_banded_policy.in (),
                                               "Unable to get Priority Banded Policy\n"))
             {
-
               // Here we have a priority banded connection policy.
 
               RTCORBA::PriorityBands_var pb =
@@ -195,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")));
-
                 }
             }
         }
@@ -214,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/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index d46afcd8962..c035274d2ee 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -28,14 +28,13 @@
 class Policy_Verifier
 {
 public:
-
   // -- Ctor/Dtor --
-  Policy_Verifier (void);
-  ~Policy_Verifier (void);
+  Policy_Verifier ();
+  ~Policy_Verifier ();
 
   bool init (int argc, ACE_TCHAR *argv[]);
 
-  void run (void);
+  void run ();
 
 private:
   // -- Helper methods --
@@ -46,7 +45,6 @@ private:
                                   const char *msg);
 
 private:
-
   CORBA::ORB_var orb_;
 
   RT_Properties *rt_object_properties_;
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 8f90aef7cfc..5d68906672f 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -5,17 +5,12 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-RT_Properties::RT_Properties (void)
+RT_Properties::RT_Properties ()
   : priority_ (10)
 {
   ior_source_ = ACE_TEXT("poa_default.ior");
 }
 
-RT_Properties::~RT_Properties (void)
-{
-  // No-Op.
-}
-
 RT_Properties *
 RT_Properties::read_from (const ACE_TCHAR *file_name)
 {
@@ -49,7 +44,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)
         {
@@ -77,7 +71,7 @@ RT_Properties::priority (RTCORBA::Priority priority)
 }
 
 RTCORBA::Priority
-RT_Properties::priority (void)
+RT_Properties::priority ()
 {
   return this->priority_;
 }
@@ -89,7 +83,7 @@ RT_Properties::priority_bands (const RTCORBA::PriorityBands& priority_bands)
 }
 
 const RTCORBA::PriorityBands&
-RT_Properties::priority_bands (void)
+RT_Properties::priority_bands ()
 {
   return this->priority_bands_;
 }
@@ -101,7 +95,7 @@ RT_Properties::ior_source (const ACE_TCHAR *s)
 }
 
 const ACE_TCHAR *
-RT_Properties::ior_source (void)
+RT_Properties::ior_source ()
 {
   return this->ior_source_.c_str ();
 }
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index 4f50b96945b..88acc5efcfa 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -19,23 +19,22 @@ class RT_Properties
 {
 public:
   // -- Ctor/Dtor --
-  RT_Properties (void);
-  ~RT_Properties (void);
+  RT_Properties ();
+  ~RT_Properties () = default;
 
   static RT_Properties * read_from (const ACE_TCHAR *file_name);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
-  RTCORBA::Priority priority (void);
+  RTCORBA::Priority priority ();
 
   void priority_bands (const RTCORBA::PriorityBands& priority_bands);
-  const RTCORBA::PriorityBands& priority_bands (void);
+  const RTCORBA::PriorityBands& priority_bands ();
 
   void ior_source (const ACE_TCHAR *s);
-  const ACE_TCHAR* ior_source (void);
+  const ACE_TCHAR* ior_source ();
 
 private:
-
   RTCORBA::Priority priority_;
   RTCORBA::PriorityBands priority_bands_;
   ACE_TString ior_source_;
diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl
index 4e0f4824e04..de5271382f7 100755
--- a/TAO/tests/Exposed_Policies/run_test.pl
+++ b/TAO/tests/Exposed_Policies/run_test.pl
@@ -24,7 +24,6 @@ my $ior_base = "default.ior";
 my $ior_overridden = "overridden.ior";
 my $cfg_poa = "POA.cfg";
 my $cfg_object = "Object.cfg";
-my $cfg_suffix_tru64 = ".tru64";
 
 my $server_ior_base = $server->LocalFile ($ior_base);
 my $server_ior_overridden = $server->LocalFile ($ior_overridden);
@@ -49,13 +48,6 @@ if ($server->PutFile ($cfg_object) == -1) {
     return 1;
 }
 
-if ($^O eq "dec_osf") {
-    $server_cfg_poa = "$server_cfg_poa$cfg_suffix_tru64";
-    $server_cfg_object = "$server_cfg_object$cfg_suffix_tru64";
-    $client_cfg_poa = "$client_cfg_poa$cfg_suffix_tru64";
-    $client_cfg_object = "$client_cfg_object$cfg_suffix_tru64";
-}
-
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ".
                                         "-POAConfigFile $server_cfg_poa ".
                                         "-ObjectConfigFile $server_cfg_object ".
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 43e63c7a8a9..a26905e2eb5 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -15,7 +15,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       Policy_Tester policy_tester;
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 2e3088390d6..b66b9ae2cdf 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -19,9 +19,9 @@ public:
           Fl_Window* parent);
   // ctor
 
-  ~Client (void);
+  ~Client ();
 
-  void show (void);
+  void show ();
   // Call show on all the window objects
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
@@ -31,8 +31,8 @@ private:
   static void y_cb (Fl_Widget *widget, void* cookie);
   // The callbacks
 
-  void x_changed (void);
-  void y_changed (void);
+  void x_changed ();
+  void y_changed ();
   // The methods for the callbacks
 
 private:
@@ -99,14 +99,14 @@ Client::Client (CORBA::ORB_ptr orb,
   this->y_roller_->step (1);
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   delete x_roller_;
   delete y_roller_;
 }
 
 void
-Client::show (void)
+Client::show ()
 {
   this->x_roller_->show ();
   this->y_roller_->show ();
@@ -127,7 +127,7 @@ Client::y_cb (Fl_Widget*, void* cookie)
 }
 
 void
-Client::x_changed (void)
+Client::x_changed ()
 {
   try
     {
@@ -141,7 +141,7 @@ Client::x_changed (void)
 }
 
 void
-Client::y_changed (void)
+Client::y_changed ()
 {
   try
     {
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 205f563955b..1d75cbd70c9 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -6,7 +6,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      window_ (window)
 {
-
 }
 
 void
@@ -22,7 +21,7 @@ Simple_Server_i::set_y_angle (CORBA::Long y)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -61,7 +60,7 @@ Simple_Window::set_y_angle (CORBA::Long y)
 }
 
 void
-Simple_Window::draw (void)
+Simple_Window::draw ()
 {
   // Based on the CubeView example in the FL toolkit.
 
@@ -87,7 +86,7 @@ Simple_Window::draw (void)
 }
 
 void
-Simple_Window::draw_cube (void)
+Simple_Window::draw_cube ()
 {
   const float ALPHA = 0.5;
 
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index 8ae8098f7a6..62ea39f6dbc 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -28,9 +28,9 @@ public:
 
 private:
   /// from the Fl_Gl_Window...
-  virtual void draw (void);
+  virtual void draw ();
 
-  virtual void draw_cube (void);
+  virtual void draw_cube ();
 
   /// The angles...
   CORBA::Long x_angle_;
@@ -60,7 +60,7 @@ public:
   // = The Simple_Server methods.
   void set_x_angle (CORBA::Long x);
   void set_y_angle (CORBA::Long y);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
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/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index 6be7b4ec2a9..060e9a15a57 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -11,18 +11,18 @@ PingObject_i::ping (PingObject_ptr callback)
 }
 
 void
-PingObject_i::pong (void)
+PingObject_i::pong ()
 {
 }
 
 void
-PingObject_i::shutdown (void)
+PingObject_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-PingObject_i::_default_POA (void)
+PingObject_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 809bf32802e..f32efaf14da 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -31,10 +31,10 @@ public:
 
   // = The PingObject interface methods
   void ping (PingObject_ptr callback);
-  void pong (void);
-  void shutdown (void);
+  void pong ();
+  void shutdown ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The orb
diff --git a/TAO/tests/Faults/run_test.pl b/TAO/tests/Faults/run_test.pl
index 9d287351aae..b5da0c8d0d2 100755
--- a/TAO/tests/Faults/run_test.pl
+++ b/TAO/tests/Faults/run_test.pl
@@ -88,7 +88,7 @@ print STDERR "===== Client crash (abort) during upcall\n";
 
 $CL->Arguments ("-k file://$client_iorfile -i 100 -s");
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval(), {self_crash => 1});
 
 if ($client_status == -1) {
     print STDERR "ERROR: client returned $client_status\n";
@@ -122,7 +122,7 @@ if ($client_status != 0) {
     exit 1;
 }
 
-$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval(), {self_crash => 1});
 
 if ($server_status == -1) {
     print STDERR "ERROR: server returned $server_status\n";
@@ -245,7 +245,7 @@ if ($client->PutFile ($midiorbase) == -1) {
 
 $CL->Arguments ("-k file://$client_midiorfile -i 100 -s");
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 85);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 85, {self_crash => 1});
 
 if ($client_status == -1) {
     print STDERR "ERROR: client returned $client_status\n";
@@ -335,7 +335,7 @@ print STDERR "===== Client crash (abort) during upcall\n";
 
 $CL->Arguments ("-k file://$client_iorfile -i 100 -s");
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval(), {self_crash => 1});
 
 if ($client_status == -1) {
     print STDERR "ERROR: client returned $client_status\n";
@@ -369,7 +369,7 @@ if ($client_status != 0) {
     exit 1;
 }
 
-$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval(), {self_crash => 1});
 
 if ($server_status == -1) {
     print STDERR "ERROR: server returned $server_status\n";
@@ -488,7 +488,7 @@ if ($client->PutFile ($midiorbase) == -1) {
 
 $CL->Arguments ("-k file://$client_midiorfile -i 100 -s");
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 85);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 85, {self_crash => 1});
 
 if ($client_status == -1) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index e88d859e42b..bdb07cfb63d 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -64,7 +64,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -105,7 +105,7 @@ Middle_i::shutdown_now (CORBA::Boolean is_clean)
 }
 
 void
-Middle_i::shutdown (void)
+Middle_i::shutdown ()
 {
   try
     {
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index 884e62ff26d..48b304f79c4 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -55,7 +55,7 @@ public:
 
   void shutdown_now (CORBA::Boolean is_clean);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
@@ -83,7 +83,7 @@ public:
 
   void shutdown_now (CORBA::Boolean is_clean);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 5d3a6d6621c..f1f3f2e03ac 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -27,12 +27,12 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
   poa->set_servant (&this->fd_servant_);
 }
 
-FileImpl::System::~System (void)
+FileImpl::System::~System ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (void)
+FileImpl::System::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -82,19 +82,19 @@ FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa)
 {
 }
 
-FileImpl::Descriptor::~Descriptor (void)
+FileImpl::Descriptor::~Descriptor ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (void)
+FileImpl::Descriptor::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (void)
+FileImpl::Descriptor::fd ()
 {
   //
   // One way of getting our id.
@@ -194,7 +194,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (void)
+FileImpl::Descriptor::destroy ()
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd ();
diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h
index 44c7bedce18..971dc5eb49e 100644
--- a/TAO/tests/File_IO/File_i.h
+++ b/TAO/tests/File_IO/File_i.h
@@ -35,10 +35,10 @@ public:
     Descriptor (PortableServer::POA_ptr poa);
 
     /// Destructor
-    ~Descriptor (void);
+    ~Descriptor ();
 
     /// Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
@@ -50,12 +50,11 @@ public:
                                 CORBA::Long whence);
 
     /// closes the file corresponding to the requested ObjectID
-    virtual void destroy (void);
+    virtual void destroy ();
 
   private:
-
     /// Extracts the ACE_HANDLE from the objectID
-    ACE_HANDLE fd (void);
+    ACE_HANDLE fd ();
 
     PortableServer::POA_var poa_;
   };
@@ -73,10 +72,10 @@ public:
     System (PortableServer::POA_ptr poa);
 
     ///Destructor
-    ~System (void);
+    ~System ();
 
     ///Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// Opens a file ,creates a Descriptor reference with the
     /// ACE_HANDLE and returns that reference
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 8ce66422b4f..a68ed75cba6 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -100,7 +100,6 @@ validate_connection (CORBA::Object_ptr object)
 static void *
 MTTEST (void *args)
 {
-
   ACE_CString &ior = *(ACE_CString*)args;
   try
     {
@@ -144,7 +143,6 @@ MTTEST (void *args)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 5cf199a84e1..73ef4a1ea3a 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -195,7 +195,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index 3ebab564f83..619fedad3b0 100644
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -83,7 +83,6 @@ public:
   void done ();
 
 private:
-
   // The ORB reference
   CORBA::ORB_var orb_;
   // The exceptions caught.
@@ -180,7 +179,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -208,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/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp
index c77bd7b2527..3060c08666a 100644
--- a/TAO/tests/ForwardOnceUponException/test_i.cpp
+++ b/TAO/tests/ForwardOnceUponException/test_i.cpp
@@ -39,7 +39,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ForwardOnceUponException/test_i.h b/TAO/tests/ForwardOnceUponException/test_i.h
index 1c617592d51..2ebce1f3da0 100644
--- a/TAO/tests/ForwardOnceUponException/test_i.h
+++ b/TAO/tests/ForwardOnceUponException/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
   int ncalls () const;
 
diff --git a/TAO/tests/ForwardOnceUponException/test_i.inl b/TAO/tests/ForwardOnceUponException/test_i.inl
index 41ff942499f..a443c099829 100644
--- a/TAO/tests/ForwardOnceUponException/test_i.inl
+++ b/TAO/tests/ForwardOnceUponException/test_i.inl
@@ -8,7 +8,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 {
 }
 
-
 ACE_INLINE
 int Simple_Server_i::ncalls () const
 {
diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp
index ba98b629398..f795552f152 100644
--- a/TAO/tests/ForwardUponObjectNotExist/client.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp
@@ -58,7 +58,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
 
   /// The actual implementation of the test
-  virtual void run_test (void);
+  virtual void run_test ();
 
   virtual int svc ();
 
@@ -145,7 +145,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -163,7 +163,7 @@ Worker::svc (void)
 }
 
 void
-Worker::run_test (void)
+Worker::run_test ()
 {
   CORBA::Object_var object =
     this->orb_->string_to_object (ior);
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
index 0fd5c7419c4..b14f3393c35 100644
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
@@ -13,7 +13,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.h b/TAO/tests/ForwardUponObjectNotExist/test_i.h
index 71c4495c6a8..78094fdd9cf 100644
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.h
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index c14cc58d77f..3c3094beb75 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -48,7 +48,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
   // Constructor
 
-  virtual void run_test (void);
+  virtual void run_test ();
   // The actual implementation of the test
 
   // = The Task_Base methods
@@ -118,7 +118,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -133,7 +133,7 @@ Worker::svc (void)
 }
 
 void
-Worker::run_test (void)
+Worker::run_test ()
 {
   for (int j = 0; j != niterations; ++j)
     {
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index a5df35f5892..03319fc0b1e 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -12,7 +12,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h
index 71c4495c6a8..78094fdd9cf 100644
--- a/TAO/tests/Forwarding/test_i.h
+++ b/TAO/tests/Forwarding/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index 712826479b7..f7538cf098f 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -12,7 +12,7 @@ Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
index 995a5646e39..bf995196d7e 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
@@ -20,10 +20,9 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   /// Reference to the test interface
   Test::Big_Reply_var reply_gen_;
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index ff03f1a2de6..04ebeb029e2 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -23,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload)
 
 
 void
-Payload_Receiver::shutdown (void)
+Payload_Receiver::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index d6ba365e769..ccb0aa37661 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   int get_count () const;
 
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index ff03f1a2de6..04ebeb029e2 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -23,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload)
 
 
 void
-Payload_Receiver::shutdown (void)
+Payload_Receiver::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index 25d0748febd..a2d635f0e69 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   int get_count () const;
 
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index f7f449f47b6..2334bbcdfc2 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -17,11 +17,11 @@ public:
   {
   }
 
-  void simple (void)
+  void simple ()
   {
   }
 
-  void shutdown (void)
+  void shutdown ()
   {
     this->orb_->shutdown ();
   }
@@ -33,7 +33,7 @@ private:
 class Descriptors
 {
 public:
-  Descriptors (void)
+  Descriptors ()
     : min_close_ (0),
       max_close_ (0),
       ok_ (false)
@@ -44,7 +44,7 @@ public:
       }
   }
 
-  int allow_accepts (void)
+  int allow_accepts ()
   {
     cout << "Server: closing " << (this->max_close_ - this->min_close_) + 1
          << " fds" << endl;
@@ -60,7 +60,7 @@ public:
     for (size_t i = 0; i < 0xffff; i++)
       {
         this->openfds_[i] = ACE_OS::open (file, O_RDONLY);
-        if ( i == 0)
+        if (i == 0)
           {
 #if defined (ACE_WIN32)
             // the test is not valid on windows so just wing this value
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index d5f0e3a45c2..e23098b21c0 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -57,9 +57,8 @@ namespace Test
       : h_ (Hang::_duplicate (h))
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
-
       try
         {
           this->h_->send_stuff ("Testing",
@@ -115,9 +114,8 @@ namespace Test
       : o_ (CORBA::ORB::_duplicate (o))
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
-
       try
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -169,7 +167,6 @@ namespace Test
   static int
   try_main (int argc, ACE_TCHAR *argv[])
   {
-
     try
       {
         CORBA::ORB_var orb =
@@ -212,7 +209,6 @@ namespace Test
         ACE_Thread_Manager::instance ()->wait ();
 
         orb->destroy ();
-
       }
     catch (const CORBA::Exception& ex)
       {
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index 2a4975eb194..9022362a9fe 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -36,7 +36,6 @@ namespace Test
   try_main (int argc,
             ACE_TCHAR *argv[])
   {
-
     try
       {
         CORBA::ORB_var orb =
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index efb6ab0ec87..9f6914e2ab3 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -8,7 +8,7 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 }
 
 Test::HelloWorld_ptr
-Hello::get_helloworld (void)
+Hello::get_helloworld ()
 {
   HelloWorld *hello_world;
   ACE_NEW_THROW_EX (hello_world,
@@ -25,7 +25,7 @@ Hello::get_helloworld (void)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index 319f621a6e9..1d2b0256a54 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
@@ -12,16 +12,14 @@ class Hello
   : public virtual POA_Test::Hello
 {
 public:
-
   /// Constructor
   Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
-  virtual Test::HelloWorld_ptr get_helloworld (void);
+  virtual Test::HelloWorld_ptr get_helloworld ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   PortableServer::POA_var poa_;
 
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
index 0c67b45ea2b..c15c5f65a2b 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -1,12 +1,12 @@
 
 #include "HelloWorld.h"
 
-HelloWorld::HelloWorld (void)
+HelloWorld::HelloWorld ()
 {
 }
 
 char *
-HelloWorld::get_string (void)
+HelloWorld::get_string ()
 {
   return CORBA::string_dup ("TAO Any Implementation Works!");
 }
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index 9b4de135534..7bcd4dc0e7d 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
@@ -11,12 +11,10 @@ class HelloWorld
   : public virtual POA_Test::HelloWorld
 {
 public:
-
-  HelloWorld (void);
+  HelloWorld ();
   /// Constructor
 
-  virtual char * get_string (void);
-
+  virtual char * get_string ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
index 1b8bcc27184..393c0fd77f5 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
@@ -6,13 +6,13 @@ Derived_i::Derived_i (CORBA::ORB_ptr orb)
 }
 
 void
-Derived_i::BaseOp (void)
+Derived_i::BaseOp ()
 {
   ACE_DEBUG ((LM_DEBUG, "BaseOp upcall successful\n"));
 }
 
 void
-Derived_i::shutdown (void)
+Derived_i::shutdown ()
 {
   orb_->shutdown ();
 }
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
index d64d6370536..e180bd801fe 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
@@ -10,8 +10,8 @@ class Derived_i : public virtual POA_Outer::Derived
 public:
   Derived_i (CORBA::ORB_ptr orb);
 
-  virtual void BaseOp (void);
-  virtual void shutdown (void);
+  virtual void BaseOp ();
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 7ac4384b33d..5a2c335032b 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -26,6 +26,7 @@ project(*IDL): taoserver, messaging, gen_ostream {
     Bug_3312_Regression.idl
     Bug_3819_Regression.idl
     Bug_3821_Regression.idl
+    expressions.idl
     full.idl
     fwd.idl
     gperf.idl
@@ -147,6 +148,8 @@ project(*DLL): taoidldefaults, taolib, messaging {
     dif2S.cpp
     enum_in_structC.cpp
     enum_in_structS.cpp
+    expressionsC.cpp
+    expressionsS.cpp
     fullC.cpp
     fullS.cpp
     fwdC.cpp
diff --git a/TAO/tests/IDL_Test/Versioned_Namespace/.gitignore b/TAO/tests/IDL_Test/Versioned_Namespace/.gitignore
new file mode 100644
index 00000000000..645479ef241
--- /dev/null
+++ b/TAO/tests/IDL_Test/Versioned_Namespace/.gitignore
@@ -0,0 +1,5 @@
+/*C.cpp
+/*C.h
+/*C.inl
+/*S.cpp
+/*S.h
diff --git a/TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl b/TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl
new file mode 100644
index 00000000000..47bca7d3295
--- /dev/null
+++ b/TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl
@@ -0,0 +1,15 @@
+module M1 {
+  struct S1 {
+    octet o;
+  };
+
+  local interface LI {
+    void op(in S1 s);
+  };
+
+  valuetype V {
+    public string valString;
+    public S1 valStruct;
+    public LI valLocalIface;
+  };
+};
diff --git a/TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace2.idl b/TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace2.idl
new file mode 100644
index 00000000000..35fa1398044
--- /dev/null
+++ b/TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace2.idl
@@ -0,0 +1,73 @@
+module M1 {
+
+  struct S1 {
+    octet o;
+  };
+
+  interface LI {
+    void op(in S1 s);
+  };
+
+  interface L2 {
+    void op(in S1 s);
+  };
+
+  struct X {
+    string valString;
+    S1 valStruct;
+    L2 valLocalIface;
+  };
+
+  union BooleanUnion1 switch (boolean)
+    {
+      case TRUE: L2 valLocalIface;
+    };
+
+  union BooleanUnion2 switch (boolean)
+    {
+      case TRUE: string valLocalIface;
+    };
+
+  valuetype V {
+    public string valString;
+    public S1 valStruct;
+    public LI valLocalIface;
+    public BooleanUnion1 valBoolUnion1;
+    public BooleanUnion2 valBoolUnion2;
+    public X valX;
+  };
+};
+
+module M2 {
+  module M3 {
+    struct S2 {
+      octet o;
+    };
+
+    interface L3 {
+      void op(in S2 s);
+    };
+
+    exception E1 {
+      L3 val2;
+      M1::BooleanUnion1 bool1;
+      M1::BooleanUnion2 bool2;
+    };
+
+    interface L4 {
+      void op(in S2 s) raises (E1);
+    };
+
+    valuetype V2 {
+      public string valString;
+      public S2 valStruct;
+      public L3 valLocalIface;
+      public L4 valLocalIface3;
+    };
+    valuetype V3 {
+      public string valString;
+      public M1::S1 valStruct;
+      public M1::L2 valLocalIface;
+    };
+  };
+};
diff --git a/TAO/tests/IDL_Test/Versioned_Namespace/UserVersionedNamespace.h b/TAO/tests/IDL_Test/Versioned_Namespace/UserVersionedNamespace.h
new file mode 100644
index 00000000000..fe962aad30f
--- /dev/null
+++ b/TAO/tests/IDL_Test/Versioned_Namespace/UserVersionedNamespace.h
@@ -0,0 +1,2 @@
+#define BEGIN_USER_VERSIONED_NAMESPACE namespace User {
+#define END_USER_VERSIONED_NAMESPACE } using namespace User;
diff --git a/TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc b/TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc
new file mode 100644
index 00000000000..fa233b74d09
--- /dev/null
+++ b/TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc
@@ -0,0 +1,29 @@
+// -*- MPC -*-
+project(IDL_Test_Versioned_Namespace_1): taoidldefaults, valuetype {
+  idlflags += -Wb,versioning_begin=BEGIN_USER_VERSIONED_NAMESPACE \
+              -Wb,versioning_end=END_USER_VERSIONED_NAMESPACE \
+              -Wb,versioning_include=UserVersionedNamespace.h
+  idlflags += -Scdr -Sa
+  IDL_Files {
+    TestVersionedNamespace.idl
+  }
+
+  Source_Files {
+    TestVersionedNamespaceC.cpp
+    TestVersionedNamespaceS.cpp
+  }
+}
+
+project(IDL_Test_Versioned_Namespace_2): taoidldefaults, valuetype, amh {
+  idlflags += -Wb,versioning_begin=BEGIN_USER_VERSIONED_NAMESPACE \
+              -Wb,versioning_end=END_USER_VERSIONED_NAMESPACE \
+              -Wb,versioning_include=UserVersionedNamespace.h
+  IDL_Files {
+    TestVersionedNamespace2.idl
+  }
+
+  Source_Files {
+    TestVersionedNamespace2C.cpp
+    TestVersionedNamespace2S.cpp
+  }
+}
diff --git a/TAO/tests/IDL_Test/expressions.idl b/TAO/tests/IDL_Test/expressions.idl
new file mode 100644
index 00000000000..50739eec980
--- /dev/null
+++ b/TAO/tests/IDL_Test/expressions.idl
@@ -0,0 +1,52 @@
+module ShortValues {
+  const short a = 6;
+  const short b = 3;
+  const short div = a / b;
+  const short mul = a * b;
+  const short add = a + b;
+  const short sub = a - b;
+  const short mod = a % b;
+};
+
+module LongValues {
+  const long a = 6;
+  const long b = 3;
+  const long div = a / b;
+  const long mul = a * b;
+  const long add = a + b;
+  const long sub = a - b;
+  const long mod = a % b;
+};
+
+module MixedIntValues {
+  const long div = LongValues::a / ShortValues::b;
+  const long mul = LongValues::a * ShortValues::b;
+  const long add = LongValues::a + ShortValues::b;
+  const long sub = LongValues::a - ShortValues::b;
+  const long mod = LongValues::a % ShortValues::b;
+};
+
+module FloatValues {
+  const float a = 6.0;
+  const float b = 3.0;
+  const float div = a / b;
+  const float mul = a * b;
+  const float add = a + b;
+  const float sub = a - b;
+};
+
+module DoubleValues {
+  const double a = 6.0;
+  const double b = 3.0;
+  const double div = a / b;
+  const double mul = a * b;
+  const double add = a + b;
+  const double sub = a - b;
+};
+
+module MixedFloatValues {
+  const double div = DoubleValues::a / FloatValues::b;
+  const double mul = DoubleValues::a * FloatValues::b;
+  const double add = DoubleValues::a + FloatValues::b;
+  const double sub = DoubleValues::a - FloatValues::b;
+};
diff --git a/TAO/tests/IDL_Test/interface.idl b/TAO/tests/IDL_Test/interface.idl
index 6ff89c19f4a..1ee7dd843d0 100644
--- a/TAO/tests/IDL_Test/interface.idl
+++ b/TAO/tests/IDL_Test/interface.idl
@@ -79,7 +79,6 @@ interface later_user
             inout later inoutarg,
             out later outarg);
 
-
   // Not a clash with the C++ keyword because they are case sensitive,
   // but the Arg_Traits<> specialization parameter (ACE_InputCDR::to_boolean)
   // needs the unaliased type name to work.
@@ -260,3 +259,22 @@ module Rec_Arg_Traits
     void remove_task (in plan_stub_type listener);
   };
 };
+
+// Test to validate that the generated code is compilable
+// when we have an argument `call`
+module call_test
+{
+  interface iTest
+  {
+    void do_op (in string call);
+  };
+};
+
+// Test that using an attribut call is working correctly
+module call_attribute
+{
+  interface iBar
+  {
+    attribute string call;
+  };
+};
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index 1fd8c57b4ef..6d7770e8f1a 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -17,6 +17,7 @@
 #include "constantsC.h"
 #include "nested_scopeS.h"
 #include "typedefC.h"
+#include "expressionsC.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
@@ -79,8 +80,66 @@ struct something_handler
 {
 };
 
+template <typename Type>
+void
+expect_equals (int &error_count, const char *name, Type actual, Type expected)
+{
+  if (actual != expected)
+    {
+      *ACE_DEFAULT_LOG_STREAM
+        << "ERROR: For " << name << " expected: " << expected
+        << ", but got " << actual << "\n";
+      ++error_count;
+    }
+}
+
+void
+test_expressions (int &error_count)
+{
+  expect_equals<CORBA::Short> (error_count, "ShortValues::a", ShortValues::a, 6);
+  expect_equals<CORBA::Short> (error_count, "ShortValues::b", ShortValues::b, 3);
+  expect_equals<CORBA::Short> (error_count, "ShortValues::div", ShortValues::div, 2);
+  expect_equals<CORBA::Short> (error_count, "ShortValues::mul", ShortValues::mul, 18);
+  expect_equals<CORBA::Short> (error_count, "ShortValues::add", ShortValues::add, 9);
+  expect_equals<CORBA::Short> (error_count, "ShortValues::sub", ShortValues::sub, 3);
+  expect_equals<CORBA::Short> (error_count, "ShortValues::mod", ShortValues::mod, 0);
+
+  expect_equals<CORBA::Long> (error_count, "LongValues::a", LongValues::a, 6);
+  expect_equals<CORBA::Long> (error_count, "LongValues::b", LongValues::b, 3);
+  expect_equals<CORBA::Long> (error_count, "LongValues::div", LongValues::div, 2);
+  expect_equals<CORBA::Long> (error_count, "LongValues::mul", LongValues::mul, 18);
+  expect_equals<CORBA::Long> (error_count, "LongValues::add", LongValues::add, 9);
+  expect_equals<CORBA::Long> (error_count, "LongValues::sub", LongValues::sub, 3);
+  expect_equals<CORBA::Long> (error_count, "LongValues::mod", LongValues::mod, 0);
+
+  expect_equals<CORBA::Long> (error_count, "MixedIntValues::div", MixedIntValues::div, 2);
+  expect_equals<CORBA::Long> (error_count, "MixedIntValues::mul", MixedIntValues::mul, 18);
+  expect_equals<CORBA::Long> (error_count, "MixedIntValues::add", MixedIntValues::add, 9);
+  expect_equals<CORBA::Long> (error_count, "MixedIntValues::sub", MixedIntValues::sub, 3);
+  expect_equals<CORBA::Long> (error_count, "MixedIntValues::mod", MixedIntValues::mod, 0);
+
+  expect_equals<CORBA::Float> (error_count, "FloatValues::a", FloatValues::a, 6.0f);
+  expect_equals<CORBA::Float> (error_count, "FloatValues::b", FloatValues::b, 3.0f);
+  expect_equals<CORBA::Float> (error_count, "FloatValues::div", FloatValues::div, 2.0f);
+  expect_equals<CORBA::Float> (error_count, "FloatValues::mul", FloatValues::mul, 18.0f);
+  expect_equals<CORBA::Float> (error_count, "FloatValues::add", FloatValues::add, 9.0f);
+  expect_equals<CORBA::Float> (error_count, "FloatValues::sub", FloatValues::sub, 3.0f);
+
+  expect_equals<CORBA::Double> (error_count, "DoubleValues::a", DoubleValues::a, 6.0);
+  expect_equals<CORBA::Double> (error_count, "DoubleValues::b", DoubleValues::b, 3.0);
+  expect_equals<CORBA::Double> (error_count, "DoubleValues::div", DoubleValues::div, 2.0);
+  expect_equals<CORBA::Double> (error_count, "DoubleValues::mul", DoubleValues::mul, 18.0);
+  expect_equals<CORBA::Double> (error_count, "DoubleValues::add", DoubleValues::add, 9.0);
+  expect_equals<CORBA::Double> (error_count, "DoubleValues::sub", DoubleValues::sub, 3.0);
+
+  expect_equals<CORBA::Double> (error_count, "MixedFloatValues::div", MixedFloatValues::div, 2.0);
+  expect_equals<CORBA::Double> (error_count, "MixedFloatValues::mul", MixedFloatValues::mul, 18.0);
+  expect_equals<CORBA::Double> (error_count, "MixedFloatValues::add", MixedFloatValues::add, 9.0);
+  expect_equals<CORBA::Double> (error_count, "MixedFloatValues::sub", MixedFloatValues::sub, 3.0);
+}
+
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int error_count = 0;
 
@@ -175,8 +234,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Check whether the implementation of Dubble and Toil are generated
       CommaList::Dubble dub;
       CommaList::Toil toi;
-      dub.length(4);
-      toi.length(4);
+      dub.length (4);
+      toi.length (4);
 
       ciao_i c;
       id = root_poa->activate_object (&c);
@@ -326,7 +385,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         if (!dynamic_cast<POA_bug_1985_c::d::AMI_somethingHandler*> (&x))
           {
             ++error_count;
-            ACE_ERROR( (LM_ERROR,
+            ACE_ERROR ((LM_ERROR,
                        "mismatch in downcast for %C\n",
                         base[0]));
           }
@@ -353,8 +412,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       Field field;
       field.value.strValue (
-          CORBA::string_dup ("duplicate case label test string")
-        );
+          CORBA::string_dup ("duplicate case label test string"));
       field.value._d (FTYPE_VARCHAR);
       CORBA::Any any1;
       any1 <<= field;
@@ -415,5 +473,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return error_count;
+  test_expressions (error_count);
+
+  return error_count ? 1 : 0;
 }
diff --git a/TAO/tests/IDL_Test/params.idl b/TAO/tests/IDL_Test/params.idl
index 617bf8546e5..a4ab1bdf776 100644
--- a/TAO/tests/IDL_Test/params.idl
+++ b/TAO/tests/IDL_Test/params.idl
@@ -1,5 +1,3 @@
-
-//=============================================================================
 /**
  *  @file    params.idl
  *
@@ -8,16 +6,8 @@
  *  compiler. This test is to make sure the problems
  *  stay fixed.
  *
- *
  *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
  */
-//=============================================================================
-
-
-// Compiling the generated code for the parameters of
-// getDate taught us to use the ACE_NESTED_CLASS macro
-// more judiciously in the header file. This file was
-// also initially a problem for lookups as well.
 
 module foo
 {
diff --git a/TAO/tests/IDLv4/annotations/annotation_tests.cpp b/TAO/tests/IDLv4/annotations/annotation_tests.cpp
index 3ddced256b8..bd874852c0e 100644
--- a/TAO/tests/IDLv4/annotations/annotation_tests.cpp
+++ b/TAO/tests/IDLv4/annotations/annotation_tests.cpp
@@ -10,7 +10,6 @@
 #include <string>
 
 namespace {
-
   void assert_node_has_annotation (
     Annotation_Test &t, const char *node_name, AST_Annotation_Decl *annotation)
   {
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/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp
index a27a528d62a..7f564a0f61d 100644
--- a/TAO/tests/IORManipulation/filter/server.cpp
+++ b/TAO/tests/IORManipulation/filter/server.cpp
@@ -7,7 +7,6 @@ class Filter_Localhost: public TAO_IORManip_IIOP_Filter
 public:
   virtual CORBA::Boolean profile_info_matches (
                          const TAO_IORManip_IIOP_Filter::Profile_Info& pinfo);
-
 };
 
 CORBA::Boolean
diff --git a/TAO/tests/IORTable_Locator/simple_test_i.cpp b/TAO/tests/IORTable_Locator/simple_test_i.cpp
index ff2df5d99e8..a2f552b0d77 100644
--- a/TAO/tests/IORTable_Locator/simple_test_i.cpp
+++ b/TAO/tests/IORTable_Locator/simple_test_i.cpp
@@ -7,7 +7,7 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Test_i::shutdown (void)
+Simple_Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/IORTable_Locator/simple_test_i.h b/TAO/tests/IORTable_Locator/simple_test_i.h
index 9918438def1..f005511d554 100644
--- a/TAO/tests/IORTable_Locator/simple_test_i.h
+++ b/TAO/tests/IORTable_Locator/simple_test_i.h
@@ -12,7 +12,7 @@ public:
   Simple_Test_i (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index 12f9468712a..78aa32035c0 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -9,6 +9,6 @@ bogus::~bogus()
 }
 
 void
-bogus::noop (void)
+bogus::noop ()
 {
 }
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
index f46dd98bbe7..2a57d43742f 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
@@ -12,7 +12,7 @@ public:
   bogus ();
   virtual ~bogus ();
 
-  virtual void noop (void);
+  virtual void noop ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/IPV6/Hello.cpp
+++ b/TAO/tests/IPV6/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 0f1f28137e0..cbe97d5ccca 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -2,12 +2,12 @@
 
 // Constructor
 
-INS_i::INS_i (void)
+INS_i::INS_i ()
 {
 }
 
 // Destructor
-INS_i::~INS_i (void)
+INS_i::~INS_i ()
 {
 }
 
@@ -19,7 +19,7 @@ INS_i::orb (CORBA::ORB_ptr o)
 }
 
 char *
-INS_i::test_ins (void)
+INS_i::test_ins ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Inside Operation\n"));
diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h
index 20046dac245..5c64e55ab56 100644
--- a/TAO/tests/InterOp-Naming/INS_i.h
+++ b/TAO/tests/InterOp-Naming/INS_i.h
@@ -20,13 +20,13 @@ class INS_i : public POA_INS
 {
 public:
   /// Constructor.
-  INS_i (void);
+  INS_i ();
 
   /// Destructor.
-  ~INS_i (void);
+  ~INS_i ();
 
   /// test the INS.
-  char * test_ins (void);
+  char * test_ins ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
@@ -34,7 +34,6 @@ public:
 private:
   /// ORB pointer.
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* INS_I_H */
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index d8b6c0fc962..2069fc55ca8 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -6,7 +6,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   Server_i server;
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index a77c39dc331..d1dca7f3a99 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -4,20 +4,20 @@
 #include "ace/OS_NS_stdio.h"
 
 // Constructor.
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : ior_output_file_ (0),
     ins_ (0)
 {
 }
 
 // Destructor.
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
 }
 
 // Parse the command-line arguments and set options.
 int
-Server_i::parse_args (void)
+Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
@@ -153,7 +153,7 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   // Run the main event loop for the ORB.
   int result = this->orb_manager_.run ();
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 96dca55b8e1..5a11fc728ac 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -22,10 +22,10 @@ class Server_i
 {
 public:
   /// Constructor.
-  Server_i (void);
+  Server_i ();
 
   /// Destructor.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   int init (int argc,
@@ -35,15 +35,14 @@ public:
   int add_IOR_to_table (CORBA::String_var ior);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 protected:
-
   /// Servant class
   INS_i servant_;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index e7419b54fce..f3f43e49599 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -103,9 +103,8 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
-
       try
         {
           u_long work_from_this_thread = 0;
@@ -173,9 +172,8 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
-
       try
         {
           u_long event_loop_timeout_for_this_thread = 0;
@@ -222,7 +220,6 @@ private:
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 73a7e5f0525..10b2fa7e6dc 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -48,9 +48,8 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
-
       try
         {
           this->orb_->run ();
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index 28473ad2c12..ad20d726c35 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index 36c840e09fb..b89f7ffb683 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -24,7 +24,7 @@ public:
   // = The test interface methods.
   CORBA::ULong method (CORBA::ULong work);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/tests/LongDouble/Global.cpp b/TAO/tests/LongDouble/Global.cpp
index b09e8d927c9..9007c187886 100644
--- a/TAO/tests/LongDouble/Global.cpp
+++ b/TAO/tests/LongDouble/Global.cpp
@@ -1,7 +1,7 @@
 #include "Global.h"
 
 long double
-Global::get_long_double (void)
+Global::get_long_double ()
 {
   return 11777888333.111111109;
 }
diff --git a/TAO/tests/LongDouble/Global.h b/TAO/tests/LongDouble/Global.h
index 5c667cee8c3..bc84dbf9fee 100644
--- a/TAO/tests/LongDouble/Global.h
+++ b/TAO/tests/LongDouble/Global.h
@@ -4,7 +4,7 @@
 class Global
 {
 public:
-  static long double get_long_double (void);
+  static long double get_long_double ();
 };
 
 #endif /* TAO_TEST_GLOBAL_H */
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 74a64d7d924..fbd6a6cff16 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -44,7 +44,7 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-AMI_Manager::shutdown (void)
+AMI_Manager::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -63,7 +63,7 @@ Worker::Worker (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
   try
@@ -134,7 +134,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
 }
 
 void
-Controller_Handler::worker_started (void)
+Controller_Handler::worker_started ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
@@ -156,7 +156,7 @@ Controller_Handler::worker_started_excep
 }
 
 void
-Controller_Handler::worker_finished (void)
+Controller_Handler::worker_finished ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index c5ec6f15903..55783b506ff 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -15,7 +15,7 @@ public:
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
                               Test::Controller_ptr controller);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -56,9 +56,9 @@ public:
                       int *pending_replies);
   // Constructor
 
-  virtual void worker_started (void);
+  virtual void worker_started ();
   virtual void worker_started_excep (::Messaging::ExceptionHolder*);
-  virtual void worker_finished (void);
+  virtual void worker_finished ();
   virtual void worker_finished_excep (::Messaging::ExceptionHolder*);
 
 private:
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 5492961d17c..8df632d681a 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -1,6 +1,6 @@
 #include "Controller.h"
 
-Controller::Controller (void)
+Controller::Controller ()
   :  start_count_ (0)
   ,  finish_count_ (0)
 {
@@ -19,7 +19,7 @@ Controller::dump_results ()
 }
 
 void
-Controller::worker_started (void)
+Controller::worker_started ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->start_count_++;
@@ -28,7 +28,7 @@ Controller::worker_started (void)
 }
 
 void
-Controller::worker_finished (void)
+Controller::worker_finished ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->finish_count_++;
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 5957473e7e4..30150930899 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -7,15 +7,15 @@ class Controller
   : public virtual POA_Test::Controller
 {
 public:
-  Controller (void);
+  Controller ();
   // Constructor
 
-  void dump_results (void);
+  void dump_results ();
   // Print out the results and any errors
 
   // = The skeleton methods
-  virtual void worker_started (void);
-  virtual void worker_finished (void);
+  virtual void worker_started ();
+  virtual void worker_finished ();
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index 4f9923c80fb..c4e19de02a5 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -43,7 +43,7 @@ Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-Manager::shutdown (void)
+Manager::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -61,7 +61,7 @@ Worker::Worker (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
   try
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 8a8c31a580d..6155301c15f 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -16,7 +16,7 @@ public:
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
                               Test::Controller_ptr controller);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index f6ed3bf55db..e5d767ec2d7 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -9,7 +9,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
 }
 
 void
-Manager_Handler::start_workers (void)
+Manager_Handler::start_workers ()
 {
   try
     {
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index dfb8c07e11f..6be848eef64 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -14,7 +14,7 @@ public:
   // Constructor
 
   // = The skeleton methods
-  virtual void start_workers (void);
+  virtual void start_workers ();
   virtual void start_workers_excep (::Messaging::ExceptionHolder *holder);
 
 private:
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index bd620441e42..3293557c49b 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -50,7 +50,6 @@ run_test (Simple_Server_ptr server);
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index ac80f97ad7d..2004d24f72b 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -6,13 +6,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 CORBA::Long
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant\n"));
@@ -22,7 +22,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index fd1ccf73069..937e4700fd9 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -27,18 +27,17 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  CORBA::Long remote_call (void);
+  CORBA::Long remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
 
   CORBA::Long val_;
-
 };
 
 #endif /* TAO_MPROFILE_TEST_I_H */
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index c53a5b09e68..41a117c026c 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -54,7 +54,6 @@ run_test (Simple_Server_ptr server);
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index 5a4aa60200a..ddd48f6c45d 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -7,18 +7,17 @@
 const CORBA::ULong freq = 919263;
 
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    val_ (1)
+  : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   : orb_ (0)
 {
 }
 
 CORBA::ULongLong
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant\n"));
@@ -28,7 +27,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h
index 4f2b57a5b4d..531f5e84bd0 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.h
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h
@@ -27,18 +27,15 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  CORBA::ULongLong remote_call (void);
+  CORBA::ULongLong remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
-
-  CORBA::Long val_;
-
 };
 
 #endif /* TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H */
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 6c708867d65..04f43f17f9c 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -50,7 +50,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   Manager manager;
 
   try
@@ -76,7 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-Manager::Manager (void)
+Manager::Manager ()
   :orb_ (0),
    new_poa_var_ (0)
 {
@@ -143,9 +142,8 @@ Manager::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Manager::activate_servant (void)
+Manager::activate_servant ()
 {
-
   ACE_NEW_THROW_EX (this->servant_locator_,
                     Servant_Locator (this->orb_.in ()),
                     CORBA::NO_MEMORY ());
@@ -170,7 +168,7 @@ Manager::activate_servant (void)
 }
 
 int
-Manager::make_iors_register (void)
+Manager::make_iors_register ()
 {
   // First  server
   CORBA::Object_var object_primary =
@@ -246,7 +244,7 @@ Manager::make_iors_register (void)
 }
 
 int
-Manager::run (void)
+Manager::run ()
 {
   this->orb_->run ();
 
diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h
index 7f6aa4f24a7..08cca3999f3 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.h
+++ b/TAO/tests/MProfile_Forwarding/Manager.h
@@ -6,8 +6,7 @@
 class Manager
 {
   public:
-
-  Manager (void);
+  Manager ();
 
   // Ctor
 
@@ -15,15 +14,15 @@ class Manager
 
   // Initialize the ORB, POA etc.
 
-  int init_register_name_service (void);
+  int init_register_name_service ();
   // Initialize the Name service, tegister the combined IOR with it
 
-  int activate_servant (void);
+  int activate_servant ();
   // Activate the servant etc.
 
-  int make_iors_register (void);
+  int make_iors_register ();
 
-  int run (void);
+  int run ();
   // Run the  ORB event loop..
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index a16d400c48c..78e186910f6 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -32,7 +32,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             const char * /*operation*/,
                             PortableServer::ServantLocator::Cookie & /* cookie */)
 {
-
   CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -55,7 +54,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
   throw PortableServer::ForwardRequest (
     CORBA::Object::_duplicate (
       server.in ()));
-
 }
 
 void
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 336242aaf5d..f664cef6d66 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -36,7 +36,6 @@ run_test (Simple_Server_ptr server);
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 8ae51e821ed..f34b6906615 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -4,13 +4,13 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-Simple_Server_i::Simple_Server_i (void)
+Simple_Server_i::Simple_Server_i ()
   :orb_ (0)
 {
 }
 
 void
-Simple_Server_i::remote_call (void)
+Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Print out from process id (%P) hosting the servant\n"));
@@ -18,7 +18,7 @@ Simple_Server_i::remote_call (void)
 
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h
index d4c5fd07536..10164445f01 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.h
+++ b/TAO/tests/MProfile_Forwarding/test_i.h
@@ -28,16 +28,15 @@ public:
   // ctor
 
   /// ctor
-  Simple_Server_i (void);
+  Simple_Server_i ();
 
   // = The Simple_Server methods.
-  void remote_call (void);
+  void remote_call ();
 
-  void shutdown (void);
+  void shutdown ();
 
  private:
   CORBA::ORB_var orb_;
-
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index 27649c77a50..4f1b86398cc 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -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/MT_BiDir/Client_Task.h b/TAO/tests/MT_BiDir/Client_Task.h
index f0e94c59e2a..cf414bdc1bd 100644
--- a/TAO/tests/MT_BiDir/Client_Task.h
+++ b/TAO/tests/MT_BiDir/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/MT_BiDir/README b/TAO/tests/MT_BiDir/README
index 65299501ffe..3cf8892c585 100644
--- a/TAO/tests/MT_BiDir/README
+++ b/TAO/tests/MT_BiDir/README
@@ -1,10 +1,8 @@
 /**
 
-
-
 @page MT_BiDir Test README File
 
-      This is a stress test that exercises the birectional GIOP
+      This is a stress test that exercises the bidirectional GIOP
 connection implementation with multiple threads in TAO.
 
 To run the test use the run_test.pl script:
@@ -14,6 +12,3 @@ $ ./run_test.pl
 the script returns 0 if the test was successful.
 
 */
-
-
-
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index 900e505506a..751dc660f08 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -1,6 +1,6 @@
 #include "Receiver_i.h"
 
-Receiver_i::Receiver_i (void)
+Receiver_i::Receiver_i ()
   :  message_count_ (0)
   ,  byte_count_ (0)
 {
@@ -16,7 +16,7 @@ Receiver_i::receive_payload (const Receiver::Payload &payload)
 }
 
 CORBA::Long
-Receiver_i::get_event_count (void)
+Receiver_i::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h
index 8f426fb3106..ea27d75337e 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.h
+++ b/TAO/tests/MT_BiDir/Receiver_i.h
@@ -13,11 +13,11 @@ class Receiver_i
 {
 public:
   /// Constructor
-  Receiver_i (void);
+  Receiver_i ();
 
 
   /// Get the number of events that have been received, local method
-  CORBA::Long get_event_count (void);
+  CORBA::Long get_event_count ();
 
   // = The skeleton methods
   virtual void receive_payload (const Receiver::Payload &payload);
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 00b43a9ed7d..262880457aa 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -19,7 +19,7 @@ Sender_i::Sender_i (CORBA::ULong no_clients,
     this->payload_[j] = (j % 256);
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
   delete []this->receivers_;
 }
@@ -49,7 +49,7 @@ Sender_i::receiver_object (Receiver_ptr recv)
 
 
 void
-Sender_i::send_message (void)
+Sender_i::send_message ()
 {
   // NOTE:No synchronization with purpose. Synchrnozing this is
   // going to spoil the whole purpose of this test.
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index a57494d613d..e19766d6b8e 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -20,13 +20,13 @@ public:
   Sender_i (CORBA::ULong no_clients,
             ACE_Manual_Event &event);
 
-  virtual ~Sender_i (void);
+  virtual ~Sender_i ();
 
   // = The skeleton methods
   virtual CORBA::Long receiver_object (Receiver *recv);
 
   /// Public method defined locally
-  void send_message (void);
+  void send_message ();
 
 private:
   /// Synchronizing acces to this class
diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp
index c2919011234..48b6835359c 100644
--- a/TAO/tests/MT_BiDir/Server_Task.cpp
+++ b/TAO/tests/MT_BiDir/Server_Task.cpp
@@ -20,7 +20,7 @@ Server_Task::Server_Task (Sender_i *sender,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Wait for the Event\n"));
 
@@ -30,7 +30,6 @@ Server_Task::svc (void)
   this->event_.wait ();
 
 
-
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n"));
 
 
diff --git a/TAO/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h
index 3a34b55d44c..71c65b4a4c2 100644
--- a/TAO/tests/MT_BiDir/Server_Task.h
+++ b/TAO/tests/MT_BiDir/Server_Task.h
@@ -30,7 +30,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// The sender object
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 58430f8754a..d3840afb384 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index dae352c2acb..2649f1f14be 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -60,7 +60,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (void);
+  void validate_connection ();
   // Validate the connection
 
 private:
@@ -133,7 +133,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (void)
+Client::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -149,7 +149,7 @@ Client::validate_connection (void)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 6bbea2da704..05fd52a0ab6 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -121,7 +121,7 @@ Client::Client (int niterations,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index cca0271c9d0..583c68e2915 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -5,12 +5,12 @@
 #endif /* __ACE_INLINE__ */
 
 void
-Simple_Server_i::test_method (void)
+Simple_Server_i::test_method ()
 {
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
index 5990b2f3642..732e54eaabd 100644
--- a/TAO/tests/MT_Client/test_i.h
+++ b/TAO/tests/MT_Client/test_i.h
@@ -27,9 +27,9 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
-  void test_method (void);
+  void test_method ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
index d0580eec270..1b841896980 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
@@ -7,7 +7,7 @@ Test_Idl_SharedIntf_i::Test_Idl_SharedIntf_i(CORBA::ORB_ptr orb)
 {
 }
 
-Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i(void) {}
+Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i() {}
 
 void Test_Idl_SharedIntf_i::ping ()
 {
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
index 1eca1fcea5e..490b40f7d92 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
@@ -10,9 +10,8 @@
 class  Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf
 {
    public:
-
       Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb);
-      virtual ~Test_Idl_SharedIntf_i (void);
+      virtual ~Test_Idl_SharedIntf_i ();
 
       virtual void ping ();
       virtual void farewell ();
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
index 5c89d60360a..891214d0c96 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
@@ -12,19 +12,19 @@ Chatter::Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mu
 }
 
 long
-Chatter::nreplies (void)
+Chatter::nreplies ()
 {
   return this->nreplies_;
 }
 
 long
-Chatter::nrequests (void)
+Chatter::nrequests ()
 {
   return this->nrequests_;
 }
 
 int
-Chatter::svc (void)
+Chatter::svc ()
 {
   long nrq = -1;
   try
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
index 224dd5a4e2d..e1b5c909ec5 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
@@ -12,8 +12,8 @@ public:
   Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond);
   virtual int svc ();
   int farewell ();
-  long nrequests (void);
-  long nreplies (void);
+  long nrequests ();
+  long nreplies ();
 public:
   volatile long nrequests_;
   volatile long nreplies_;
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
index c9d1484a04b..7e06796e775 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
@@ -6,7 +6,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n"));
   try
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
index cfaaf75e7ec..e6803e01c06 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
@@ -12,7 +12,7 @@ Test_Idl_SharedIntf_i::Test_Idl_SharedIntf_i(CORBA::ORB_ptr orb)
 {
 }
 
-Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i(void) {}
+Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i() {}
 
 void
 Test_Idl_SharedIntf_i::set_upper (const char *ior)
@@ -21,7 +21,7 @@ Test_Idl_SharedIntf_i::set_upper (const char *ior)
 }
 
 void
-Test_Idl_SharedIntf_i::do_upcall (void)
+Test_Idl_SharedIntf_i::do_upcall ()
 {
    ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::do_upcall called\n"));
 
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
index cd7cde57f25..5536154473f 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
@@ -10,14 +10,13 @@
 class  Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf
 {
 public:
-
   Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb);
-  virtual ~Test_Idl_SharedIntf_i (void);
+  virtual ~Test_Idl_SharedIntf_i ();
   void set_upper (const char * ior);
 
-  virtual void do_upcall (void);
-  virtual void ping (void);
-  virtual void farewell (void);
+  virtual void do_upcall ();
+  virtual void ping ();
+  virtual void farewell ();
 private:
   CORBA::String_var upper_ior;
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp
index 78d2941f6f4..7da39d94eb6 100644
--- a/TAO/tests/MT_NoUpcall_Connect/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp
@@ -17,7 +17,7 @@ ACE_Time_Value ping_end (0,0);
 class SharedIntfCB : public POA_Test_Idl::AMI_SharedIntfHandler
 {
 public:
-  void ping (void)
+  void ping ()
   {
     ACE_DEBUG ((LM_DEBUG, "ping returned\n"));
     ping_end = ping_end.now ();
@@ -29,7 +29,7 @@ public:
     ping_end = ping_end.now ();
   }
 
-  void do_upcall (void)
+  void do_upcall ()
   {
     ACE_DEBUG ((LM_DEBUG, "upcall returned\n"));
     upcall_end = upcall_end.now ();
@@ -47,7 +47,6 @@ public:
     ACE_DEBUG ((LM_DEBUG, "exception caught on upcall req\n"));
     upcall_end = upcall_end.now ();
   }
-
 };
 
 
diff --git a/TAO/tests/MT_NoUpcall_Connect/server.cpp b/TAO/tests/MT_NoUpcall_Connect/server.cpp
index f691ae823f2..240e2b73736 100644
--- a/TAO/tests/MT_NoUpcall_Connect/server.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/server.cpp
@@ -13,7 +13,7 @@ CORBA::ORB_var orb_;
 class Worker : public ACE_Task_Base
 {
 public:
-  int svc (void)
+  int svc ()
   {
     ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n"));
     try
@@ -25,7 +25,6 @@ public:
       }
     return 0;
   }
-
 };
 
 int
diff --git a/TAO/tests/MT_Server/README b/TAO/tests/MT_Server/README
index ef81d9ddd33..d5f969fd709 100644
--- a/TAO/tests/MT_Server/README
+++ b/TAO/tests/MT_Server/README
@@ -1,5 +1,3 @@
-
-
 Description:
 
 This is a simple test for a thread-pool server.  It creates a
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 99e4e4bbf33..eed467c5c16 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -138,7 +138,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index 811469bdcca..28032bad85b 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h
index ce21c4429cc..f9db7f0f4a2 100644
--- a/TAO/tests/MT_Server/test_i.h
+++ b/TAO/tests/MT_Server/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 4d22dcf690a..c32815919d0 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -40,9 +40,8 @@ Client_Task::too_big_difference_calls () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
-
   int successful_calls = 0;
   int timed_out_calls = 0;
 
@@ -102,7 +101,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
@@ -118,7 +117,7 @@ Client_Task::validate_connection (void)
 }
 
 int
-Client_Task::one_iteration (void)
+Client_Task::one_iteration ()
 {
   try
     {
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index 9bde5efdf45..7bc86ce3050 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -48,14 +48,14 @@ public:
   int too_big_difference_calls () const;
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Run one iteration of the test
-  int one_iteration (void);
+  int one_iteration ();
 
   /// Make sure that the thread has a connection available
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// A reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 0b0503d31c5..0e0b4169136 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -11,7 +11,7 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/MT_Timeout/Server_Task.h b/TAO/tests/MT_Timeout/Server_Task.h
index 7890d0970e2..0128d2bc480 100644
--- a/TAO/tests/MT_Timeout/Server_Task.h
+++ b/TAO/tests/MT_Timeout/Server_Task.h
@@ -20,7 +20,7 @@ public:
                const ACE_Time_Value &running_time);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index 898b31179ed..ee7114f22ec 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -17,7 +17,7 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds)
 }
 
 void
-Sleep_Service::shutdown (void)
+Sleep_Service::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index bf4021284fa..d5d2f3813f3 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -16,7 +16,7 @@ public:
   // = The skeleton methods
   virtual void go_to_sleep (CORBA::ULong microseconds);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index a1a9569a78b..21e9291f016 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -154,5 +154,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
 
-
-
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
index b8f3f0697ba..9735c5a5d77 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
@@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       test_i_rh_srv.test_handler ().set_reply_handler (rh.in ());
 
       // create and activate test servant
-      Test_i test_i_srv (orb.in (), rh.in (), max_count, mode_flag);
+      Test_i test_i_srv (orb.in (), rh.in (), mode_flag);
 
       id = root_poa->activate_object (&test_i_srv);
 
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
index 2ee2f7a2ada..ccfe718ef5c 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
@@ -14,11 +14,9 @@
 
 Test_i::Test_i (CORBA::ORB_ptr orb,
                 A::AMI_TestHandler_ptr rh,
-                CORBA::ULong max_count,
                 A::RunMode mode)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      rh_ (A::AMI_TestHandler::_duplicate (rh)),
-     max_count_ (max_count),
      mode_(mode)
 {
   time_t _tm = ACE_OS::time ();
@@ -87,7 +85,7 @@ Test_i::report (
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_.in ()))
   {
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
index ef96d582596..ef04a58383f 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
@@ -23,7 +23,6 @@ public:
   /// ctor
   Test_i (CORBA::ORB_ptr orb,
           A::AMI_TestHandler_ptr rh,
-          CORBA::ULong max_count = 10,
           A::RunMode mode = A::RM_SLAVE);
 
   void set_opponent (A::Test_ptr opp);
@@ -36,7 +35,7 @@ public:
   virtual void report (
     const char * msg);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -45,8 +44,6 @@ private:
 
   A::Test_var opponent_;
 
-  CORBA::ULong max_count_;
-
   A::RunMode mode_;
 
   unsigned int seed_;
@@ -117,6 +114,5 @@ private:
 };
 
 
-
 #endif /* TAO_MSAE_TEST_I_H */
 
diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
index e74ef70b9c2..c8a07d39212 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
@@ -29,7 +29,7 @@ public:
     : orb_ (orb)
   {}
 
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 58ba868e616..a28e61db52b 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -11,7 +11,7 @@ Collocation_Tester::Collocation_Tester (CORBA::Object_ptr object)
   this->object_ = CORBA::Object::_duplicate (object);
 }
 
-Collocation_Tester::~Collocation_Tester (void)
+Collocation_Tester::~Collocation_Tester ()
 {
   // No-Op.
 }
@@ -36,7 +36,7 @@ Collocation_Tester::match_answer (const char *actual_answer,
 }
 
 int
-Collocation_Tester::test_top (void)
+Collocation_Tester::test_top ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<TOP>-------------------------------\n")));
@@ -70,7 +70,7 @@ Collocation_Tester::test_top (void)
 }
 
 int
-Collocation_Tester::test_right (void)
+Collocation_Tester::test_right ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n")));
@@ -109,7 +109,7 @@ Collocation_Tester::test_right (void)
 
 
 int
-Collocation_Tester::test_left (void)
+Collocation_Tester::test_left ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<LEFT>-------------------------------\n")));
@@ -149,7 +149,7 @@ Collocation_Tester::test_left (void)
 
 
 int
-Collocation_Tester::test_bottom (void)
+Collocation_Tester::test_bottom ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n")));
@@ -196,7 +196,7 @@ Collocation_Tester::test_bottom (void)
 }
 
 void
-Collocation_Tester::shutdown (void)
+Collocation_Tester::shutdown ()
 {
   Multiple::Top_var top =
     Multiple::Top::_narrow (this->object_.in ());
@@ -215,7 +215,7 @@ Collocation_Tester::shutdown (void)
 }
 
 void
-Collocation_Tester::run (void)
+Collocation_Tester::run ()
 {
   int failure_num =   this->test_top ();
 
diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h
index 891f02233f7..d36740def60 100644
--- a/TAO/tests/Multiple/Collocation_Tester.h
+++ b/TAO/tests/Multiple/Collocation_Tester.h
@@ -27,7 +27,6 @@ struct Quote
 class Collocation_Tester
 {
 public:
-
   // -- Constructor/Destructors --
   Collocation_Tester (CORBA::Object_ptr object);
 
@@ -35,28 +34,27 @@ public:
 
   // -- Command --
   /// Runs the test.
-  void run (void);
+  void run ();
 
 
 private:
-
   // -- Helper Methods --
 
   /// Tests the method accessible thru the
   /// Top interface.
-  int  test_top (void);
+  int  test_top ();
 
   /// Tests the method accessible thru the
   /// Right interface.
-  int test_right (void);
+  int test_right ();
 
   /// Tests the method accessible thru the
   /// Left interface.
-  int test_left (void);
+  int test_left ();
 
   /// Tests the method accessible thru the
   /// Bottom interface.
-  int test_bottom (void);
+  int test_bottom ();
 
   /**
    * This method tests wether the answer obtained
@@ -69,7 +67,7 @@ private:
                      const char *right_answer,
                      const char *method_name);
 
-  void shutdown (void);
+  void shutdown ();
 private:
   CORBA::Object_var object_;
 };
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index 29b3805061f..b63bee32eec 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -10,37 +10,36 @@ Bottom_Impl::Bottom_Impl (CORBA::ORB_ptr orb)
   this->orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-Bottom_Impl::~Bottom_Impl (void)
+Bottom_Impl::~Bottom_Impl ()
 {
-  // No-Op.
 }
 
 char *
-Bottom_Impl::top_quote ( )
+Bottom_Impl::top_quote ()
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
-Bottom_Impl::left_quote ( )
+Bottom_Impl::left_quote ()
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
-Bottom_Impl::right_quote ( )
+Bottom_Impl::right_quote ()
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
-Bottom_Impl::bottom_quote ( )
+Bottom_Impl::bottom_quote ()
 {
   return CORBA::string_dup(Quote::bottom);
 }
 
 void
-Bottom_Impl::shutdown (void)
+Bottom_Impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -55,13 +54,13 @@ Delegated_Bottom_Impl::Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate,
   this->orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
+Delegated_Bottom_Impl::~Delegated_Bottom_Impl ()
 {
   // No-Op.
 }
 
 char *
-Delegated_Bottom_Impl::top_quote (void)
+Delegated_Bottom_Impl::top_quote ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
@@ -72,7 +71,7 @@ Delegated_Bottom_Impl::top_quote (void)
 }
 
 char *
-Delegated_Bottom_Impl::left_quote (void)
+Delegated_Bottom_Impl::left_quote ()
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
@@ -83,7 +82,7 @@ Delegated_Bottom_Impl::left_quote (void)
 }
 
 char *
-Delegated_Bottom_Impl::right_quote (void)
+Delegated_Bottom_Impl::right_quote ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
@@ -94,7 +93,7 @@ Delegated_Bottom_Impl::right_quote (void)
 }
 
 char *
-Delegated_Bottom_Impl::bottom_quote (void)
+Delegated_Bottom_Impl::bottom_quote ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
@@ -105,7 +104,7 @@ Delegated_Bottom_Impl::bottom_quote (void)
 }
 
 void
-Delegated_Bottom_Impl::shutdown (void)
+Delegated_Bottom_Impl::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h
index 5b1ac326083..67a48bce557 100644
--- a/TAO/tests/Multiple/Multiple_Impl.h
+++ b/TAO/tests/Multiple/Multiple_Impl.h
@@ -25,22 +25,21 @@
  */
 class Bottom_Impl : public virtual POA_Multiple::Bottom
 {
-
 public:
   // Ctor-Dtor
   Bottom_Impl (CORBA::ORB_ptr orb);
-  virtual ~Bottom_Impl (void);
+  virtual ~Bottom_Impl ();
 
   // IDL Interface Methods
-  virtual char * top_quote (void);
+  virtual char * top_quote ();
 
-  virtual char * left_quote (void);
+  virtual char * left_quote ();
 
-  virtual char * right_quote (void);
+  virtual char * right_quote ();
 
-  virtual char * bottom_quote (void);
+  virtual char * bottom_quote ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
 };
@@ -57,25 +56,22 @@ private:
  */
 class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom
 {
-
 public:
-
   // Ctor-Dtor
   Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate, CORBA::ORB_ptr orb);
-  virtual ~Delegated_Bottom_Impl (void);
+  virtual ~Delegated_Bottom_Impl ();
 
   // IDL Interface Methods.
-  virtual char * top_quote (void);
-  virtual char * left_quote (void);
-  virtual char * right_quote (void);
-  virtual char * bottom_quote (void);
+  virtual char * top_quote ();
+  virtual char * left_quote ();
+  virtual char * right_quote ();
+  virtual char * bottom_quote ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   Multiple::Bottom_var delegate_;
 
   CORBA::ORB_var orb_;
-
 };
 #endif /* TAO_MULTIPLE_IMPL_H_ */
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index de6f2e48629..bc3da18e0c0 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -3,21 +3,21 @@
 class Multiple_Inheritance_i : public POA_D
 {
 public:
-  Multiple_Inheritance_i (void);
+  Multiple_Inheritance_i ();
 
-  virtual char* method1 (void)
+  virtual char* method1 ()
     {
       return CORBA::string_dup ("method1");
     }
-  virtual char* method2 (void)
+  virtual char* method2 ()
     {
       return CORBA::string_dup ("method2");
     }
-  virtual char* method3 (void)
+  virtual char* method3 ()
     {
       return CORBA::string_dup ("method3");
     }
-  virtual char* method4 (void)
+  virtual char* method4 ()
     {
       return CORBA::string_dup ("method4");
     }
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index aae19ba1755..1a0d87596da 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -6,7 +6,7 @@
 
 static ACE_TCHAR *ior_output_file = 0;
 
-Multiple_Inheritance_i::Multiple_Inheritance_i (void)
+Multiple_Inheritance_i::Multiple_Inheritance_i ()
 {
   // Sun/CC 5.0 crashes if there is no explicit default
   // constructor
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
index 9c89eb5b0f1..d21f93acc63 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
@@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
@@ -19,7 +19,7 @@ Hello::set_string (const char * s)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
index 206dc46fb2c..2d9575e6c4c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
@@ -14,11 +14,11 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
   virtual void set_string (const char * s);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
index 9fb90a86da2..d571ff4a1bd 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
@@ -59,7 +59,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (oneway_call)
         {
-          CORBA::String_var the_string = CORBA::string_dup( "Test" );
+          CORBA::String_var the_string = CORBA::string_dup( "Test");
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client sending string <%C> oneway\n",
                       the_string.in ()));
           hello->set_string (the_string);
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 33cdd24ad25..9865948dd48 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
@@ -70,7 +70,6 @@ public:
   void done ();
 
 private:
-
   // The ORB reference
   CORBA::ORB_var orb_;
   // The exceptions caught.
@@ -174,7 +173,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -202,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/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
index b178b81bafc..b9ff161ef75 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
@@ -50,7 +50,7 @@ Simple_Server_i::test_is_a (const char * /* type */)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h
index b2648bc16e9..0fd34da8e43 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index d8e2e8da78f..4858f270922 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -64,7 +64,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (void);
+  void validate_connection ();
   // Validate the connection
 
 private:
@@ -184,7 +184,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (void)
+Client::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -200,7 +200,7 @@ Client::validate_connection (void)
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 3b27ff909d3..69794be33b0 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -72,7 +72,6 @@ public:
   virtual int svc ();
 
 private:
-
   /// The orb
   CORBA::ORB_var orb_;
 };
@@ -94,11 +93,10 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (void);
+  void validate_connection ();
   // Validate the connection
 
 private:
-
   /// The server.
   Simple_Server_var server_;
 
@@ -210,7 +208,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -234,7 +232,7 @@ SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server,
 }
 
 void
-SelfClient::validate_connection (void)
+SelfClient::validate_connection ()
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -252,7 +250,7 @@ SelfClient::validate_connection (void)
 }
 
 int
-SelfClient::svc (void)
+SelfClient::svc ()
 {
   try
     {
@@ -280,7 +278,6 @@ SelfClient::svc (void)
                     {
                       ACE_DEBUG ((LM_DEBUG,
                                   "(%P|%t)  Not found it\n"));
-
                     }
                   else
                     {
@@ -297,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/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index 913354f274d..e83f527b9cf 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::test_method (CORBA::Long x)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   // We dont shutdown the ORB. We allow the server to go away as it
   // wants.
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h
index ce21c4429cc..f9db7f0f4a2 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.h
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 351c094666b..c4f28592684 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Receiver_ptr receiver,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   Test::Payload payload (this->event_size_);
diff --git a/TAO/tests/Muxing/Client_Task.h b/TAO/tests/Muxing/Client_Task.h
index 6f55129af67..6b621d0ba6d 100644
--- a/TAO/tests/Muxing/Client_Task.h
+++ b/TAO/tests/Muxing/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index 18afcfde8b4..630c1be966d 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -27,14 +27,14 @@ Receiver::receive_data (const Test::Payload &payload)
 }
 
 CORBA::Long
-Receiver::get_event_count (void)
+Receiver::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
 }
 
 void
-Receiver::shutdown (void)
+Receiver::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index 19ccb9cad52..d49be298f12 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -22,13 +22,13 @@ public:
   Receiver (CORBA::ORB_ptr orb);
 
   /// Print out the results
-  void dump_results (void);
+  void dump_results ();
 
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &payload);
-  virtual CORBA::Long get_event_count (void);
+  virtual CORBA::Long get_event_count ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index c0091912959..d23f910e669 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Muxing/Server_Task.h b/TAO/tests/Muxing/Server_Task.h
index 1e2a05604e1..a731a281d3a 100644
--- a/TAO/tests/Muxing/Server_Task.h
+++ b/TAO/tests/Muxing/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index 9f69fba62ea..e57a0724552 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       else
         {
-
           Client_Task client_task (receiver.in (),
 #if defined (ACE_OPENVMS)
                                   750, /* test takes much longer on OpenVMS */
diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp
index dfa3792ac03..d776d22610b 100644
--- a/TAO/tests/Native_Exceptions/test_i.cpp
+++ b/TAO/tests/Native_Exceptions/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::test_raise (CORBA::Long)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Native_Exceptions/test_i.h b/TAO/tests/Native_Exceptions/test_i.h
index a92d86fda64..c4c25e17e76 100644
--- a/TAO/tests/Native_Exceptions/test_i.h
+++ b/TAO/tests/Native_Exceptions/test_i.h
@@ -31,7 +31,7 @@ public:
 
   CORBA::Long test_raise (CORBA::Long x);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index 961ccb58ae5..b684394d4c1 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -17,12 +17,12 @@
 #define MAX_HOP_COUNT 20
 
 // CTOR
-MT_Object_i::MT_Object_i (void)
+MT_Object_i::MT_Object_i ()
 {
 }
 
 // DTOR
-MT_Object_i::~MT_Object_i (void)
+MT_Object_i::~MT_Object_i ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index d1f4783af64..947e14c43f7 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -25,10 +25,10 @@ class MT_Object_i : public POA_MT_Object
 {
 public:
   /// Constructor.
-  MT_Object_i (void);
+  MT_Object_i ();
 
   /// Destructor.
-  virtual ~MT_Object_i (void);
+  virtual ~MT_Object_i ();
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
                              MT_Object_ptr partner);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 03e0d81e9ea..74e9b576e00 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -31,7 +31,7 @@ MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv,
 }
 
 int
-MT_Client_Task::svc (void)
+MT_Client_Task::svc ()
 {
   if (this->mT_Client_.init (this->argc_,
                              this->argv_,
@@ -79,7 +79,7 @@ MT_Client::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 int
-MT_Client::parse_args (void)
+MT_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:g:h:i:n:s:"));
   int c;
@@ -141,7 +141,7 @@ MT_Client::parse_args (void)
 }
 
 int
-MT_Client::run (void)
+MT_Client::run ()
 {
   try
     {
@@ -169,7 +169,7 @@ MT_Client::run (void)
   return 0;
 }
 
-MT_Client::~MT_Client (void)
+MT_Client::~MT_Client ()
 {
   if (this->object_key_ != 0)
     ACE_Allocator::instance ()->free (this->object_key_);
@@ -182,7 +182,6 @@ int
 MT_Client::init (int argc, ACE_TCHAR **argv,
                  int client_number)
 {
-
   // Make a copy of argv since ORB_init will change it.
   this->argc_ = argc;
   this->argv_ = new ACE_TCHAR *[argc];
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index 9f7bc2f1d3f..8828e19463f 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -33,14 +33,13 @@
  */
 class MT_Client
 {
-
 public:
   /// = Constructor and destructor.
-  MT_Client (void);
-  ~MT_Client (void);
+  MT_Client ();
+  ~MT_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc,
@@ -52,7 +51,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
@@ -77,7 +76,6 @@ private:
 
   /// number of loops
   unsigned long iterations_;
-
 };
 
 /**
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 0b8ef63068c..0d911aa049a 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -30,7 +30,7 @@ MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
 }
 
 int
-MT_Server_Task::svc (void)
+MT_Server_Task::svc ()
 {
   if (this->mT_Server_.init (this->argc_,
                              this->argv_,
@@ -75,9 +75,8 @@ MT_Server::read_ior (ACE_TCHAR *filename)
 }
 
 
-
 int
-MT_Server::parse_args (void)
+MT_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:f:g:h:i:n:s:"));
   int c;
@@ -224,7 +223,7 @@ MT_Server::run ()
   return 0;
 }
 
-MT_Server::~MT_Server (void)
+MT_Server::~MT_Server ()
 {
   if (this->object_key_ != 0)
     ACE_OS::free (this->object_key_);
@@ -242,7 +241,7 @@ MT_Server::~MT_Server (void)
 
 
 int
-MT_Server::run_ORB_briefly (void)
+MT_Server::run_ORB_briefly ()
 {
   if (this->iterations_ > 0)
     {
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 35d8be77869..db8bc482cf0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -36,14 +36,12 @@ TAO_END_VERSIONED_NAMESPACE_DECL
  */
 class MT_Server
 {
-
 public:
-
   /// Default constructor
   MT_Server ();
 
   /// Destructor
-  ~MT_Server (void);
+  ~MT_Server ();
 
   /// Initialize the MT_Server state - parsing arguments and ...
   int init (int argc,
@@ -51,17 +49,17 @@ public:
             TAO_ORB_Manager* orb_manager_ptr);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
   /// Just run it briefly
-  int run_ORB_briefly (void);
+  int run_ORB_briefly ();
 
 private:
   /// reading the IOR of mt object in
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Key of the object
   char *object_key_;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 8c4ce3fcc17..9609b0bf950 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -32,7 +32,7 @@ public:
 #endif
   }
 
-  ~TestShutdown (void)
+  ~TestShutdown ()
   {
 #if !defined(ACE_LACKS_UNIX_SIGNALS)
     this->shutdown_.remove_handler (SIGTERM);
@@ -54,13 +54,13 @@ private:
   ACE_Sig_Handler shutdown_;
 };
 
-MT_Object_Server::MT_Object_Server (void)
+MT_Object_Server::MT_Object_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-MT_Object_Server::parse_args (void)
+MT_Object_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:m"));
   int c;
@@ -132,7 +132,7 @@ MT_Object_Server::init (int argc, ACE_TCHAR** argv)
 
 
 int
-MT_Object_Server::run (void)
+MT_Object_Server::run ()
 {
   CORBA::ORB_var orb = this->orb_manager_.orb ();
   TestShutdown killer (orb.in ());
@@ -146,7 +146,7 @@ MT_Object_Server::run (void)
   return 0;
 }
 
-MT_Object_Server::~MT_Object_Server (void)
+MT_Object_Server::~MT_Object_Server ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index 69fd2f6ef20..3a332f35cef 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -33,25 +33,23 @@
  */
 class MT_Object_Server
 {
-
 public:
-
   /// Default constructor
-  MT_Object_Server (void);
+  MT_Object_Server ();
 
   /// Destructor
-  ~MT_Object_Server (void);
+  ~MT_Object_Server ();
 
   /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the IOR of the object A.
   FILE* ior_output_file_;
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 3195d21086d..1f251ce3521 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -19,7 +19,7 @@ class Client_Task
 public:
   Client_Task (client_ptr c,
                server_ptr s);
-  int svc (void);
+  int svc ();
 
 private:
   client_var client_;
@@ -34,7 +34,7 @@ Client_Task::Client_Task (client_ptr c,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 1aa13a59714..d5ef9e815ba 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -15,7 +15,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   Server_Task (CORBA::ORB_ptr orb);
-  int svc (void);
+  int svc ();
 
 private:
   CORBA::ORB_var orb_;
@@ -27,7 +27,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 7c72d7f57aa..80810fe23bb 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -13,8 +13,6 @@ server_i::start (client_ptr c,
 {
   this->client_ = client::_duplicate (c);
   this->ping (time_to_live);
-
-  return;
 }
 
 void
@@ -34,7 +32,7 @@ server_i::ping (CORBA::UShort time_to_live)
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index 6b070844b0b..4d971d90ed0 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -11,7 +11,7 @@ public:
   void start (client_ptr c,
               CORBA::UShort time_to_live);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   int quiet_;
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 3210aa23441..7d64e03ee3c 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -22,7 +22,7 @@ class Client_Task
 public:
   Client_Task (client_ptr c,
                server_ptr s);
-  int svc (void);
+  int svc ();
 
 private:
   client_var client_;
@@ -37,7 +37,7 @@ Client_Task::Client_Task (client_ptr c,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index e19f51f376a..30cc8292da3 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -22,12 +22,12 @@ Initiator_i::Initiator_i (Object_A_ptr object_A_ptr,
 }
 
 // DTOR
-Initiator_i::~Initiator_i (void)
+Initiator_i::~Initiator_i ()
 {
 }
 
 void
-Initiator_i::foo_object_B (void)
+Initiator_i::foo_object_B ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index 9c99bfe59d8..0e8cd6bb58e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -29,9 +29,9 @@ public:
                   Object_B_ptr object_B_ptr);
 
   /// Destructor.
-  virtual ~Initiator_i (void);
+  virtual ~Initiator_i ();
 
-  virtual void foo_object_B (void);
+  virtual void foo_object_B ();
 
 private:
   /// reference to object A
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 787932e6aed..94d48a82e4b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -16,18 +16,17 @@
 #include "ace/Reactor.h"
 
 // CTOR
-Object_A_i::Object_A_i (void)
+Object_A_i::Object_A_i ()
   : finish_two_way_call_ (0)
 {
 }
 
 // DTOR
-Object_A_i::~Object_A_i (void)
+Object_A_i::~Object_A_i ()
 {
 }
 
 
-
 void
 Object_A_i::foo (Initiator_ptr theInitiator_ptr)
 {
@@ -46,14 +45,13 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr)
 }
 
 void
-Object_A_i::finish (void)
+Object_A_i::finish ()
 {
   this->finish_two_way_call_ = 1;
-
 }
 
 void
-Object_A_i::shutdown (void)
+Object_A_i::shutdown ()
 {
   int argc = 0;
   ACE_TCHAR **argv = 0;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 7bd596bfc10..85259bae3c9 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -25,16 +25,16 @@ class Object_A_i : public POA_Object_A
 {
 public:
   /// Constructor.
-  Object_A_i (void);
+  Object_A_i ();
 
   /// Destructor.
-  virtual ~Object_A_i (void);
+  virtual ~Object_A_i ();
 
   virtual void foo (Initiator_ptr theInitiator_ptr);
 
-  virtual void finish (void);
+  virtual void finish ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   unsigned long finish_two_way_call_;
 };
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 0651d0b96d2..99b748b2862 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -16,23 +16,21 @@
 #include "ace/OS_NS_unistd.h"
 
 // CTOR
-Object_B_i::Object_B_i (void)
+Object_B_i::Object_B_i ()
 {
 }
 
 // DTOR
-Object_B_i::~Object_B_i (void)
+Object_B_i::~Object_B_i ()
 {
 }
 
 
-
 void
 Object_B_i::foo (Object_A_ptr theObject_A_ptr)
 {
   try
     {
-
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
 
@@ -44,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)
     {
@@ -54,7 +51,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr)
 }
 
 void
-Object_B_i::shutdown (void)
+Object_B_i::shutdown ()
 {
   int argc = 0;
   ACE_TCHAR **argv = 0;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 2a6f7e93cfd..86e48064f8e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -25,14 +25,14 @@ class Object_B_i : public POA_Object_B
 {
 public:
   /// Constructor.
-  Object_B_i (void);
+  Object_B_i ();
 
   /// Destructor.
-  virtual ~Object_B_i (void);
+  virtual ~Object_B_i ();
 
   virtual void foo(Object_A_ptr theObject_A_ptr);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 #endif /* OBJECT_B_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 079ff88d929..3adc814fe05 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -17,7 +17,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 
-Initiator_Server::Initiator_Server (void)
+Initiator_Server::Initiator_Server ()
   : object_A_key_ (0),
     object_B_key_ (0),
     object_A_var_ (0),
@@ -68,7 +68,7 @@ Initiator_Server::read_ior (ACE_TCHAR *filename, unsigned int A_B)
 
 
 int
-Initiator_Server::parse_args (void)
+Initiator_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:g:"));
   int c, result;
@@ -214,7 +214,7 @@ Initiator_Server::init (int argc,
 
 
 int
-Initiator_Server::run (void)
+Initiator_Server::run ()
 {
   try
     {
@@ -243,7 +243,7 @@ Initiator_Server::run (void)
   return 0;
 }
 
-Initiator_Server::~Initiator_Server (void)
+Initiator_Server::~Initiator_Server ()
 {
   if (this->object_A_key_ != 0)
     ACE_Allocator::instance ()->free (this->object_A_key_);
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index ad059a2ddcc..ba7c39fe1a5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -33,14 +33,12 @@
  */
 class Initiator_Server
 {
-
 public:
-
   /// Default constructor
-  Initiator_Server (void);
+  Initiator_Server ();
 
   /// Destructor
-  ~Initiator_Server (void);
+  ~Initiator_Server ();
 
   /// read in the IOR's for the two objects A and B
   int read_ior (ACE_TCHAR *filename, unsigned int A_B);
@@ -50,11 +48,11 @@ public:
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The IOR of object A
   char * object_A_key_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index 614c3f63ed1..88246d49b64 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -15,13 +15,13 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-Object_A_Server::Object_A_Server (void)
+Object_A_Server::Object_A_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-Object_A_Server::parse_args (void)
+Object_A_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
   int c;
@@ -88,7 +88,7 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (void)
+Object_A_Server::run ()
 {
   int r = this->orb_manager_.run ();
 
@@ -99,7 +99,7 @@ Object_A_Server::run (void)
   return 0;}
 
 
-Object_A_Server::~Object_A_Server (void)
+Object_A_Server::~Object_A_Server ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index b645947bffe..21f8d5ccd18 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -33,25 +33,23 @@
  */
 class Object_A_Server
 {
-
 public:
-
   /// Default constructor
-  Object_A_Server (void);
+  Object_A_Server ();
 
   /// Destructor
-  ~Object_A_Server (void);
+  ~Object_A_Server ();
 
   /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the IOR of the object A.
   FILE* ior_output_file_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 43f07d30a43..0b715c8a5ba 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -15,13 +15,13 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-Object_B_Server::Object_B_Server (void)
+Object_B_Server::Object_B_Server ()
   : ior_output_file_ (0)
 {
 }
 
 int
-Object_B_Server::parse_args (void)
+Object_B_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
   int c;
@@ -87,7 +87,7 @@ Object_B_Server::init (int argc,
 
 
 int
-Object_B_Server::run (void)
+Object_B_Server::run ()
 {
   int result = this->orb_manager_.run ();
 
@@ -99,7 +99,7 @@ Object_B_Server::run (void)
   return 0;
 }
 
-Object_B_Server::~Object_B_Server (void)
+Object_B_Server::~Object_B_Server ()
 {
 }
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index c82d92c6a5e..28f33c1469e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -33,25 +33,23 @@
  */
 class Object_B_Server
 {
-
 public:
-
   /// Default constructor
-  Object_B_Server (void);
+  Object_B_Server ();
 
   /// Destructor
-  ~Object_B_Server (void);
+  ~Object_B_Server ();
 
   /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// File to output the IOR of the object A.
   FILE* ior_output_file_;
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 418f0f450ac..17ecae6352e 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -66,7 +66,6 @@ parse_args (int argc, ACE_TCHAR **argv)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index ab3557f72a5..c4b8128ba99 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -96,7 +96,7 @@ server_i::no_op (client_ptr remote_partner,
 }
 
 void
-server_i::shutdown (void)
+server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -140,7 +140,6 @@ void
 client_i::oneway_no_op (const act &act_for_iterations,
                         const act &act_for_flag)
 {
-
   try
     {
       this->remote_partner_->no_op (self_.in (),
@@ -154,7 +153,7 @@ client_i::oneway_no_op (const act &act_for_iterations,
 }
 
 void
-client_i::twoway_no_op (void)
+client_i::twoway_no_op ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "client_i::twoway_no_op\n"));
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 58d9362d0f7..dbb8a69a574 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -16,7 +16,7 @@ public:
               const act &act_for_iterations,
               const act &act_for_flag);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
@@ -33,7 +33,7 @@ public:
   void oneway_no_op (const act &act_for_iterations,
                      const act &act_for_flag);
 
-  void twoway_no_op (void);
+  void twoway_no_op ();
 
 private:
   server_var remote_partner_;
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index abdf7c27e63..2704f3b026d 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -11,7 +11,7 @@
 class Crasher : public ACE_Event_Handler
 {
 public:
-  Crasher (void);
+  Crasher ();
 
   virtual int handle_timeout (ACE_Time_Value const & current_time,
                               void const * arg);
@@ -39,7 +39,7 @@ Client_Peer::callme(Test::Peer_ptr callback,
 }
 
 void
-Client_Peer::crash(void)
+Client_Peer::crash()
 {
   Crasher * crasher = new Crasher;
 
@@ -49,11 +49,11 @@ Client_Peer::crash(void)
 }
 
 void
-Client_Peer::noop(void)
+Client_Peer::noop()
 {
 }
 
-Crasher::Crasher(void)
+Crasher::Crasher()
 {
 }
 
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
index ffab60484a0..95430ca94e9 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
@@ -17,8 +17,8 @@ public:
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
               Test::Payload const &);
-  void crash(void);
-  void noop(void);
+  void crash();
+  void noop();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
index 8021d09bd0f..090ae91b3ec 100644
--- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
@@ -6,7 +6,7 @@
 #include "Clock_Ticks.h"
 
 long
-Clock_Ticks::get_hz (void)
+Clock_Ticks::get_hz ()
 {
 #if defined(_SC_CLK_TCK)
   long r = ACE_OS::sysconf(_SC_CLK_TCK);
@@ -24,7 +24,7 @@ Clock_Ticks::get_hz (void)
 }
 
 int
-Clock_Ticks::get_usecs_per_tick (void)
+Clock_Ticks::get_usecs_per_tick ()
 {
   return 1000000 / get_hz ();
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
index 1c002d2021a..1bd6e06fc69 100644
--- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
+++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
@@ -9,10 +9,10 @@
 namespace Clock_Ticks
 {
   /// Return the number of clock ticks per second
-  long get_hz (void);
+  long get_hz ();
 
   /// Return the number of microseconds per tick
-  int get_usecs_per_tick (void);
+  int get_usecs_per_tick ();
 }
 
 #endif /* Clock_Ticks__h_ */
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
index 3e47cfa1d28..381072262f8 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
@@ -54,12 +54,12 @@ Server_Peer::callme(Test::Peer_ptr callback,
 }
 
 void
-Server_Peer::crash(void)
+Server_Peer::crash()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-Server_Peer::noop(void)
+Server_Peer::noop()
 {
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
index 5fa7b4f5815..9ae7da6cb14 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
@@ -19,8 +19,8 @@ public:
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
               Test::Payload const & extra_data);
-  void crash(void);
-  void noop(void);
+  void crash();
+  void noop();
 
 private:
   unsigned int seed_;
diff --git a/TAO/tests/Nested_Upcall_Crash/run_test.pl b/TAO/tests/Nested_Upcall_Crash/run_test.pl
index 4ff1960c433..4ead7d21e4a 100755
--- a/TAO/tests/Nested_Upcall_Crash/run_test.pl
+++ b/TAO/tests/Nested_Upcall_Crash/run_test.pl
@@ -110,7 +110,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 15);
+    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($client_status < 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
@@ -119,7 +119,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 15);
+    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($client_status < 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
@@ -127,7 +127,7 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 15);
+    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 15, {self_crash => 1});
     if ($client_status < 0) {
         print STDERR "ERROR: client returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index 80cf170c64d..0bd61bb3908 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -129,7 +129,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 int
-Client::svc (void)
+Client::svc ()
 {
   try
     {
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
index fd5f7c68fb2..bc79e845075 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -6,12 +6,12 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Server_i::test_method (void)
+Simple_Server_i::test_method ()
 {
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
index e9a304aa039..9fd981fa5b1 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
@@ -16,9 +16,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void test_method (void);
+  void test_method ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index 28a4c1b7463..ba67d2f06f7 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -51,7 +51,7 @@ Test_impl::get_vb()
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index 774090a9c7e..072769076e8 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -27,17 +27,15 @@ public:
   /// ctor
   Test_impl (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Any * get_something (
-      CORBA::Boolean need_vb);
+  virtual CORBA::Any * get_something (CORBA::Boolean need_vb);
 
-  virtual OBV_AnyTest::VB * get_vb (void);
+  virtual OBV_AnyTest::VB * get_vb ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
   CORBA::ORB_var orb_;
-  CORBA::Boolean even_;
 };
 
 #endif /* TAO_ANY_S_IMPL_H */
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 4727efe5d5b..4aa7180c268 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -34,7 +34,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
 
       CORBA::ORB_var orb =
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 00417759359..ef1e47b3672 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -12,7 +12,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int result = 0;
   try
@@ -179,7 +179,6 @@ Client_Task::svc (void)
     }
 
   return result;
-
 }
 
 int
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.h b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
index 773795e328a..cc9f65a040f 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
@@ -17,14 +17,13 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void dump_node (BaseNode *bn, int indent);
 
@@ -38,7 +37,6 @@ private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index fd02bf6fec2..a23aab2b223 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -18,7 +18,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index a921535a4eb..e203ccfd62e 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -36,7 +36,7 @@ Test_impl::reflect (TreeController * tc)
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
index 47ea5de756d..32d544194c1 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
@@ -32,7 +32,7 @@ public:
   virtual TreeController * reflect (
       TreeController * tc);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index c0cde67dcba..1fede0aa5cc 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -37,7 +37,7 @@ Value2_init_impl::create (
 }
 
 CORBA::ValueBase *
-Value2_init_impl::create_for_unmarshal (void)
+Value2_init_impl::create_for_unmarshal ()
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 787054cd7c1..28fa755bc27 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -37,20 +37,15 @@ class Value2_impl : public virtual OBV_OBV_FactoryTest::Value2,
 class Value2_init_impl : public OBV_FactoryTest::Value2_init
 {
 public:
-
   virtual OBV_FactoryTest::Value2* create_default (
-      CORBA::ULong id
-      );
+      CORBA::ULong id);
 
   virtual OBV_FactoryTest::Value2* create (
       CORBA::ULong id,
-      const OBV_FactoryTest::BaseValue::BV_Data & data
-      );
+      const OBV_FactoryTest::BaseValue::BV_Data & data);
 
 public:
-
-  virtual CORBA::ValueBase * create_for_unmarshal (void);
-
+  virtual CORBA::ValueBase * create_for_unmarshal ();
 };
 
 #endif /* TAO_FACTORY_FACTORY_C_IMPL_H */
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index 169eaf05e43..711eb446d8e 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -7,7 +7,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 }
 
 OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (void)
+Test_impl::get_base_value ()
 {
   OBV_FactoryTest::BaseValue* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -18,7 +18,7 @@ Test_impl::get_base_value (void)
 }
 
 OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (void)
+Test_impl::get_value1 ()
 {
   OBV_FactoryTest::Value1* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -29,7 +29,7 @@ Test_impl::get_value1 (void)
 }
 
 OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (void)
+Test_impl::get_value2 ()
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_RETURN (ret_val,
@@ -40,7 +40,7 @@ Test_impl::get_value2 (void)
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 8556cc81ebb..c963f4c3fa2 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -27,13 +27,13 @@ public:
   /// ctor
   Test_impl (CORBA::ORB_ptr orb);
 
-  virtual OBV_FactoryTest::BaseValue * get_base_value (void);
+  virtual OBV_FactoryTest::BaseValue * get_base_value ();
 
-  virtual OBV_FactoryTest::Value1 * get_value1 (void);
+  virtual OBV_FactoryTest::Value1 * get_value1 ();
 
-  virtual OBV_FactoryTest::Value2 * get_value2 (void);
+  virtual OBV_FactoryTest::Value2 * get_value2 ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index ad571a516a8..446c475e0b9 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -37,7 +37,7 @@ Test_impl::reflect (TreeController * tc)
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index ddddbe5948f..2dbb5b9fce2 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -30,7 +30,7 @@ public:
   virtual TreeController * reflect (
       TreeController * tc);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
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/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp
index 4174e3ea656..5dd645d342d 100644
--- a/TAO/tests/OBV/Indirection/Factory.cpp
+++ b/TAO/tests/OBV/Indirection/Factory.cpp
@@ -9,14 +9,13 @@ NodeFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-NodeFactory::create_for_unmarshal (void)
+NodeFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::Node,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -24,19 +23,18 @@ void
 BoxedValueFactory::register_new_factory (CORBA::ORB& orb) {
   CORBA::ValueFactoryBase_var mf = new BoxedValueFactory;
   demo::value::idl::boxedValue_var bv (new OBV_demo::value::idl::boxedValue);
-  CORBA::String_var id = bv->_tao_type ()->id ();;
+  CORBA::String_var id = bv->_tao_type ()->id ();
   orb.register_value_factory (id.in (), mf.in ());
 }
 
 CORBA::ValueBase*
-BoxedValueFactory::create_for_unmarshal (void)
+BoxedValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::boxedValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -49,14 +47,13 @@ BaseValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-BaseValueFactory::create_for_unmarshal (void)
+BaseValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::BaseValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -69,14 +66,13 @@ TValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-TValueFactory::create_for_unmarshal (void)
+TValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::TValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
@@ -89,14 +85,13 @@ ConfigValueFactory::register_new_factory (CORBA::ORB& orb) {
 }
 
 CORBA::ValueBase*
-ConfigValueFactory::create_for_unmarshal (void)
+ConfigValueFactory::create_for_unmarshal ()
 {
   ::CORBA::ValueBase *ret_val = 0;
   ACE_NEW_THROW_EX (
       ret_val,
       OBV_demo::value::idl::ConfigValue,
-      ::CORBA::NO_MEMORY ()
-    );
+      ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
diff --git a/TAO/tests/OBV/Indirection/Factory.h b/TAO/tests/OBV/Indirection/Factory.h
index 9ea876feab7..17f21158d02 100644
--- a/TAO/tests/OBV/Indirection/Factory.h
+++ b/TAO/tests/OBV/Indirection/Factory.h
@@ -6,7 +6,7 @@ class NodeFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 
@@ -14,7 +14,7 @@ class BoxedValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 
@@ -22,7 +22,7 @@ class BaseValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 
@@ -30,14 +30,14 @@ class TValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 class ConfigValueFactory : public CORBA::ValueFactoryBase
 {
  public:
   static void register_new_factory(CORBA::ORB& orb);
-  virtual CORBA::ValueBase* create_for_unmarshal(void);
+  virtual CORBA::ValueBase* create_for_unmarshal();
 };
 
 class ConfigValueImpl : public ::OBV_demo::value::idl::ConfigValue
diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp
index 226a4cfd028..78b97b1efd8 100644
--- a/TAO/tests/OBV/Indirection/MessengerClient.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp
@@ -7,9 +7,7 @@ using namespace demo::value::idl;
 const char* IOR = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
 
 int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
-
   try {
-
     CORBA::ORB_var orb = CORBA::ORB_init(ac, av);
 
     NodeFactory::register_new_factory(* orb.in());
@@ -88,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/Indirection/Messenger_i.cpp b/TAO/tests/OBV/Indirection/Messenger_i.cpp
index 09f9d062d83..953d20632d4 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.cpp
+++ b/TAO/tests/OBV/Indirection/Messenger_i.cpp
@@ -64,7 +64,7 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node)
   {
     size_t const len = l.size ();
     size_t i = 0;
-    for ( i = 0; i < len; ++i)
+    for (i = 0; i < len; ++i)
     {
       if (l[i] == x)
         break;
diff --git a/TAO/tests/OBV/Indirection/Messenger_i.h b/TAO/tests/OBV/Indirection/Messenger_i.h
index 14736adccb8..31c99744931 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.h
+++ b/TAO/tests/OBV/Indirection/Messenger_i.h
@@ -36,7 +36,6 @@ protected:
 
 
 
-
 //class NodeImpl : public virtual POA_demo::value::idl::Node
 //class NodeFactory
 //  : public virtual CORBA::ValueFactoryBase
diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
index 9a677c602a9..d453791f561 100644
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ b/TAO/tests/OBV/Simple/Client_i.cpp
@@ -15,8 +15,7 @@ Checkpoint_Client_i::run (const char *name,
 
   // Set random seed
   ACE_Time_Value now (ACE_OS::gettimeofday ());
-  ACE_OS::srand ((unsigned int) now.sec () );
-
+  ACE_OS::srand ((unsigned int) now.sec ());
 
   try
     {
@@ -44,13 +43,13 @@ Checkpoint_Client_i::run (const char *name,
 }
 
 // Constructor.
-Checkpoint_Client_i::Checkpoint_Client_i (void)
+Checkpoint_Client_i::Checkpoint_Client_i ()
 {
   //no-op
 }
 
 //Destructor.
-Checkpoint_Client_i::~Checkpoint_Client_i (void)
+Checkpoint_Client_i::~Checkpoint_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h
index 6796c09fb47..6c900b39414 100644
--- a/TAO/tests/OBV/Simple/Client_i.h
+++ b/TAO/tests/OBV/Simple/Client_i.h
@@ -31,13 +31,13 @@ class Checkpoint_Client_i
 {
 public:
   /// Constructor
-  Checkpoint_Client_i (void);
+  Checkpoint_Client_i ();
 
   /// Destructor
-  virtual ~Checkpoint_Client_i (void);
+  virtual ~Checkpoint_Client_i ();
 
   /// Execute the methods
-  virtual int run (const char *,int, ACE_TCHAR** );
+  virtual int run (const char *,int, ACE_TCHAR**);
 
 private:
   /// Instantiate the checkpoint object.
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index b49d1f116d7..e879bce4c51 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -17,14 +17,14 @@ Event_impl::~Event_impl ()
 }
 
 CORBA::ValueBase*
-Event_impl::_copy_value (void)
+Event_impl::_copy_value ()
 {
   return new Event_impl (this->value_ ());
 }
 
 
 void
-Event_impl::do_print (void)
+Event_impl::do_print ()
 {
   ACE_DEBUG((LM_DEBUG, "(value %d) \n",
              (CORBA::ULong) this->value_()));
@@ -35,7 +35,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (void)
+Event_factory::create_for_unmarshal ()
 {
   return new Event_impl;
 }
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 3bc81eda768..133da704f92 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -12,8 +12,8 @@ class Event_impl : public virtual OBV_Event,
   Event_impl ();
   Event_impl (CORBA::Long value);
   virtual ~Event_impl ();
-  virtual CORBA::ValueBase* _copy_value (void);
-  virtual void do_print (void);
+  virtual CORBA::ValueBase* _copy_value ();
+  virtual void do_print ();
 };
 
 class Event_factory : public CORBA::ValueFactoryBase
@@ -25,7 +25,7 @@ protected:
   virtual ~Event_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal ();
 };
 
 #endif /* OBV_IMPL_H */
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index 1ad1a9cfb8b..602d0f9efab 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -49,7 +49,7 @@ Checkpoint_i::put_event (Event *event)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (void)
+Checkpoint_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nThe Checkpoint server is shutting down\n"));
@@ -59,11 +59,11 @@ Checkpoint_i::shutdown (void)
 }
 
 // Constructor.
-Checkpoint_i::Checkpoint_i (void)
+Checkpoint_i::Checkpoint_i ()
 {
 }
 
 // Destructor.
-Checkpoint_i::~Checkpoint_i (void)
+Checkpoint_i::~Checkpoint_i ()
 {
 }
diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h
index cc38e9d2b6e..138569c7247 100644
--- a/TAO/tests/OBV/Simple/Server_i.h
+++ b/TAO/tests/OBV/Simple/Server_i.h
@@ -20,14 +20,14 @@ class Checkpoint_i : public POA_Checkpoint
 {
 public:
   /// Constructor.
-  Checkpoint_i (void);
+  Checkpoint_i ();
 
   /// Destructor.
-  ~Checkpoint_i (void);
+  ~Checkpoint_i ();
 
   virtual void put_event (Event * e);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 8d9a697ed1e..c8282e111d1 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -13,7 +13,7 @@
 // Constructor.
 
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
     : ior_output_file_ (0)
 {
 }
@@ -21,14 +21,14 @@ Server<Servant>::Server (void)
 // Destructor.
 
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
@@ -125,7 +125,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
     // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -137,7 +137,7 @@ Server<Servant>::run (void)
 }
 
 template <class Servant> int
-Server<Servant>::register_name (void)
+Server<Servant>::register_name ()
 {
   return -1;
 }
@@ -145,7 +145,7 @@ Server<Servant>::register_name (void)
 // Constructor.
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
+Client<InterfaceObj, Var>::Client ()
   : ior_ (0)
 {
   //no-op
@@ -184,7 +184,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename)
 // Parses the command line arguments and returns an error status.
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
+Client<InterfaceObj, Var>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x"));
   int c = 0;
@@ -217,7 +217,7 @@ Client<InterfaceObj, Var>::parse_args (void)
 }
 
 template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
+Client<InterfaceObj, Var>::~Client ()
 {
   ACE_OS::free (this->ior_);
 }
@@ -231,7 +231,6 @@ Client<InterfaceObj, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-
   try
     {
       // Retrieve the ORB.
@@ -260,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)
     {
@@ -275,9 +272,8 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (void)
+Client<InterfaceObj, Var>::obtain_initial_references ()
 {
-
   return 0;
 }
 
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index 6087bf3bd9d..e798140edeb 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -32,10 +32,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -45,10 +45,10 @@ public:
 
   /// After calling <init>, this method will register the server with
   /// the TAO Naming Service using the servant_name passed to <init>.
-  int register_name (void);
+  int register_name ();
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
 protected:
   /// Servant class
@@ -58,7 +58,7 @@ protected:
   const char *name;
 
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// The ORB manager - a helper class for accessing the POA and
   /// registering objects.
@@ -91,10 +91,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
@@ -109,14 +109,14 @@ public:
   void shutdown (int);
 
   /// Initialize naming service
-  int obtain_initial_references (void);
+  int obtain_initial_references ();
 
 protected:
   /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
 //  TAO_Naming_Client namingClient;
   // helper class for getting access to Naming Service.
@@ -144,7 +144,6 @@ protected:
 
   /// Flag for shutting down the server
   int shutdown_;
-
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tests/OBV/Simple/client.cpp b/TAO/tests/OBV/Simple/client.cpp
index 8b8114307c8..78142594b76 100644
--- a/TAO/tests/OBV/Simple/client.cpp
+++ b/TAO/tests/OBV/Simple/client.cpp
@@ -16,5 +16,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return -1;
   else
     return 0;
-
 }
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 9a2e94ade95..11b9d4d4795 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -6,7 +6,7 @@
 
 /* vt_graph_impl */
 
-vt_graph_impl::vt_graph_impl (void)
+vt_graph_impl::vt_graph_impl ()
 {
 }
 
@@ -24,7 +24,7 @@ vt_graph_impl::vt_graph_impl (int num_nodes)
 }
 
 // Get the number of nodes in the vt_graph.
-CORBA::Long vt_graph_impl::size (void)
+CORBA::Long vt_graph_impl::size ()
 {
   return nodes_ ().length ();
 }
@@ -41,7 +41,7 @@ vt_graph_impl::add_node (const char * name)
 
 // Print out information about each node.
 void
-vt_graph_impl::print (void)
+vt_graph_impl::print ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Printing graph data...\n"));
@@ -57,7 +57,7 @@ vt_graph_impl::print (void)
 /* vt_graph_init_impl - factory operations */
 
 Supports_Test::vt_graph *
-vt_graph_init_impl::create (void)
+vt_graph_init_impl::create ()
 {
   vt_graph_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, vt_graph_impl, 0);
@@ -65,7 +65,7 @@ vt_graph_init_impl::create (void)
 }
 
 CORBA::ValueBase *
-vt_graph_init_impl::create_for_unmarshal (void)
+vt_graph_init_impl::create_for_unmarshal ()
 {
   vt_graph_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, vt_graph_impl, 0);
@@ -79,7 +79,7 @@ test_impl::test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
-test_impl::~test_impl (void)
+test_impl::~test_impl ()
 {
 }
 
@@ -118,7 +118,6 @@ void
 test_impl::pass_vt_graph_out (
     Supports_Test::vt_graph_out vt_graph_param)
 {
-
   vt_graph_impl * the_vt_graph = 0;
   ACE_NEW (the_vt_graph, vt_graph_impl (4));
   vt_graph_param = the_vt_graph;
@@ -126,14 +125,12 @@ test_impl::pass_vt_graph_out (
   ACE_ASSERT (vt_graph_param->size () == 4);
   vt_graph_param->add_node ("NEW1");
   ACE_ASSERT (vt_graph_param->size () == 5);
-
 }
 
 void
 test_impl::pass_obj_graph_inout (
     Supports_Test::graph * &graph_param)
 {
-
   ACE_ASSERT (graph_param->size () == 6);
   graph_param->add_node ("NEW3");
   ACE_ASSERT (graph_param->size () == 7);
@@ -143,20 +140,18 @@ void
 test_impl::pass_vt_graph_inout (
     Supports_Test::vt_graph * &vt_graph_param)
 {
-
   ACE_ASSERT (vt_graph_param->size () == 6);
   vt_graph_param->add_node ("NEW3");
   ACE_ASSERT (vt_graph_param->size () == 7);
-
 }
 
 void
-test_impl::start (void)
+test_impl::start ()
 {
 }
 
 void
-test_impl::finish (void)
+test_impl::finish ()
 {
   this->orb_->shutdown (false);
 }
@@ -164,7 +159,7 @@ test_impl::finish (void)
 
 /* node_impl */
 
-node_impl::node_impl (void)
+node_impl::node_impl ()
 {
 }
 
@@ -185,7 +180,6 @@ node_impl::add_edge (Supports_Test::Node * neighbor)
   neighbors_ ().length (neighbors_ ().length () + 1);
   neighbors_ ()[neighbors_ ().length () - 1] = neighbor;
   neighbor->_add_ref ();
-  return;
 }
 
 // Remove the edge from this node to neighbor.
@@ -208,7 +202,7 @@ node_impl::change_weight (CORBA::Long new_weight)
 }
 
 void
-node_impl::print (void)
+node_impl::print ()
 {
   cout << "  Name: " << name_ () << endl;
   cout << "    Weight: " << weight_ () << endl;
@@ -221,7 +215,7 @@ node_impl::print (void)
 /* node_init_impl - factory operations */
 
 Supports_Test::Node *
-node_init_impl::create (void)
+node_init_impl::create ()
 {
   node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
@@ -229,7 +223,7 @@ node_init_impl::create (void)
 }
 
 CORBA::ValueBase *
-node_init_impl::create_for_unmarshal (void)
+node_init_impl::create_for_unmarshal ()
 {
   node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index d17bf34b556..733d5beb0b4 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -11,10 +11,8 @@ class node_impl :
   public virtual OBV_Supports_Test::Node,
   public virtual CORBA::DefaultValueRefCountBase
 {
-
 public:
-
-  node_impl (void);
+  node_impl ();
 
   node_impl (const char * name);
 
@@ -24,18 +22,15 @@ public:
 
   void change_weight (CORBA::Long new_weight);
 
-  void print (void);
-
+  void print ();
 };
 
 class node_init_impl : public Supports_Test::Node_init
 {
-
  public:
+  virtual Supports_Test::Node * create ();
 
-  virtual Supports_Test::Node * create (void);
-
-  virtual CORBA::ValueBase * create_for_unmarshal (void);
+  virtual CORBA::ValueBase * create_for_unmarshal ();
 };
 
 
@@ -44,41 +39,34 @@ class vt_graph_impl :
   public virtual POA_Supports_Test::vt_graph,
   public virtual CORBA::DefaultValueRefCountBase
 {
-
  public:
-
-  vt_graph_impl (void);
+  vt_graph_impl ();
 
   vt_graph_impl (int num_nodes);
 
-  virtual CORBA::Long size (void);
+  virtual CORBA::Long size ();
 
   virtual void add_node (const char * name);
 
-  virtual void print (void);
+  virtual void print ();
 };
 
 class vt_graph_init_impl :
   public Supports_Test::vt_graph_init
 {
-
  public:
+  virtual Supports_Test::vt_graph * create ();
 
-  virtual Supports_Test::vt_graph * create (void);
-
-  virtual CORBA::ValueBase * create_for_unmarshal (void);
-
+  virtual CORBA::ValueBase * create_for_unmarshal ();
 };
 
 class test_impl :
   public virtual POA_Supports_Test::test
 {
-
  public:
-
   test_impl (CORBA::ORB_ptr orb);
 
-  virtual ~test_impl (void);
+  virtual ~test_impl ();
 
   virtual void pass_obj_graph_in (Supports_Test::graph * graph_param);
 
@@ -92,14 +80,12 @@ class test_impl :
 
   virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param);
 
-  virtual void start (void);
+  virtual void start ();
 
-  virtual void finish (void);
+  virtual void finish ();
 
  private:
-
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* TAO_SUPPORTS_TEST_IMPL_H */
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index de74c2e2f51..bce89aa4c2b 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -43,7 +43,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
@@ -124,7 +123,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       for (int i = 0; i < num_trials; i++)
         {
-
           // Create a vt_graph_impl instance and store the reference as a
           // vt_graph_var. Then register the instance with the POA to obtain an
           // object reference, stored as a graph_var. Increment the reference count
@@ -177,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 ();
@@ -187,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/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index ed20848b459..dafdac61f33 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -64,7 +64,7 @@ test_i::get_value (CORBA::Long offset)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h
index 9dddc34fc28..4cc2ef89b94 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.h
+++ b/TAO/tests/OBV/TC_Alignment/test_i.h
@@ -36,7 +36,7 @@ public:
 
   virtual CORBA::Any *get_value (CORBA::Long offset);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index b38e709023f..5789adcda72 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -175,7 +175,7 @@ Test_impl::op5 (const CORBA::Any& val,
 }
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
index 843ed75dfed..1d3210c2ea7 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -31,22 +31,19 @@ public:
         const char * id,
         ::OBV_TruncatableTest::BaseValue * iv,
         ::OBV_TruncatableTest::BaseValue_out ov,
-        char *& desc
-      );
+        char *& desc);
 
   virtual void op2 (
         ::OBV_TruncatableTest::TValue1 * iv,
         const char * id,
         ::OBV_TruncatableTest::TValue1_out ov,
-        char *& desc
-      );
+        char *& desc);
 
   virtual void op3 (
         const char * id,
         ::OBV_TruncatableTest::TValue4 * iv,
         ::OBV_TruncatableTest::TValue4_out ov,
-        char *& desc
-      );
+        char *& desc);
 
   virtual ::OBV_TruncatableTest::BaseValue * op4 (
       const char * id,
@@ -55,16 +52,14 @@ public:
       ::OBV_TruncatableTest::TValue4 * iv2,
       ::OBV_TruncatableTest::TValue4 * iv3,
       ::OBV_TruncatableTest::TValue1 * iv4,
-      char *& desc
-    );
+      char *& desc);
 
   virtual void op5 (const CORBA::Any& val,
                     const char * id,
                     ::OBV_TruncatableTest::TValue1_out ov,
-                    char *& desc
- );
+                    char *& desc);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 1ddcc5470e2..38e1eba22c5 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -258,7 +258,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             caught_expected_exception = true;
           }
 
-        if ( ! caught_expected_exception)
+        if (!caught_expected_exception)
           {
             fail++;
             if (verbose)
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index b3b1d97c0e1..2f7521861a3 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -282,7 +282,7 @@ Test_impl::array_op3 (::VBstringarray * p1,
                       ::VBstringarray *& p2,
                       ::VBstringarray_out p3)
 {
-  long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
+  long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice);
 
   char * p;
   for (long i=0; i<array_len; i++)
@@ -308,7 +308,7 @@ Test_impl::array_op4 (const ::StringArray p1,
                       ::StringArray p2,
                       ::StringArray_out p3)
 {
-  long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
+  long array_len = sizeof(::StringArray) / sizeof( StringArray_slice);
 
   char * p;
   long i;
@@ -326,7 +326,6 @@ Test_impl::array_op4 (const ::StringArray p1,
     }
 
   p3 = sa;
-
 }
 
 
@@ -477,7 +476,7 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1,
 
 
 void
-Test_impl::shutdown (void)
+Test_impl::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h
index c1895e13793..ee148e839ba 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.h
+++ b/TAO/tests/OBV/ValueBox/Test_impl.h
@@ -8,7 +8,6 @@
 //=============================================================================
 
 
-
 #ifndef TAO_TEST_IMPL_H
 #define TAO_TEST_IMPL_H
 
@@ -103,7 +102,7 @@ public:
                           ::Variable_Union1_out p3);
 
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index 506cd15686c..3536051e464 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -55,13 +55,13 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
                     1);
 
     // should be a deep copy of val1...
-    OBV_VERITY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () );
+    OBV_VERITY (&valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout ());
 
     // but values should be equal
     OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // Check that modifier is working.
-    valuebox_clone->_value ( val2 );
+    valuebox_clone->_value (val2);
     OBV_VERITY (!ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // use operator=
@@ -84,7 +84,7 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
 
     // Test _copy_value
     CORBA::ValueBase *copy = valuebox->_copy_value ();
-    OBV_VERITY ( copy != 0 );
+    OBV_VERITY (copy != 0);
     // check add_ref, remove_ref
     copy->_add_ref ();
     copy->_remove_ref ();
@@ -99,7 +99,7 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
     else
       {
         OBV_VERITY (ACE::is_equal (down->_value (), val1));
-        down->_value ( val2 );
+        down->_value (val2);
         OBV_VERITY (!ACE::is_equal (down->_value (), valuebox->_value ()));
         OBV_VERITY (ACE::is_equal (down->_value (), val2));
       }
@@ -125,7 +125,6 @@ int simple_box_test ()
     CORBA::remove_ref (p);
 
     return fail;
-
 }
 
 //
@@ -141,20 +140,20 @@ int box_test_ref (BoxT *valuebox, UT &val1, UT &val2)
                     1);
 
     // should be a deep copy of val1...
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    OBV_VERITY (&p->_boxed_inout () != &valuebox->_boxed_inout ());
 
-    p->_value ( val2 ); // deep copy
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    p->_value (val2); // deep copy
+    OBV_VERITY (&p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     *valuebox = val2;      // deep copy, too.
-    OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () );
+    OBV_VERITY (&p->_boxed_inout () != &valuebox->_boxed_inout () );
 
     CORBA::remove_ref (p);
 
     return fail;
 }
 
-int test_basic (void)
+int test_basic ()
 {
     int fail = 0;
 
@@ -273,7 +272,6 @@ int test_basic_invocations (Test * test_object)
 
     try
       {
-
         //============================================================
         // Test method invocation with boxed value
         //============================================================
@@ -410,7 +408,7 @@ int test_boxed_string()
   vbstring2->_value(svar);
   OBV_VERITY ((*vbstring2)[0] == 'S');
   // test value accessor
-  OBV_VERITY ( (vbstring2->_value())[0] == 'S' );
+  OBV_VERITY ((vbstring2->_value())[0] == 'S');
 
   //
   // Test ctors.
@@ -465,7 +463,6 @@ int test_boxed_string_invocations (Test * test_object)
 
     try
       {
-
         //============================================================
         // Test method invocation with boxed value
         //============================================================
@@ -522,7 +519,7 @@ int test_boxed_string_invocations (Test * test_object)
 //
 // Test boxed sequence types.
 //
-int test_boxed_sequence (void)
+int test_boxed_sequence ()
 {
   int fail = 0;
   try
@@ -583,7 +580,7 @@ int test_boxed_sequence (void)
       OBV_VERITY (vbseqlong4->length() == 0);
 
       // Test copy_value
-      VBseqlong *vbseqlong6 = VBseqlong::_downcast( vbseqlong4->_copy_value() );
+      VBseqlong *vbseqlong6 = VBseqlong::_downcast( vbseqlong4->_copy_value());
       if (vbseqlong6 == 0)
         {
           fail++;
@@ -612,7 +609,6 @@ int test_boxed_sequence (void)
 }
 
 
-
 int test_boxed_sequence_invocations (Test * test_object)
 {
   int fail = 0;
@@ -622,7 +618,6 @@ int test_boxed_sequence_invocations (Test * test_object)
 
   try
     {
-
       //============================================================
       // Test method invocation with boxed value
       //============================================================
@@ -703,7 +698,7 @@ int test_boxed_sequence_invocations (Test * test_object)
 // Test a boxed struct type. This is not templated since the struct
 // members are accessed by name, so this is specific to a certain IDL.
 //
-int test_boxed_struct (void)
+int test_boxed_struct ()
 {
   int fail = 0;
 
@@ -729,8 +724,8 @@ int test_boxed_struct (void)
   VBfixed_struct1_var valuebox2 = valuebox2_ptr;
 
   OBV_VERITY (valuebox1->l () == valuebox2->l ());
-  OBV_VERITY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 );
-  OBV_VERITY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2 );
+  OBV_VERITY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1);
+  OBV_VERITY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2);
 
   // Change an element
   valuebox1->l (505);
@@ -738,9 +733,9 @@ int test_boxed_struct (void)
 
   // Change some more, to test other types.
   (valuebox2->abstruct ()).s1 = 667;
-  OBV_VERITY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1 );
+  OBV_VERITY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1);
   (valuebox2->abstruct ()).s2 = 1667;
-  OBV_VERITY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2 );
+  OBV_VERITY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2);
 
   Fixed_Struct1 *fixed_struct_b = 0;
   ACE_NEW_RETURN (fixed_struct_b,
@@ -802,14 +797,12 @@ int test_boxed_struct (void)
 }
 
 
-
 int test_boxed_struct_invocations (Test * test_object)
 {
   int fail = 0;
 
   try
     {
-
       //============================================================
       // Fixed struct
       // Test method invocation with boxed value
@@ -1026,7 +1019,6 @@ int test_boxed_array()
 }
 
 
-
 int test_boxed_array_invocations (Test * test_object)
 {
   int fail = 0;
@@ -1173,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)
     {
@@ -1273,7 +1264,6 @@ int test_boxed_union()
 
 
 
-
 int test_boxed_union_invocations (Test * test_object)
 {
   int fail = 0;
@@ -1404,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/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 31572c07431..927002b4744 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -100,5 +100,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
   return 0;
-
 }
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
index a9d251e4c5c..644fe350085 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
@@ -21,8 +21,10 @@
 // UIOP
 const ACE_TCHAR argStrA[] = ACE_TEXT ("AAA -ORBGestalt LOCAL -ORBId ORB-A -ORBSvcConf a.conf");
 
+#if defined (DO_1459_SSLIOP_TEST)
 // SSLIOP
 const ACE_TCHAR argStrB[] = ACE_TEXT ("BBB -ORBGestalt LOCAL -ORBId ORB-B -ORBSvcConf b.conf");
+#endif
 
 // UIPMC
 const ACE_TCHAR argStrC[] = ACE_TEXT ("CCC -ORBGestalt LOCAL -ORBId ORB-C -ORBSvcConf m1.conf");
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index fdc3591ca8d..d3911bd2262 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -24,7 +24,7 @@ DllOrb::DllOrb (int nthreads)
 {
 }
 
-DllOrb::~DllOrb ( )
+DllOrb::~DllOrb ()
   throw ()
 {
 #if defined (ACE_HAS_THREADS)
@@ -111,15 +111,14 @@ int DllOrb::init (int argc, ACE_TCHAR *argv[])
 
   this->activate(
                  THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
-                 threadCnt
-                 );
+                 threadCnt);
   mp_barrier->wait ();
 #endif
 
   return 0;
 }
 
-int DllOrb::fini (void)
+int DllOrb::fini ()
 {
   int result;
 
@@ -190,7 +189,7 @@ int DllOrb::fini (void)
   return 0;
 }
 
-int DllOrb::svc (void)
+int DllOrb::svc ()
 {
 #if defined (ACE_HAS_THREADS)
   mp_barrier->wait();
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
index a3082202111..d89675926db 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
@@ -26,7 +26,7 @@ class DllOrb_Export DllOrb
     DllOrb (int nthreads = 1);
 
     /// Destructor.
-    ~DllOrb (void) throw ();
+    ~DllOrb () throw ();
 
     CORBA::ORB_ptr orb () const;
 
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_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
index 1e00a53f757..77c4ceb3290 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
@@ -21,7 +21,7 @@ invoke_service_config (void *arg)
   return 0;
 }
 
-Service_Config_DLL::Service_Config_DLL (void)
+Service_Config_DLL::Service_Config_DLL ()
 {
   ACE_OS::memset (this->directive_[0], 0, BUFSIZ * sizeof (ACE_TCHAR));
   ACE_OS::memset (this->directive_[1], 0, BUFSIZ * sizeof (ACE_TCHAR));
@@ -92,13 +92,13 @@ Service_Config_DLL::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Service_Config_DLL::fini (void)
+Service_Config_DLL::fini ()
 {
   return 0;
 }
 
 int
-Service_Config_DLL::svc (void)
+Service_Config_DLL::svc ()
 {
   if (ACE_Thread_Manager::instance ()->spawn (invoke_service_config,
                                               this->directive_[1]) == -1)
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h
index 535972f7a3e..14dc318497e 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h
@@ -33,9 +33,8 @@
 class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base
 {
 public:
-
   /// Constructor.
-  Service_Config_DLL (void);
+  Service_Config_DLL ();
 
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
@@ -51,11 +50,9 @@ public:
   virtual int svc ();
 
 private:
-
   /// Directives to be passed to be processed by the Service
   /// Configurator in separate threads.
   ACE_TCHAR directive_[2][BUFSIZ];
-
 };
 
 
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index a738fa1f230..969d2a7a1ad 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -99,7 +99,6 @@ testOpenDynamicServices (int , ACE_TCHAR *[])
 
 
 
-
 // @brief Try loading the ORBInitializer_Registry locally
 
 int
@@ -270,7 +269,6 @@ testORBInitializer_Registry (int , ACE_TCHAR *[])
 }
 
 
-
 // @brief ...
 
 
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
index 211d91693b2..b8aea2d7552 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
@@ -13,12 +13,12 @@ Abstract_Worker::Abstract_Worker (const ACE_TCHAR *s)
 }
 
 //
-Abstract_Worker::~Abstract_Worker (void)
+Abstract_Worker::~Abstract_Worker ()
 {
 }
 
 //
-Service_Config_ORB_DLL::Service_Config_ORB_DLL (void)
+Service_Config_ORB_DLL::Service_Config_ORB_DLL ()
   : is_server_ (-1)
   , worker_ (0)
   , argv_ (0)
@@ -26,7 +26,7 @@ Service_Config_ORB_DLL::Service_Config_ORB_DLL (void)
 }
 
 //
-Service_Config_ORB_DLL::~Service_Config_ORB_DLL (void)
+Service_Config_ORB_DLL::~Service_Config_ORB_DLL ()
 {
 }
 
@@ -98,7 +98,7 @@ Service_Config_ORB_DLL::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Service_Config_ORB_DLL::svc (void)
+Service_Config_ORB_DLL::svc ()
 {
   ACE_ASSERT (this->worker_.get () != 0);
   ACE_ASSERT (this->argv_.get () != 0);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
index ec627e5e18e..1977726f118 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
@@ -30,7 +30,7 @@ class Abstract_Worker
 {
 public:
   Abstract_Worker (const ACE_TCHAR *ior);
-  virtual ~Abstract_Worker (void);
+  virtual ~Abstract_Worker ();
   virtual int test_main (int argc,
                     ACE_TCHAR *argv[]) = 0;
   virtual const ACE_TCHAR * kind () const = 0;
@@ -45,7 +45,7 @@ class Server_Worker : public Abstract_Worker
 {
 public:
   Server_Worker ();
-  ~Server_Worker (void);
+  ~Server_Worker ();
   int test_main (int argc, ACE_TCHAR *argv[]);
   const ACE_TCHAR * kind () const;
 
@@ -60,7 +60,7 @@ class Client_Worker : public Abstract_Worker
 {
 public:
   Client_Worker ();
-  ~Client_Worker (void);
+  ~Client_Worker ();
   int test_main (int argc, ACE_TCHAR *argv[]);
   const ACE_TCHAR * kind () const;
 
@@ -78,10 +78,9 @@ class Service_Config_ORB_DLL_Export Service_Config_ORB_DLL
   : public ACE_Task_Base
 {
 public:
-
   /// Constructor.
-  Service_Config_ORB_DLL (void);
-  ~Service_Config_ORB_DLL (void);
+  Service_Config_ORB_DLL ();
+  ~Service_Config_ORB_DLL ();
 
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
index 17607898770..83e6ffe6929 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index db65b94520a..e14fe880855 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -17,7 +17,7 @@ Client_Worker::kind () const
   return ACE_TEXT ("Client");
 }
 
-Client_Worker::~Client_Worker (void)
+Client_Worker::~Client_Worker ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) %@ Client::<dtor>\n", this));
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index a15a9fa9720..9425ff57850 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -19,7 +19,7 @@ Server_Worker::kind () const
 }
 
 //
-Server_Worker::~Server_Worker (void)
+Server_Worker::~Server_Worker ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) %@ Server::<dtor>\n", this));
 }
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index 48d00ac8139..16e74fd89f3 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -26,7 +26,7 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt
     {
     };
 
-  ~ACE_Service_Gestalt_Test (void)
+  ~ACE_Service_Gestalt_Test ()
     {
       if (this->teardown_)
         {
@@ -55,7 +55,7 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt
     return this->repo_->current_size ();
   };
 
-  bool has_same_service_repository ( ACE_Service_Gestalt_Test const * psg)
+  bool has_same_service_repository (ACE_Service_Gestalt_Test const * psg)
   {
     return (this->repo_ == psg->repo_);
   }
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index b27c41c88ee..66a6bc334c9 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -22,7 +22,6 @@ test_with_regular_poa_manager (int argc,
                                int destroy_orb,
                                int destroy_poa)
 {
-
   try
     {
       CORBA::ORB_var orb =
@@ -65,7 +64,6 @@ test_with_funky_poa_manager (int argc,
                              int destroy_poa,
                              int funky_poa_manager)
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
index 22288154860..bdf1fdec49a 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
@@ -5,7 +5,7 @@ Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb)
 {
 }
 
-Foo_Bar::~Foo_Bar (void)
+Foo_Bar::~Foo_Bar ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Shutting down the ORB again\n"));
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h
index 21c0a669204..b5b4963dfb9 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.h
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.h
@@ -14,7 +14,7 @@ public:
   Foo_Bar (CORBA::ORB_ptr orb);
 
   /// Dtor
-  ~Foo_Bar (void);
+  ~Foo_Bar ();
 
 
 private:
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/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index aaa376144d8..304a23bc09b 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -3,20 +3,20 @@
 
 #include "tao/ORB_Constants.h"
 
-ORT_test_IORInterceptor::ORT_test_IORInterceptor (void)
+ORT_test_IORInterceptor::ORT_test_IORInterceptor ()
   : establish_count_ (0),
     components_establish_count_ (0)
 {
 }
 
 char *
-ORT_test_IORInterceptor::name (void)
+ORT_test_IORInterceptor::name ()
 {
   return CORBA::string_dup ("ORT_IORInterceptor");
 }
 
 void
-ORT_test_IORInterceptor::destroy (void)
+ORT_test_IORInterceptor::destroy ()
 {
   ACE_ASSERT (this->establish_count_ > 0
               && this->components_establish_count_ > 0
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index af32bbf24e9..d92afd169f1 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -33,8 +33,7 @@ class ORT_test_IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
-  ORT_test_IORInterceptor (void);
+  ORT_test_IORInterceptor ();
 
   /**
    * @name Methods Required by the IOR Interceptor Interface
@@ -45,10 +44,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -68,11 +67,9 @@ public:
   //@}
 
 private:
-
   CORBA::Long establish_count_;
 
   CORBA::Long components_establish_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 11cab5e8254..49fb852d921 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -6,13 +6,13 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Boolean
-ORT_test_i::request_server (void)
+ORT_test_i::request_server ()
 {
   return 0;
 }
 
 void
-ORT_test_i::shutdown (void)
+ORT_test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h
index 59e81fb7bbd..fca38d4dd19 100644
--- a/TAO/tests/ORT/ORT_test_i.h
+++ b/TAO/tests/ORT/ORT_test_i.h
@@ -21,17 +21,14 @@
 class ORT_test_i : public virtual POA_ObjectReferenceTemplate::ORT_test
 {
 public:
-
   ORT_test_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Boolean request_server (void);
+  virtual CORBA::Boolean request_server ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   CORBA::ORB_var orb_;
-
 };
 
 
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 7bc1831378c..27e9875a85a 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -10,18 +10,17 @@ ObjectReferenceFactory::ObjectReferenceFactory (
 }
 
 ::CORBA::ValueBase *
-ObjectReferenceFactory::_copy_value (void)
+ObjectReferenceFactory::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   ACE_NEW_THROW_EX (
     ret_val,
     ObjectReferenceFactory (old_orf_.inout ()),
-    ::CORBA::NO_MEMORY ()
-  );
+    ::CORBA::NO_MEMORY ());
   return ret_val;
 }
 
-ObjectReferenceFactory::~ObjectReferenceFactory (void)
+ObjectReferenceFactory::~ObjectReferenceFactory ()
 {
   // No need to call CORBA::remove_ref() on this->old_orf_.  It is a
   // "_var" object, meaning that will be done automatically.
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index 7eaa3fce6a6..06a0c3d9ac0 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -42,7 +42,7 @@ class ObjectReferenceFactory
   ObjectReferenceFactory (
     PortableInterceptor::ObjectReferenceFactory * old_orf);
 
-  virtual ::CORBA::ValueBase *_copy_value (void);
+  virtual ::CORBA::ValueBase *_copy_value ();
 
   /**
    * @name PortableInterceptor::ObjectReferenceFactory Methods
@@ -62,7 +62,7 @@ protected:
    * Protected destructor to enforce proper memory management via
    * reference counting.
    */
-  ~ObjectReferenceFactory (void);
+  ~ObjectReferenceFactory ();
 
 private:
   /// The old ObjectReferenceFactory used to create object references.
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index 9840a5ded32..1ec3e480fec 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -15,7 +15,6 @@ void
 ServerORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::Object_var obj =
     info->resolve_initial_references ("POACurrent");
 
diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h
index b5584a4c926..c3fc9ea5c28 100644
--- a/TAO/tests/ORT/ServerORBInitializer.h
+++ b/TAO/tests/ORT/ServerORBInitializer.h
@@ -38,7 +38,6 @@ class ServerORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the ORBInitializer Interface
    *
@@ -55,7 +54,6 @@ public:
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 096d6e628d1..8b08aa66ef1 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -13,13 +13,13 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index 0c80776ebed..5e67b364566 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -48,7 +48,6 @@ class ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ServerRequestInterceptor (const char * orb_id,
                             PortableServer::Current_ptr poa_current);
@@ -63,9 +62,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -84,7 +83,6 @@ public:
   //@}
 
 private:
-
   /// The ORBid of the ORB with which this interceptor is registered.
   CORBA::String_var orb_id_;
 
@@ -95,7 +93,6 @@ private:
    * a child POA, and not the RootPOA.
    */
   PortableServer::Current_var poa_current_;
-
 };
 
 
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 34376b8cde5..582381f75db 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -1,7 +1,7 @@
 #include "Loader.h"
 #include "Test_i.h"
 
-Loader::Loader (void)
+Loader::Loader ()
 {
 }
 
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index a8c70cee8c3..e79c3adc196 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -23,7 +23,7 @@ class OLT_Export Loader : public TAO_Object_Loader
 {
 public:
   /// ctor
-  Loader (void);
+  Loader ();
 
   /// Create a new instance
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 5df62655307..d858a4a5bd0 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -10,13 +10,13 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 }
 
 CORBA::Long
-Test_i::instance_count (void)
+Test_i::instance_count ()
 {
   return Test_i::instance_count_;
 }
 
 void
-Test_i::destroy (void)
+Test_i::destroy ()
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
@@ -26,7 +26,7 @@ Test_i::destroy (void)
 }
 
 PortableServer::POA_ptr
-Test_i::_default_POA (void)
+Test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 25007c7610a..58548678371 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -25,11 +25,11 @@ public:
   /// ctor
   Test_i (PortableServer::POA_ptr poa);
 
-  CORBA::Long instance_count (void);
+  CORBA::Long instance_count ();
 
-  void destroy (void);
+  void destroy ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// The default POA used for this object
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 27798aeba9b..65ad651ab78 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -33,9 +33,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
-
-
   try
     {
       CORBA::ORB_var orb  =
@@ -106,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/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 9dc656d6d0b..6a53f680d96 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -17,7 +17,7 @@ public:
   void DeleteExtra (const ServerSequence &seq);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -73,7 +73,6 @@ ServerServant::CreateExtra (CORBA::ULong len,
 }
 
 
-
 void
 ServerServant::DeleteExtra (const ServerSequence &seq)
 {
@@ -102,7 +101,7 @@ ServerServant::DeleteExtra (const ServerSequence &seq)
 }
 
 void
-ServerServant::shutdown (void)
+ServerServant::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/OctetSeq/README b/TAO/tests/OctetSeq/README
index 972a78fc41f..a22f254c593 100644
--- a/TAO/tests/OctetSeq/README
+++ b/TAO/tests/OctetSeq/README
@@ -1,5 +1,3 @@
-
-
 = server, client
 
 	This test verifies that the optimizations for octet sequences
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index faae9d09299..b1beb06c758 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -6,7 +6,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-Database_i::~Database_i (void)
+Database_i::~Database_i ()
 {
   delete[] this->elements_;
 }
@@ -63,7 +63,7 @@ Database_i::get_crc (Test::Index i)
 }
 
 void
-Database_i::shutdown (void)
+Database_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index cfa06030369..49ccb8b14ed 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -26,7 +26,7 @@ public:
               Test::Index max_range);
 
   /// dtor
-  ~Database_i (void);
+  ~Database_i ();
 
   // = The Simple_Server methods.
   void set (Test::Index i,
@@ -38,7 +38,7 @@ public:
 
   CORBA::ULong get_crc (Test::Index i);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer
diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp
index 5509c723b4c..4d5856ce485 100644
--- a/TAO/tests/Ondemand_Write/Hello.cpp
+++ b/TAO/tests/Ondemand_Write/Hello.cpp
@@ -16,7 +16,7 @@ Hello::get_string (
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 3cee6eba223..a8231962e86 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -20,7 +20,7 @@ public:
     ::CORBA::Long valueb,
     const char * inputb);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 787b2ab6caa..b2532a87e20 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -14,18 +14,18 @@ Oneway_Buffering::receive_data (const Test::Payload &the_payload)
 }
 
 void
-Oneway_Buffering::flush (void)
+Oneway_Buffering::flush ()
 {
 }
 
 void
-Oneway_Buffering::sync (void)
+Oneway_Buffering::sync ()
 {
   this->admin_->flush ();
 }
 
 void
-Oneway_Buffering::shutdown (void)
+Oneway_Buffering::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index e0a2593a1e2..4869811be8e 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -17,11 +17,11 @@ public:
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void sync (void);
+  virtual void sync ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 30685f48631..1c33b35c0c3 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -17,7 +17,7 @@ CORBA::ULong
 Oneway_Buffering_Admin::request_count (CORBA::ULong expected_request_count)
 {
   ACE_Time_Value timeout (timeout_in_sec);
-  while ( (this->request_count_ < expected_request_count)
+  while ((this->request_count_ < expected_request_count)
         && (ACE_Time_Value::zero < timeout) )
     {
       orb_->perform_work (timeout); // Do some work, decreases timeout for amount done.
@@ -29,7 +29,7 @@ CORBA::ULong
 Oneway_Buffering_Admin::bytes_received_count (CORBA::ULong expected_bytes_received_count)
 {
   ACE_Time_Value timeout (timeout_in_sec);
-  while ( (this->bytes_received_count_ < expected_bytes_received_count)
+  while ((this->bytes_received_count_ < expected_bytes_received_count)
         && (ACE_Time_Value::zero < timeout) )
     {
       orb_->perform_work (timeout); // Do some work, decreases timeout for amount done.
@@ -45,12 +45,12 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
 }
 
 void
-Oneway_Buffering_Admin::flush (void)
+Oneway_Buffering_Admin::flush ()
 {
 }
 
 void
-Oneway_Buffering_Admin::shutdown (void)
+Oneway_Buffering_Admin::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index 8942925272f..70f71c799cf 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -20,9 +20,9 @@ public:
 
   virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void);
+  virtual void flush ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index 5bcafb48a2a..47e8bdf21fe 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -67,7 +67,6 @@ Client::init (int argc, ACE_TCHAR* argv[])
     policy_list[1]->destroy ();
 
 
-
     // Timeout with SYNC_SCOPE SYNC_NONE
     Messaging::SyncScope sync_none = Messaging::SYNC_NONE;
     CORBA::Any sync_none_any;
@@ -132,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 ca501d47a9e..86caa6f0a56 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
@@ -78,7 +78,7 @@ Server::Server (int , ACE_TCHAR* argv[])
       PortableServer::POA::_narrow (obj.in ());
     PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
-    ACE_auto_ptr_reset (test_i_, new Test_i (orb_.in()));
+    test_i_.reset (new Test_i (orb_.in()));
     PortableServer::ObjectId_var oid =
       root_poa->activate_object (test_i_.get());
     obj = root_poa->id_to_reference (oid.in());
@@ -187,7 +187,7 @@ Server::shutdown ()
     management_orb_->shutdown (true);
       ACE_OS::sleep (1); // Let management thread clear out
     }
-    ACE_auto_ptr_reset (test_i_, (Test_i*)0);
+    test_i_.reset ((Test_i*)0);
 
     if (!CORBA::is_nil (orb_.in())) {
     orb_->destroy ();
@@ -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/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index a834bb31de2..69ef4e59459 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -301,7 +301,6 @@ namespace
   }
 
 
-
 void reset_buffering (ORB_ptr orb)
 {
   Object_var obj = orb->resolve_initial_references ("PolicyCurrent");
@@ -321,7 +320,6 @@ void reset_buffering (ORB_ptr orb)
 
 int ACE_TMAIN (int ac, ACE_TCHAR *av[])
 {
-
   ACE_Time_Value before = ACE_High_Res_Timer::gettimeofday_hr ();
 
   int num_requests_sent = 0;
@@ -514,7 +512,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
         {
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
           long ms = (after - before).msec ();
-          if ( (use_twoway || !use_sync_scope)
+          if ((use_twoway || !use_sync_scope)
               && request_timeout > 0
               && request_timeout < connect_timeout)
             {
@@ -553,7 +551,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
         {
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
           long ms = (after - before).msec ();
-          if ( (use_twoway || !use_sync_scope)
+          if ((use_twoway || !use_sync_scope)
               && request_timeout > 0
               && request_timeout < connect_timeout)
             {
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index 9c41900337a..ee7ab003514 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -9,8 +9,6 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Reactor.h"
 
-const int TIME_THRESHOLD = 50; //ms
-
 int activate_delay = 0000;
 int run_delay = 00;
 int request_delay = 00;
@@ -29,17 +27,13 @@ class Tester_i
 public:
   Tester_i (CORBA::ORB_ptr orb)
     : orb_ (orb)
-    , id1_ (0)
-    , id2_ (0)
     , count_ (0)
     , failed_ (false)
   {
     this->start_ = ACE_High_Res_Timer::gettimeofday_hr ();
   }
 
-  virtual ~Tester_i ()
-  {
-  }
+  virtual ~Tester_i () = default;
 
   virtual void test (CORBA::Long id)
   {
@@ -137,8 +131,6 @@ public:
 
 private:
   CORBA::ORB_ptr orb_;
-  CORBA::Long id1_;
-  CORBA::Long id2_;
   int count_;
   bool failed_;
   ACE_Time_Value start_;
@@ -157,7 +149,6 @@ using namespace CORBA;
 using namespace PortableServer;
 
 namespace {
-
   void print_usage ()
   {
     //FUZZ: disable check_for_lack_ACE_OS
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 4e00819f0f5..ac119dcc052 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -15,7 +15,7 @@ Client_Task::Client_Task (Test::Sender_ptr reply_gen,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
index 33681d004e0..fa2065ae72b 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
@@ -22,10 +22,9 @@ public:
                Receiver_i * receiver_impl);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   /// Reference to the test interface
   Test::Sender_var sender_;
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index fff3f2968f8..5d9da902030 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -10,12 +10,12 @@ Receiver_i::Receiver_i (CORBA::ORB_ptr orb,
 {
 }
 
-Receiver_i::~Receiver_i (void)
+Receiver_i::~Receiver_i ()
 {
 }
 
 CORBA::Long
-Receiver_i::receive_call (void)
+Receiver_i::receive_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)  Doing a ping...\n"));
@@ -26,13 +26,13 @@ Receiver_i::receive_call (void)
 }
 
 CORBA::Long
-Receiver_i::get_call_count ( /**/)
+Receiver_i::get_call_count ()
 {
   return this->iteration_;
 }
 
 void
-Receiver_i::shutdown (void)
+Receiver_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shutdown...\n"));
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
index 111bf6147bd..1e5f30c10dd 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
@@ -27,15 +27,15 @@ public:
               CORBA::ULong iter);
 
   ///Destructor
-  virtual ~Receiver_i (void);
+  virtual ~Receiver_i ();
 
   // = The skeleton methods
-  virtual CORBA::Long receive_call (void);
+  virtual CORBA::Long receive_call ();
 
   /// Retun the number of calls that every thread would make...
-  virtual CORBA::Long get_call_count (void);
+  virtual CORBA::Long get_call_count ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Number of calls processed so far..
   CORBA::ULong no_calls_;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 3322734f790..5049b6e8426 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -8,7 +8,7 @@ Sender_i::Sender_i (CORBA::ORB_ptr orb,
 {
 }
 
-Sender_i::~Sender_i (void)
+Sender_i::~Sender_i ()
 {
 }
 
@@ -39,13 +39,12 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver)
 }
 
 void
-Sender_i::ping ( /**/)
+Sender_i::ping ()
 {
-  return;
 }
 
 void
-Sender_i::shutdown (void)
+Sender_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shutdown...\n"));
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index 2c045a7d8bd..ba0f87bbdfa 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -27,16 +27,16 @@ public:
             CORBA::ULong no);
 
   ///Destructor
-  virtual ~Sender_i (void);
+  virtual ~Sender_i ();
 
   // = The skeleton methods
   virtual void active_objects (CORBA::Short ao);
 
   virtual void send_ready_message (Test::Receiver_ptr receiver);
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Our local ORB ptr
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index 86260515097..782e097b9a4 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
index b00eef99fbf..48fdbd39930 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
@@ -19,7 +19,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/POA/Adapter_Activator/server.cpp b/TAO/tests/POA/Adapter_Activator/server.cpp
index c3402e28182..7fcbd0d07f0 100644
--- a/TAO/tests/POA/Adapter_Activator/server.cpp
+++ b/TAO/tests/POA/Adapter_Activator/server.cpp
@@ -47,7 +47,6 @@ reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb,
 class Adapter_Activator : public PortableServer::AdapterActivator
 {
 public:
-
   Adapter_Activator (PortableServer::POAManager_ptr poa_manager,
                      CORBA::ORB_ptr orb);
 
@@ -58,7 +57,6 @@ public:
   CORBA::PolicyList second_poa_policies_;
 
 private:
-
   PortableServer::POAManager_var poa_manager_;
   CORBA::ORB_var orb_;
 };
@@ -238,7 +236,6 @@ write_iors_to_file (const char *first_ior,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
index 6035eafe86f..68139aea534 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
@@ -11,7 +11,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
 {
 }
 
-ServantLocator::~ServantLocator (void)
+ServantLocator::~ServantLocator ()
 {
 }
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
index a07b49a3a7b..eef4dec7c8f 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h
@@ -43,7 +43,6 @@ class ServantLocator
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ServantLocator (CORBA::ORB_ptr orb);
 
@@ -62,18 +61,15 @@ public:
 
   bool error_status_;
 protected:
-
   /// Destructor.
-  ~ServantLocator (void);
+  ~ServantLocator ();
 
 private:
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
 
   /// Pointer to the test servant.
   PortableServer::ServantBase_var servant_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
index 11972183323..1e5fe385f82 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "tao/ORB_Constants.h"
 #include "Server_Request_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
index 0d3727d732e..01220953a95 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h
@@ -35,14 +35,12 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
index 8a9a3a32d87..6c6975dad68 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
@@ -5,22 +5,22 @@ CORBA::Boolean receive_request_called = 0;
 CORBA::Boolean ending_interception_point_called = 0;
 
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("");  // Anonymous
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
index ef2db8c3735..d75c1105ebe 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h
@@ -42,9 +42,8 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -56,9 +55,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -77,10 +76,8 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
-  ~Server_Request_Interceptor (void);
-
+  ~Server_Request_Interceptor ();
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
index c5df0e47b0c..ebc4ceb0c8d 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -7,12 +7,12 @@ test_i::test_i (CORBA::ORB_ptr orb)
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 void
-test_i::op (void)
+test_i::op ()
 {
   // PortableInterceptor::ServerRequestInterceptor::receive_request()
   // should have been invoked.
@@ -28,7 +28,7 @@ test_i::op (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.h b/TAO/tests/POA/Bug_1592_Regression/test_i.h
index fbf26abe348..bab87491665 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.h
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.h
@@ -27,25 +27,21 @@ class test_i
   : public virtual POA_test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::ORB_ptr orb);
 
-  virtual void op (void);
+  virtual void op ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 protected:
-
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
 private:
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
index a0a1aa657cf..40efbd8d9b2 100644
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp
@@ -22,14 +22,13 @@ class test_i :
   public virtual POA_test
 {
 public:
-
   test_i (PortableServer::POA_ptr poa);
 
-  void normal (void);
+  void normal ();
 
-  void exceptional (void);
+  void exceptional ();
 
-  void notexisting (void);
+  void notexisting ();
 
   PortableServer::POA_var poa_;
 };
@@ -40,19 +39,19 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::normal (void)
+test_i::normal ()
 {
   ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
 }
 
 void
-test_i::exceptional (void)
+test_i::exceptional ()
 {
   ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
 }
 
 void
-test_i::notexisting (void)
+test_i::notexisting ()
 {
   ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
 }
@@ -61,7 +60,6 @@ class Servant_Locator :
   public PortableServer::ServantLocator
 {
 public:
-
   Servant_Locator (PortableServer::POA_ptr poa);
 
   ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
@@ -133,7 +131,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
   ACE_DEBUG ((LM_DEBUG,
               "Servant_Locator::postinvoke for %C.%C\n",
               name.in (), op ));
-
 }
 
 int
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index f17155b7a59..66018b024cc 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -19,7 +19,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index 79999c36573..ffde543eed5 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -6,12 +6,12 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/Null_Mutex.h"
 
-DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void)
+DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc ()
   //  : DATABASE_MALLOC ()
 {
 }
 
-DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void)
+DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc ()
 {
   this->remove ();
 }
@@ -30,7 +30,7 @@ DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
     PortableServer::Current::_narrow (obj.in ());
 }
 
-DatabaseImpl::Entry::~Entry (void)
+DatabaseImpl::Entry::~Entry ()
 {
 }
 
@@ -106,7 +106,7 @@ DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Entry::_default_POA (void)
+DatabaseImpl::Entry::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -118,11 +118,10 @@ DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb,
     common_servant_ (orb,
                      poa)
 {
-
   this->poa_->set_servant (&this->common_servant_);
 }
 
-DatabaseImpl::Agent::~Agent (void)
+DatabaseImpl::Agent::~Agent ()
 {
 }
 
@@ -262,13 +261,13 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
 }
 
 void
-DatabaseImpl::Agent::shutdown (void)
+DatabaseImpl::Agent::shutdown ()
 {
   this->orb_->shutdown ();
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Agent::_default_POA (void)
+DatabaseImpl::Agent::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -304,7 +303,7 @@ DatabaseImpl::Employee::Employee (const char* name,
   this->name (name);
 }
 
-DatabaseImpl::Employee::~Employee (void)
+DatabaseImpl::Employee::~Employee ()
 {
   DATABASE::instance ()->free (this->name_);
 }
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index 309adea7bbd..a097500c96c 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -14,15 +14,14 @@
 class DatabaseImpl
 {
 public:
-
   //typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> DATABASE_MALLOC;
   typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> DATABASE_MALLOC;
 
   class Simpler_Database_Malloc : public DATABASE_MALLOC
   {
   public:
-    Simpler_Database_Malloc (void);
-    ~Simpler_Database_Malloc (void);
+    Simpler_Database_Malloc ();
+    ~Simpler_Database_Malloc ();
   };
 
   typedef ACE_Singleton<Simpler_Database_Malloc, ACE_Null_Mutex> DATABASE;
@@ -34,7 +33,7 @@ public:
   public:
     Entry (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa);
-    ~Entry (void);
+    ~Entry ();
 
     virtual void invoke (CORBA::ServerRequest_ptr request);
     // The invoke() method receives requests issued to any CORBA
@@ -47,7 +46,7 @@ public:
     // a POA_ptr as input parameters and returns a valid RepositoryId
     // representing the most-derived interface for that oid.
 
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
     // Returns the default POA for this servant.
 
     virtual void is_a (CORBA::ServerRequest_ptr request);
@@ -69,7 +68,7 @@ public:
   public:
     Agent (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa);
-    ~Agent (void);
+    ~Agent ();
 
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
@@ -81,9 +80,9 @@ public:
     virtual void destroy_entry (const char *key,
                                 const char *entry_type);
 
-    virtual void shutdown (void);
+    virtual void shutdown ();
 
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
     // Returns the default POA for this servant.
 
   protected:
diff --git a/TAO/tests/POA/DSI/client.cpp b/TAO/tests/POA/DSI/client.cpp
index 2647416cc9c..589b90aa958 100644
--- a/TAO/tests/POA/DSI/client.cpp
+++ b/TAO/tests/POA/DSI/client.cpp
@@ -64,7 +64,7 @@ parse_args (int argc, ACE_TCHAR **argv)
 }
 
 int
-read_IOR_from_file (void)
+read_IOR_from_file ()
 {
   // Open the file for reading.
   ACE_HANDLE f_handle =
@@ -95,7 +95,6 @@ read_IOR_from_file (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   char str [255];
   // Initialize the ORB
   try
diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp
index 437ea3794b4..bf94db7344f 100644
--- a/TAO/tests/POA/DSI/server.cpp
+++ b/TAO/tests/POA/DSI/server.cpp
@@ -74,7 +74,6 @@ write_iors_to_file (const char *first_ior)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp
index 1f1a0cbf0a9..465a1bb2de4 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.cpp
+++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp
@@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index f802f09dd1d..05cf2daf9bf 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -14,7 +14,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index f3a54ca0129..b1054c535d5 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -132,7 +132,6 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp
index 141af0dbd9e..dfdc1f3496b 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.cpp
+++ b/TAO/tests/POA/Default_Servant2/File_i.cpp
@@ -29,12 +29,12 @@ FileImpl::System::System (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
   poa->set_servant (&this->fd_servant_);
 }
 
-FileImpl::System::~System (void)
+FileImpl::System::~System ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (void)
+FileImpl::System::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -79,7 +79,7 @@ FileImpl::System::open (const char *file_name,
 }
 
 void
-FileImpl::System::shutdown (void)
+FileImpl::System::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -90,19 +90,19 @@ FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa)
 {
 }
 
-FileImpl::Descriptor::~Descriptor (void)
+FileImpl::Descriptor::~Descriptor ()
 {
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (void)
+FileImpl::Descriptor::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (void)
+FileImpl::Descriptor::fd ()
 {
   //
   // One way of getting our id.
@@ -202,7 +202,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (void)
+FileImpl::Descriptor::destroy ()
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd ();
diff --git a/TAO/tests/POA/Default_Servant2/File_i.h b/TAO/tests/POA/Default_Servant2/File_i.h
index e7b2c350ee7..5a2faf71ea3 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.h
+++ b/TAO/tests/POA/Default_Servant2/File_i.h
@@ -35,10 +35,10 @@ public:
     Descriptor (PortableServer::POA_ptr poa);
 
     /// Destructor
-    ~Descriptor (void);
+    ~Descriptor ();
 
     /// Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
@@ -50,12 +50,11 @@ public:
                                 CORBA::Long whence);
 
     /// closes the file corresponding to the requested ObjectID
-    virtual void destroy (void);
+    virtual void destroy ();
 
   private:
-
     /// Extracts the ACE_HANDLE from the objectID
-    ACE_HANDLE fd (void);
+    ACE_HANDLE fd ();
 
     PortableServer::POA_var poa_;
   };
@@ -74,17 +73,17 @@ public:
             PortableServer::POA_ptr poa);
 
     ///Destructor
-    ~System (void);
+    ~System ();
 
     ///Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (void);
+    PortableServer::POA_ptr _default_POA ();
 
     /// Opens a file ,creates a Descriptor reference with the
     /// ACE_HANDLE and returns that reference
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags);
 
-    void shutdown (void);
+    void shutdown ();
   private:
     CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/POA/Default_Servant2/client.cpp b/TAO/tests/POA/Default_Servant2/client.cpp
index 00e10b17a37..0b529812c8f 100644
--- a/TAO/tests/POA/Default_Servant2/client.cpp
+++ b/TAO/tests/POA/Default_Servant2/client.cpp
@@ -67,7 +67,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.cpp
+++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index e73f8c5fd88..6854f0cb1a1 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -294,7 +294,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
     {
-
       Hello *hello_impl;
       ACE_NEW_RETURN (hello_impl,
                       Hello (orb.in ()),
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 37de8d7661e..f1a9f39901e 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -18,11 +18,11 @@
 class test_i : public POA_test
 {
 public:
-  void method ( /**/)
+  void method ()
   {
   }
 
-  ~test_i (void)
+  ~test_i ()
   {
     ACE_DEBUG ((LM_DEBUG, "~test_i called\n"));
   }
@@ -32,11 +32,11 @@ class test_i_with_reference_counting :
   public virtual POA_test
 {
 public:
-  void method (void)
+  void method ()
   {
   }
 
-  ~test_i_with_reference_counting (void)
+  ~test_i_with_reference_counting ()
   {
     ACE_DEBUG ((LM_DEBUG, "~test_i_with_reference_counting called\n"));
   }
@@ -100,7 +100,6 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 00f53cac6ce..b40a5a546cc 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -18,9 +18,9 @@
 class test_i : public POA_test
 {
 public:
-  void deactivate_self (void);
+  void deactivate_self ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   PortableServer::POA_var poa_;
 
@@ -28,13 +28,13 @@ public:
 };
 
 PortableServer::POA_ptr
-test_i::_default_POA ( /**/)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::deactivate_self (void)
+test_i::deactivate_self ()
 {
   this->poa_->deactivate_object (this->id_);
 
@@ -94,7 +94,6 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   ACE_ASSERT (expected_exception_raised);
 
 
-
   poa->activate_object_with_id (id,
                                 &servant);
 
@@ -140,13 +139,11 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
   // ACE_ASSERT dissappears in non-debug builds
   ACE_UNUSED_ARG (expected_exception_raised);
-
 }
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/FindPOA/FindPOA.cpp b/TAO/tests/POA/FindPOA/FindPOA.cpp
index 609dd992db1..e09ec1cb2da 100644
--- a/TAO/tests/POA/FindPOA/FindPOA.cpp
+++ b/TAO/tests/POA/FindPOA/FindPOA.cpp
@@ -45,7 +45,6 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   // Initialize the ORB
   try
     {
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.cpp b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
index 51be53d4109..2c107d09894 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
@@ -29,7 +29,7 @@ ServantActivator::etherealize (const PortableServer::ObjectId &,
 }
 
 void
-ServantActivator::forward_requests (void)
+ServantActivator::forward_requests ()
 {
   if (CORBA::is_nil (this->forward_to_.in ()))
     throw test::Cannot_Forward ();
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.h b/TAO/tests/POA/Forwarding/Servant_Activator.h
index d5e18a9e2f6..5c6414e12af 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.h
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.h
@@ -41,7 +41,7 @@ public:
                             CORBA::Boolean remaining_activations);
 
   /// Object should be forwarded from now on.
-  void forward_requests (void);
+  void forward_requests ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/POA/Forwarding/client.cpp b/TAO/tests/POA/Forwarding/client.cpp
index 45d1fc3755e..02356b5ad39 100644
--- a/TAO/tests/POA/Forwarding/client.cpp
+++ b/TAO/tests/POA/Forwarding/client.cpp
@@ -88,7 +88,6 @@ do_calls (test_ptr test)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB
diff --git a/TAO/tests/POA/Forwarding/test_i.cpp b/TAO/tests/POA/Forwarding/test_i.cpp
index 23134929959..dd47e8a2326 100644
--- a/TAO/tests/POA/Forwarding/test_i.cpp
+++ b/TAO/tests/POA/Forwarding/test_i.cpp
@@ -14,13 +14,13 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Long
-test_i::doit (void)
+test_i::doit ()
 {
   return this->value_++;
 }
 
 void
-test_i::forward (void)
+test_i::forward ()
 {
   this->activator_.forward_requests ();
 
@@ -32,13 +32,13 @@ test_i::forward (void)
 
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/POA/Forwarding/test_i.h b/TAO/tests/POA/Forwarding/test_i.h
index 65d96ac8ce3..8098fd029fa 100644
--- a/TAO/tests/POA/Forwarding/test_i.h
+++ b/TAO/tests/POA/Forwarding/test_i.h
@@ -22,15 +22,15 @@ public:
                 ServantActivator &activator,
                 CORBA::Long value);
 
-  virtual CORBA::Long doit (void);
+  virtual CORBA::Long doit ();
 
   // Setup forwarding
-  virtual void forward (void);
+  virtual void forward ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 protected:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index c55fa2301cb..66d24818a24 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -103,7 +103,6 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB
diff --git a/TAO/tests/POA/Generic_Servant/test_i.cpp b/TAO/tests/POA/Generic_Servant/test_i.cpp
index 01a1c126ffa..bc4a01965df 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.cpp
+++ b/TAO/tests/POA/Generic_Servant/test_i.cpp
@@ -11,18 +11,18 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
 void
-test_i::oneway_method (void)
+test_i::oneway_method ()
 {
 }
 
@@ -57,7 +57,7 @@ test_i::timed_oneway_method (CORBA::ULong timeout)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/POA/Generic_Servant/test_i.h b/TAO/tests/POA/Generic_Servant/test_i.h
index 85e4a2d6d06..2a41e38bf17 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.h
+++ b/TAO/tests/POA/Generic_Servant/test_i.h
@@ -19,13 +19,13 @@ public:
           PortableServer::POA_ptr poa);
 
   /// Returns the Default POA of this servant
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   /// A twoway operation.
-  void method (void);
+  void method ();
 
   /// A oneway operation.
-  void oneway_method (void);
+  void oneway_method ();
 
   /// A timed twoway operation.
   void timed_method (CORBA::ULong timeout);
@@ -34,7 +34,7 @@ public:
   void timed_oneway_method (CORBA::ULong timeout);
 
   /// Shutdown the ORB
-  void shutdown (void);
+  void shutdown ();
 
   /// Sleep for some time.
   void sleep (CORBA::ULong timeout,
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 63e6e97bcdc..4f386626926 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -18,19 +18,17 @@
 class test_i : public POA_test
 {
 public:
-
   test_i (PortableServer::POA_ptr poa)
     : poa_ (PortableServer::POA::_duplicate (poa))
     {
     }
 
-  PortableServer::POA_ptr _default_POA (void)
+  PortableServer::POA_ptr _default_POA ()
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
 
 protected:
-
   PortableServer::POA_var poa_;
 };
 
@@ -483,7 +481,6 @@ test_poas (CORBA::ORB_ptr orb,
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp
index e567d06fb06..4fea526b473 100644
--- a/TAO/tests/POA/Loader/Servant_Activator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Activator.cpp
@@ -94,5 +94,4 @@ ServantActivator::etherealize (const PortableServer::ObjectId &oid,
     (*servant_garbage_collector_) (oid,
                                    poa,
                                    servant);
-
 }
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index 02631843c12..d349f30162c 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -2,13 +2,13 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : ior_output_file_ (0),
     policies_ (4)
 {
 }
 
-Server_i::~Server_i (void)
+Server_i::~Server_i ()
 {
   delete this->servant_activator_;
   delete this->servant_locator_;
@@ -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)
     {
@@ -209,7 +208,6 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-
   try
     {
       // An Servant Activator object is created which will activate
@@ -257,7 +255,6 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-
   try
     {
       // An Servant Locator object is created which will activate
@@ -305,9 +302,8 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 // The execution process of the server.
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
-
   try
     {
       // Invoke object_to_string on the references created in firstPOA
diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h
index 69901de9fef..fc8944a259f 100644
--- a/TAO/tests/POA/Loader/Server_Manager.h
+++ b/TAO/tests/POA/Loader/Server_Manager.h
@@ -31,10 +31,10 @@ class Server_i
 {
 public:
   /// Initialisation.
-  Server_i (void);
+  Server_i ();
 
   /// Destruction.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialisation of the ORB and poa.
   int init (int argc, ACE_TCHAR **argv);
@@ -56,7 +56,7 @@ public:
   int create_locator (PortableServer::POA_var second_poa);
 
   /// The server is executed.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the input arguments.
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 01f8679bc66..5f562c6fab7 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -21,10 +21,9 @@ class test_i :
   public virtual POA_test
 {
 public:
-
   test_i (PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   PortableServer::POA_var poa_;
 };
@@ -35,17 +34,16 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
 class Task : public ACE_Task_Base
 {
 public:
-
   void object (test_ptr test);
 
-  int svc (void);
+  int svc ();
 
   test_var test_;
 
@@ -61,7 +59,7 @@ Task::object (test_ptr test)
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   this->test_->method ();
   this->test_ =
@@ -76,7 +74,6 @@ class Servant_Locator :
   public PortableServer::ServantLocator
 {
 public:
-
   Servant_Locator (PortableServer::POA_ptr poa);
 
   ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index a3eefb3750b..74c4a3797d3 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -20,15 +20,13 @@ class test_i :
   public virtual POA_test
 {
 public:
-
   test_i (PortableServer::POA_ptr poa);
 
-  ~test_i (void);
+  ~test_i ();
 
-  void method (void);
+  void method ();
 
   PortableServer::POA_var poa_;
-
 };
 
 test_i::test_i (PortableServer::POA_ptr poa)
@@ -39,7 +37,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
               this));
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i destroyed: instance %x\n",
@@ -47,23 +45,21 @@ test_i::~test_i (void)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
 class Object_Activator : public ACE_Task_Base
 {
 public:
-
   Object_Activator (ACE_Thread_Manager &thread_manager,
                     PortableServer::POA_ptr poa);
 
-  int svc (void);
+  int svc ();
 
   ACE_Auto_Event object_activated_;
 
   PortableServer::POA_var poa_;
-
 };
 
 
@@ -75,7 +71,7 @@ Object_Activator::Object_Activator (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Object_Activator::svc (void)
+Object_Activator::svc ()
 {
   try
     {
@@ -107,7 +103,6 @@ class Servant_Activator :
   public PortableServer::ServantActivator
 {
 public:
-
   Servant_Activator (PortableServer::POA_ptr poa);
 
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
@@ -122,7 +117,6 @@ public:
   PortableServer::POA_var poa_;
 
   PortableServer::ObjectId_var id_;
-
 };
 
 Servant_Activator::Servant_Activator (PortableServer::POA_ptr poa)
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
index 0eea1764dec..a2c25fb5368 100644
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ b/TAO/tests/POA/NewPOA/NewPOA.cpp
@@ -66,7 +66,6 @@ print_poa (PortableServer::POA_ptr poa)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // The first step Initialize the ORB
diff --git a/TAO/tests/POA/Non_Retain_System_Id/test.cpp b/TAO/tests/POA/Non_Retain_System_Id/test.cpp
index 301e8aaef1d..7a22cc244e7 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/test.cpp
+++ b/TAO/tests/POA/Non_Retain_System_Id/test.cpp
@@ -20,7 +20,7 @@ class ID_Check_i : public POA_ID_Check
 {
 public:
   ID_Check_i (int num);
-  ~ID_Check_i (void);
+  ~ID_Check_i ();
 
   void set_id (int index, PortableServer::ObjectId_var oid);
 
@@ -46,7 +46,7 @@ ID_Check_i::ID_Check_i (int num)
   oids_ = new PortableServer::ObjectId_var[num];
 }
 
-ID_Check_i::~ID_Check_i (void)
+ID_Check_i::~ID_Check_i ()
 {
   delete [] oids_;
 }
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index f3958139f0c..3e8eb181281 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -21,7 +21,7 @@ class test_i :
 public:
   test_i (test_i *other);
 
-  ~test_i (void);
+  ~test_i ();
 
   test_i *other_;
 };
@@ -31,7 +31,7 @@ test_i::test_i (test_i *other)
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) test_i::~test_i\n"));
 
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 095603ccc8a..30e7e8ea7e8 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -50,7 +50,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (void);
+  void deactivate_self ();
 
 private:
   ACE_Auto_Event &event_;
@@ -62,7 +62,7 @@ test_i::test_i (ACE_Auto_Event &event)
 }
 
 void
-test_i::deactivate_self (void)
+test_i::deactivate_self ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -95,7 +95,7 @@ public:
              PortableServer::Servant servant,
              const ACE_CString &task_id,
              const PortableServer::ObjectId &id);
-  int svc (void);
+  int svc ();
 
 private:
   test_var test_;
@@ -122,7 +122,7 @@ Activator::Activator (test_ptr t,
 }
 
 int
-Activator::svc (void)
+Activator::svc ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for deactivation to complete\n"));
@@ -162,7 +162,7 @@ class Deactivator : public ACE_Task_Base
 {
 public:
   Deactivator (test_ptr t);
-  int svc (void);
+  int svc ();
 
 private:
   test_var test_;
@@ -174,7 +174,7 @@ Deactivator::Deactivator (test_ptr t)
 }
 
 int
-Deactivator::svc (void)
+Deactivator::svc ()
 {
   try
     {
@@ -191,7 +191,6 @@ Deactivator::svc (void)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index 5a99021e652..c016fbdee32 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   int status = 0;
   try
@@ -79,5 +79,4 @@ Client_Task::svc (void)
     }
   corb_->destroy ();
   return status;
-
 }
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
index 92a8355c179..abb02ea2152 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
@@ -14,7 +14,6 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
@@ -22,14 +21,13 @@ public:
                CORBA::Boolean exception);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
   CORBA::Boolean except_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
index acc635e0d36..6ccf83cae0b 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
@@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   if (parse_args (argc,
                   argv) == -1)
     return -1;
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..6f3c5e42c98 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
@@ -43,7 +43,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
@@ -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_Act_Direct_Coll/Server_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
index 81d081c8b6b..067f1780165 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
@@ -13,12 +13,12 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
 }
 
 char *
-test_i::get_string (void)
+test_i::get_string ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
index 685c5de2b5f..33dabade22b 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
@@ -20,11 +20,11 @@ public:
           ACE_thread_t thr_id);
 
   /// A twoway operation.
-  void method (void);
+  void method ();
 
   /// A twoway operation.
   char *
-  get_string (void);
+  get_string ();
 
 protected:
   /// Our ORB.
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
index 99b71879fdd..824161368a6 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -16,8 +16,7 @@
 #include "ace/OS_NS_string.h"
 
 ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
-  : counter_ (0),
-    orb_ (CORBA::ORB::_duplicate (orb))
+  : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
index 87f6f927d3e..1801d1d1e4f 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
@@ -46,8 +46,5 @@ public:
                            PortableServer::Servant the_servant);
 
 private:
-  /// Counter for number of invocations of this.
-  int counter_;
-
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
index 252da700f7b..0d892a9bcc6 100644
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/server.cpp
@@ -97,7 +97,6 @@ write_iors_to_file (const char *first_ior,
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
@@ -149,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;
@@ -166,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/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index 130b92172bd..74191316e78 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -21,7 +21,7 @@ ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb)
 }
 
 // Destruction.
-ServantManager_i::~ServantManager_i (void)
+ServantManager_i::~ServantManager_i ()
 {
 }
 
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
index 16aa0032bc6..8aca1431706 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
@@ -48,7 +48,7 @@ public:
   ServantManager_i (CORBA::ORB_ptr orb);
 
   /// Destruction.
-   ~ServantManager_i (void);
+   ~ServantManager_i ();
 
   /**
    * Returns an ObjectId when given an DLL name and the factory method
@@ -108,6 +108,5 @@ public:
    * using the unique ObjectId as key.
    */
   SERVANT_MAP servant_map_;
-
 };
 #endif /* SERVANT_MANAGER_H */
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index b920ffbfda4..45f5412c753 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -2,7 +2,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-Server_i::Server_i(void)
+Server_i::Server_i()
   : ior_output_file_ (0),
     policies_ (4),
     servant_activator_impl_ (0),
@@ -10,7 +10,7 @@ Server_i::Server_i(void)
 {
 }
 
-Server_i::~Server_i(void)
+Server_i::~Server_i()
 {
   delete servant_activator_impl_;
   delete servant_locator_impl_;
@@ -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)
     {
@@ -300,7 +299,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 // The execution process of the server.
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
     {
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
index da3c669f680..3d0500d647c 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
@@ -30,10 +30,10 @@ class Server_i
 {
 public:
   /// Initialisation.
-  Server_i (void);
+  Server_i ();
 
   /// Destruction.
-  ~Server_i (void);
+  ~Server_i ();
 
   /// Initialisation of the ORB and poa.
   int init (int argc, ACE_TCHAR **argv);
@@ -55,7 +55,7 @@ public:
   int create_locator (PortableServer::POA_var second_poa);
 
   /// The server is executed.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the input arguments.
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
index 98fb48a9442..8e06fdad162 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
@@ -63,7 +63,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
index 636bf782c94..ee7da30c48e 100644
--- a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
@@ -63,7 +63,6 @@ print_poa (PortableServer::POA_ptr poa)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // The first step Initialize the ORB
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index fe211b69c9a..614d5b21089 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -16,11 +16,11 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (void);
+  void destroy_poa ();
 };
 
 void
-test_i::destroy_poa (void)
+test_i::destroy_poa ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -33,7 +33,6 @@ test_i::destroy_poa (void)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 52e48de5944..50fc9d3d38c 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -55,7 +55,6 @@ parse_args (int argc, ACE_TCHAR **argv)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 12c2ccf5dbe..06ba954cf45 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -23,17 +23,17 @@ public:
   test_i (CORBA::ORB_ptr orb_ptr,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
 
-  test_ptr create_POA (void);
+  test_ptr create_POA ();
 
-  void destroy_POA (void);
+  void destroy_POA ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 protected:
   CORBA::ORB_var orb_;
@@ -50,7 +50,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("POACurrent");
@@ -70,19 +70,19 @@ test_i::method (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 test_ptr
-test_i::create_POA (void)
+test_i::create_POA ()
 {
   CORBA::PolicyList policies (2);
   policies.length (2);
@@ -137,7 +137,7 @@ test_i::create_POA (void)
 }
 
 void
-test_i::destroy_POA (void)
+test_i::destroy_POA ()
 {
   this->child_poa_->destroy (1, 0);
 }
@@ -201,7 +201,6 @@ write_ior_to_file (const char *ior)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index b47ab82b716..9913ecb6ec3 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -22,7 +22,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/Reference_Counted_Servant/server.cpp b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
index 36da182f180..0746c719904 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
@@ -99,7 +99,6 @@ write_iors_to_file (const char *ior)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index 4cd38026221..cc82214a1fb 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           PortableServer::ServantBase_var srv = poa->id_to_servant (oid.in());
 
           CORBA::ULong refCountAfterIdToServant =
-            srv->_refcount_value ();;
+            srv->_refcount_value ();
 
           ACE_DEBUG ((LM_DEBUG, "After id_to_servant:  %d\n", refCountAfterIdToServant));
 
diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp
index d97f7ab36a9..0d17d787ef5 100644
--- a/TAO/tests/POA/RootPOA/RootPOA.cpp
+++ b/TAO/tests/POA/RootPOA/RootPOA.cpp
@@ -20,7 +20,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initilize the ORB
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index d86e66c9e3f..31b271efa0e 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file     Single_Threaded_POA.cpp
@@ -12,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_unistd.h"
@@ -22,9 +20,9 @@ class test_i : public virtual POA_test
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   PortableServer::POA_var poa_;
@@ -38,7 +36,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Entering Worker::svc from %t and sleeping....\n"));
@@ -67,7 +65,7 @@ test_i::method (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -76,7 +74,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   Worker (test_ptr t);
-  int svc (void);
+  int svc () override;
 
 private:
   test_var test_;
@@ -88,7 +86,7 @@ Worker::Worker (test_ptr t)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
diff --git a/TAO/tests/POA/TIE/server.cpp b/TAO/tests/POA/TIE/server.cpp
index a8611154317..e67aedc6727 100644
--- a/TAO/tests/POA/TIE/server.cpp
+++ b/TAO/tests/POA/TIE/server.cpp
@@ -71,7 +71,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   char str[256];
 
   try
diff --git a/TAO/tests/POA/TIE/test_i.cpp b/TAO/tests/POA/TIE/test_i.cpp
index 4e10342787f..2e4df217e53 100644
--- a/TAO/tests/POA/TIE/test_i.cpp
+++ b/TAO/tests/POA/TIE/test_i.cpp
@@ -19,13 +19,13 @@ Tie_i::Tie_i (CORBA::Long value)
 }
 
 // Destructor
-Tie_i::~Tie_i (void)
+Tie_i::~Tie_i ()
 {
 }
 
 // Return this->value
 CORBA::Long
-Tie_i::doit (void)
+Tie_i::doit ()
 {
   return this->value_;
 }
@@ -40,14 +40,14 @@ A_i::A_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-A_i::doit (void)
+A_i::doit ()
 {
   return this->value_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-A_i::_default_POA (void)
+A_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -62,14 +62,14 @@ Outer_i::B_i::B_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::B_i::doit (void)
+Outer_i::B_i::doit ()
 {
   return this->value_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::B_i::_default_POA (void)
+Outer_i::B_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -84,14 +84,14 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::Inner_i::C_i::doit (void)
+Outer_i::Inner_i::C_i::doit ()
 {
   return this->value_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::Inner_i::C_i::_default_POA (void)
+Outer_i::Inner_i::C_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/POA/TIE/test_i.h b/TAO/tests/POA/TIE/test_i.h
index d79a1ebcd1d..0cdc235ffad 100644
--- a/TAO/tests/POA/TIE/test_i.h
+++ b/TAO/tests/POA/TIE/test_i.h
@@ -20,13 +20,12 @@ public:
   Tie_i (CORBA::Long value);
 
   /// Destructor.
-  virtual ~Tie_i (void);
+  virtual ~Tie_i ();
 
   // Simple doit method
-  virtual CORBA::Long doit (void);
+  virtual CORBA::Long doit ();
 
 protected:
-
   CORBA::Long value_;
 };
 
@@ -38,13 +37,12 @@ public:
        PortableServer::POA_ptr poa);
 
   // Simple doit method
-  virtual CORBA::Long doit (void);
+  virtual CORBA::Long doit ();
 
   // Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 protected:
-
   CORBA::Long value_;
 
   /// Default poa associated with this servant
@@ -54,7 +52,6 @@ protected:
 class Outer_i
 {
 public:
-
   class B_i : public POA_Outer::B
   {
   public:
@@ -63,13 +60,12 @@ public:
          PortableServer::POA_ptr poa);
 
     // Simple doit method
-    virtual CORBA::Long doit (void);
+    virtual CORBA::Long doit ();
 
     // Returns the Default POA of this Servant object
-    virtual PortableServer::POA_ptr _default_POA (void);
+    virtual PortableServer::POA_ptr _default_POA ();
 
   protected:
-
     CORBA::Long value_;
 
     /// Default poa associated with this servant
@@ -79,7 +75,6 @@ public:
   class Inner_i
   {
   public:
-
     class C_i : public POA_Outer::Inner::C
     {
     public:
@@ -88,13 +83,12 @@ public:
            PortableServer::POA_ptr poa);
 
       // Simple doit method
-      virtual CORBA::Long doit (void);
+      virtual CORBA::Long doit ();
 
       // Returns the Default POA of this Servant object
-      virtual PortableServer::POA_ptr _default_POA (void);
+      virtual PortableServer::POA_ptr _default_POA ();
 
     protected:
-
       CORBA::Long value_;
 
       /// Default poa associated with this servant
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index c93b7869de2..b538f64f982 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -15,7 +15,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (void);
+  void destroy_poa ();
 
   void test_poa (PortableServer::POA_ptr poa);
 
@@ -29,7 +29,7 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::destroy_poa (void)
+test_i::destroy_poa ()
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
index 17607898770..83e6ffe6929 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 7bdf685ff97..0eff73b74dd 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -16,9 +16,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 5b596b6eb96..8f44fe95b87 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -20,14 +20,14 @@
 
 size_t Test_Any::counter = 0;
 
-Test_Any::Test_Any (void)
+Test_Any::Test_Any ()
   : opname_ (CORBA::string_dup ("test_any")),
     out_ (new CORBA::Any),
     ret_ (new CORBA::Any)
 {
 }
 
-Test_Any::~Test_Any (void)
+Test_Any::~Test_Any ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -99,7 +99,7 @@ Test_Any::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Any::reset_parameters (void)
+Test_Any::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
   CORBA::ULong index = (counter++ % Test_Any::ANY_LAST_TEST_ITEM);
@@ -273,7 +273,7 @@ Test_Any::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Any::check_validity (void)
+Test_Any::check_validity ()
 {
   CORBA::Short short_in, short_inout, short_out, short_ret;
   const char *str_in;
@@ -462,6 +462,6 @@ Test_Any::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Any::print_values (void)
+Test_Any::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index b0515dfb0ef..80183699b2e 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -22,10 +22,10 @@ class Test_Any
 {
 public:
   /// ctor
-  Test_Any (void);
+  Test_Any ();
 
   /// dtor
-  ~Test_Any (void);
+  ~Test_Any ();
 
   enum
   {
@@ -51,16 +51,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 665479c78e3..6cbb5664177 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -19,7 +19,7 @@ const CORBA::ULong MAX_ARRAYSEQ_LEN = 1;
 //               Test_Bounded_Array_Sequence
 // ************************************************************************
 
-Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence (void)
+Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_array_sequence")),
     inout_ (new Param_Test::Bounded_ArraySeq),
     out_ (new Param_Test::Bounded_ArraySeq),
@@ -27,7 +27,7 @@ Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence (void)
 {
 }
 
-Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence (void)
+Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -102,7 +102,7 @@ Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_Array_Sequence::reset_parameters (void)
+Test_Bounded_Array_Sequence::reset_parameters ()
 {
   // Delete the previous ones.
   this->inout_ = new Param_Test::Bounded_ArraySeq;
@@ -128,13 +128,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_Array_Sequence::check_validity (void)
+Test_Bounded_Array_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -151,7 +150,7 @@ Test_Bounded_Array_Sequence::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_Array_Sequence::print_values (void)
+Test_Bounded_Array_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h
index aa65c023b62..12ebaefa8c0 100644
--- a/TAO/tests/Param_Test/bd_array_seq.h
+++ b/TAO/tests/Param_Test/bd_array_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Array_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Array_Sequence (void);
+  Test_Bounded_Array_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Array_Sequence (void);
+  ~Test_Bounded_Array_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 7354e5c44b6..60354698a60 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_Long_Sequence
 // ************************************************************************
 
-Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence (void)
+Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_long_sequence")),
     in_ (new Param_Test::Bounded_Long_Seq),
     inout_ (new Param_Test::Bounded_Long_Seq),
@@ -26,7 +26,7 @@ Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence (void)
 {
 }
 
-Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence (void)
+Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_Long_Sequence::reset_parameters (void)
+Test_Bounded_Long_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_Long_Seq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_Long_Seq;
@@ -115,13 +115,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_Long_Sequence::check_validity (void)
+Test_Bounded_Long_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -150,7 +149,7 @@ Test_Bounded_Long_Sequence::check_validity (CORBA::Request_ptr req)
 }
 
 void
-Test_Bounded_Long_Sequence::print_values (void)
+Test_Bounded_Long_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index fc0c65c72c6..ee9f22ff23c 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Long_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Long_Sequence (void);
+  Test_Bounded_Long_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Long_Sequence (void);
+  ~Test_Bounded_Long_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 4e0a2cf1bbd..5b88ceff92a 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_Short_Sequence
 // ************************************************************************
 
-Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence (void)
+Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_short_sequence")),
     in_ (new Param_Test::Bounded_Short_Seq),
     inout_ (new Param_Test::Bounded_Short_Seq),
@@ -26,7 +26,7 @@ Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence (void)
 {
 }
 
-Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence (void)
+Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -92,7 +92,7 @@ Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Bounded_Short_Sequence::reset_parameters (void)
+Test_Bounded_Short_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_Short_Seq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_Short_Seq;
@@ -121,13 +121,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_Short_Sequence::check_validity (void)
+Test_Bounded_Short_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -155,7 +154,7 @@ Test_Bounded_Short_Sequence::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Bounded_Short_Sequence::print_values (void)
+Test_Bounded_Short_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index f148bba9f5a..74e9e1b46f5 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Short_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Short_Sequence (void);
+  Test_Bounded_Short_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Short_Sequence (void);
+  ~Test_Bounded_Short_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index a8f73b80538..fc6ef3a1585 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_String_Sequence
 // ************************************************************************
 
-Test_Bounded_String_Sequence::Test_Bounded_String_Sequence (void)
+Test_Bounded_String_Sequence::Test_Bounded_String_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_strseq")),
     in_ (new Param_Test::Bounded_StrSeq),
     inout_ (new Param_Test::Bounded_StrSeq),
@@ -26,7 +26,7 @@ Test_Bounded_String_Sequence::Test_Bounded_String_Sequence (void)
 {
 }
 
-Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence (void)
+Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -89,7 +89,7 @@ Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_String_Sequence::reset_parameters (void)
+Test_Bounded_String_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_StrSeq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_StrSeq;
@@ -113,13 +113,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_String_Sequence::check_validity (void)
+Test_Bounded_String_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -148,7 +147,7 @@ Test_Bounded_String_Sequence::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Bounded_String_Sequence::print_values (void)
+Test_Bounded_String_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index 1b4fb023039..4de9b57f7a8 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_String_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_String_Sequence (void);
+  Test_Bounded_String_Sequence ();
 
   /// dtor
-  ~Test_Bounded_String_Sequence (void);
+  ~Test_Bounded_String_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 4295ab113cb..3b1ac0fbada 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -17,7 +17,7 @@
 //               Test_Bounded_String
 // ************************************************************************
 
-Test_Bounded_String::Test_Bounded_String (void)
+Test_Bounded_String::Test_Bounded_String ()
   : opname_ (CORBA::string_dup ("test_bounded_string")),
     in_ (0),
     inout_ (0),
@@ -26,7 +26,7 @@ Test_Bounded_String::Test_Bounded_String (void)
 {
 }
 
-Test_Bounded_String::~Test_Bounded_String (void)
+Test_Bounded_String::~Test_Bounded_String ()
 {
   CORBA::string_free (this->opname_);
   CORBA::string_free (this->in_);
@@ -96,7 +96,7 @@ Test_Bounded_String::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_String::reset_parameters (void)
+Test_Bounded_String::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::string_free (this->inout_);
@@ -126,13 +126,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_String::check_validity (void)
+Test_Bounded_String::check_validity ()
 {
   CORBA::ULong len = ACE_OS::strlen (this->in_);
 
@@ -155,7 +154,7 @@ Test_Bounded_String::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_String::print_values (void)
+Test_Bounded_String::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index a7202b49cac..25778f332cd 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -22,10 +22,10 @@ class Test_Bounded_String
 {
 public:
   /// ctor
-  Test_Bounded_String (void);
+  Test_Bounded_String ();
 
   /// dtor
-  ~Test_Bounded_String (void);
+  ~Test_Bounded_String ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index c91122d68ab..bfdd0a5bb40 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -19,7 +19,7 @@ const CORBA::ULong MAX_STRUCTSEQ_LEN = 1;
 //               Test_Bounded_Struct_Sequence
 // ************************************************************************
 
-Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence (void)
+Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_struct_sequence")),
     inout_ (new Param_Test::Bounded_StructSeq),
     out_ (new Param_Test::Bounded_StructSeq),
@@ -27,7 +27,7 @@ Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence (void)
 {
 }
 
-Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence (void)
+Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -90,7 +90,7 @@ Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */
 }
 
 int
-Test_Bounded_Struct_Sequence::reset_parameters (void)
+Test_Bounded_Struct_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_StructSeq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_StructSeq;
@@ -119,13 +119,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_Struct_Sequence::check_validity (void)
+Test_Bounded_Struct_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -142,7 +141,7 @@ Test_Bounded_Struct_Sequence::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_Struct_Sequence::print_values (void)
+Test_Bounded_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index bbda8071ff4..df9fce48977 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_Struct_Sequence (void);
+  Test_Bounded_Struct_Sequence ();
 
   /// dtor
-  ~Test_Bounded_Struct_Sequence (void);
+  ~Test_Bounded_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 544840dd110..75f9cb78dc8 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -18,7 +18,7 @@
 //               Test_Bounded_WString_Sequence
 // ************************************************************************
 
-Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence (void)
+Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence ()
   : opname_ (CORBA::string_dup ("test_bounded_wstrseq")),
     in_ (new Param_Test::Bounded_WStrSeq),
     inout_ (new Param_Test::Bounded_WStrSeq),
@@ -27,7 +27,7 @@ Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence (void)
 {
 }
 
-Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence (void)
+Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -89,7 +89,7 @@ Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_WString_Sequence::reset_parameters (void)
+Test_Bounded_WString_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Bounded_WStrSeq; // delete the previous ones
   this->out_ = new Param_Test::Bounded_WStrSeq;
@@ -113,13 +113,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_WString_Sequence::check_validity (void)
+Test_Bounded_WString_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -147,6 +146,6 @@ Test_Bounded_WString_Sequence::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_WString_Sequence::print_values (void)
+Test_Bounded_WString_Sequence::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h
index c9a754dde2e..e8e8481a365 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.h
+++ b/TAO/tests/Param_Test/bd_wstr_seq.h
@@ -23,10 +23,10 @@ class Test_Bounded_WString_Sequence
 {
 public:
   /// ctor
-  Test_Bounded_WString_Sequence (void);
+  Test_Bounded_WString_Sequence ();
 
   /// dtor
-  ~Test_Bounded_WString_Sequence (void);
+  ~Test_Bounded_WString_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index eab4463dedc..afed5732f77 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -18,7 +18,7 @@
 //               Test_Bounded_WString
 // ************************************************************************
 
-Test_Bounded_WString::Test_Bounded_WString (void)
+Test_Bounded_WString::Test_Bounded_WString ()
   : opname_ (CORBA::string_dup ("test_bounded_wstring")),
     in_ (0),
     inout_ (0),
@@ -27,7 +27,7 @@ Test_Bounded_WString::Test_Bounded_WString (void)
 {
 }
 
-Test_Bounded_WString::~Test_Bounded_WString (void)
+Test_Bounded_WString::~Test_Bounded_WString ()
 {
   CORBA::string_free (this->opname_);
   CORBA::wstring_free (this->in_);
@@ -97,7 +97,7 @@ Test_Bounded_WString::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Bounded_WString::reset_parameters (void)
+Test_Bounded_WString::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::wstring_free (this->inout_);
@@ -127,13 +127,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Bounded_WString::check_validity (void)
+Test_Bounded_WString::check_validity ()
 {
   CORBA::ULong len = ACE_OS::wslen (this->in_);
 
@@ -156,6 +155,6 @@ Test_Bounded_WString::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Bounded_WString::print_values (void)
+Test_Bounded_WString::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h
index 7c691d97a4f..5481e25babe 100644
--- a/TAO/tests/Param_Test/bd_wstring.h
+++ b/TAO/tests/Param_Test/bd_wstring.h
@@ -22,10 +22,10 @@ class Test_Bounded_WString
 {
 public:
   /// ctor
-  Test_Bounded_WString (void);
+  Test_Bounded_WString ();
 
   /// dtor
-  ~Test_Bounded_WString (void);
+  ~Test_Bounded_WString ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 044f92400d0..f1826497abe 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -19,12 +19,12 @@
 
 size_t Test_Big_Union::counter = 0;
 
-Test_Big_Union::Test_Big_Union (void)
+Test_Big_Union::Test_Big_Union ()
   : opname_ (CORBA::string_dup ("test_big_union"))
 {
 }
 
-Test_Big_Union::~Test_Big_Union (void)
+Test_Big_Union::~Test_Big_Union ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -86,7 +86,7 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Big_Union::reset_parameters (void)
+Test_Big_Union::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
   CORBA::ULong index = (counter++ % Test_Big_Union::BIG_UNION_N_BRANCHES);
@@ -228,13 +228,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Big_Union::check_validity (void)
+Test_Big_Union::check_validity ()
 {
   if (this->in_._d () != this->inout_._d ()
       || this->in_._d () != this->out_->_d ()
@@ -548,6 +547,6 @@ Test_Big_Union::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Big_Union::print_values (void)
+Test_Big_Union::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
index 07e4deb5422..ac05429bb2e 100644
--- a/TAO/tests/Param_Test/big_union.h
+++ b/TAO/tests/Param_Test/big_union.h
@@ -22,10 +22,10 @@ class Test_Big_Union
 {
 public:
   /// ctor
-  Test_Big_Union (void);
+  Test_Big_Union ();
 
   /// dtor
-  ~Test_Big_Union (void);
+  ~Test_Big_Union ();
 
   enum {
     BIG_UNION_N_BRANCHES = 12
@@ -41,16 +41,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 08f1dd6303b..c163d094f6f 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -31,14 +31,14 @@ Param_Test_Client<T>::Param_Test_Client (CORBA::ORB_ptr orb,
 
 // destructor
 template <class T>
-Param_Test_Client<T>::~Param_Test_Client (void)
+Param_Test_Client<T>::~Param_Test_Client ()
 {
   delete this->test_object_;
 }
 
 // All the individual tests.
 template <class T> int
-Param_Test_Client<T>::run_sii_test (void)
+Param_Test_Client<T>::run_sii_test ()
 {
   CORBA::ULong i = 0;  // loop index
   Options *opt = OPTIONS::instance (); // get the options
@@ -98,7 +98,6 @@ Param_Test_Client<T>::run_sii_test (void)
         }
       catch (const CORBA::Exception& ex)
         {
-
           this->results_.error_count (this->results_.error_count () + 1);
           ex._tao_print_exception (opname);
           ACE_ERROR ((LM_ERROR,
@@ -106,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 ())
@@ -146,7 +144,7 @@ Param_Test_Client<T>::run_sii_test (void)
 
 // use DII
 template <class T> int
-Param_Test_Client<T>::run_dii_test (void)
+Param_Test_Client<T>::run_dii_test ()
 {
   const char *opname = this->test_object_->opname ();
   Options *opt = OPTIONS::instance ();
diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h
index d4a139e5bd7..1989cac7797 100644
--- a/TAO/tests/Param_Test/client.h
+++ b/TAO/tests/Param_Test/client.h
@@ -40,13 +40,13 @@ public:
                      Param_Test_ptr objref,
                      T *);
 
-  ~Param_Test_Client (void);
+  ~Param_Test_Client ();
 
   /// run the SII test
-  int run_sii_test (void);
+  int run_sii_test ();
 
   /// run the DII test
-  int run_dii_test (void);
+  int run_dii_test ();
 
 private:
   /// underlying ORB
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 29a9ca724d3..d13c60fb285 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -25,14 +25,14 @@ const int LEVEL_3_LENGTH = 3;
 
 size_t Test_Complex_Any::counter = 0;
 
-Test_Complex_Any::Test_Complex_Any (void)
+Test_Complex_Any::Test_Complex_Any ()
   : opname_ (CORBA::string_dup ("test_complex_any")),
     out_ (new CORBA::Any),
     ret_ (new CORBA::Any)
 {
 }
 
-Test_Complex_Any::~Test_Complex_Any (void)
+Test_Complex_Any::~Test_Complex_Any ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -84,7 +84,7 @@ Test_Complex_Any::init_parameters (Param_Test_ptr)
 //                                                                  <- boolean
 //                                                                  <- short
 int
-Test_Complex_Any::reset_parameters (void)
+Test_Complex_Any::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -172,7 +172,7 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Complex_Any::check_validity (void)
+Test_Complex_Any::check_validity ()
 {
   const CORBA::AnySeq *level2_in_seq = 0;
   const CORBA::AnySeq *level2_test_seq = 0;
@@ -306,6 +306,6 @@ Test_Complex_Any::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Complex_Any::print_values (void)
+Test_Complex_Any::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
index b0ac49b1ecc..d21e9c17b0c 100644
--- a/TAO/tests/Param_Test/complex_any.h
+++ b/TAO/tests/Param_Test/complex_any.h
@@ -24,10 +24,10 @@ class Test_Complex_Any
 {
 public:
   /// ctor
-  Test_Complex_Any (void);
+  Test_Complex_Any ();
 
   /// dtor
-  ~Test_Complex_Any (void);
+  ~Test_Complex_Any ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -39,16 +39,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 4679ef3e155..c1271859d7f 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -49,11 +49,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 }
 
 // constructor
-Driver::Driver (void)
+Driver::Driver ()
 {
 }
 
-Driver::~Driver (void)
+Driver::~Driver ()
 {
 }
 
@@ -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)
     {
@@ -112,7 +111,7 @@ Driver::init (int argc, ACE_TCHAR **argv)
 }
 
 int
-Driver::run (void)
+Driver::run ()
 {
   // serves as a factory of Param_Client objects. It is also responsible to
   // start the test
@@ -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/driver.h b/TAO/tests/Param_Test/driver.h
index dcc0778dd65..1385df06df4 100644
--- a/TAO/tests/Param_Test/driver.h
+++ b/TAO/tests/Param_Test/driver.h
@@ -27,14 +27,14 @@ class Driver
 {
 public:
   // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
+  Driver ();
+  ~Driver ();
 
   /// Initialize the driver object
   int init (int argc, ACE_TCHAR **argv);
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
 private:
   /// underlying ORB (we do not own it)
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 49084a4b258..d7216acb86f 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -20,13 +20,13 @@
 //               Test_Exception
 // ************************************************************************
 
-Test_Exception::Test_Exception (void)
+Test_Exception::Test_Exception ()
   : opname_ (CORBA::string_dup ("test_exception")),
     iterations_ (0)
 {
 }
 
-Test_Exception::~Test_Exception (void)
+Test_Exception::~Test_Exception ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -230,7 +230,7 @@ Test_Exception::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Exception::reset_parameters (void)
+Test_Exception::reset_parameters ()
 {
   this->inout_ =  0;
   this->out_ =  0;
@@ -380,7 +380,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Exception::check_validity (void)
+Test_Exception::check_validity ()
 {
   if (this->inout_ == this->in_ * 2 &&
       this->out_ == this->in_ * 3 &&
@@ -399,7 +399,7 @@ Test_Exception::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Exception::print_values (void)
+Test_Exception::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index 6bb02bd3d81..11953410c4e 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -19,10 +19,10 @@ class Test_Exception
 {
 public:
   /// ctor
-  Test_Exception (void);
+  Test_Exception ();
 
   /// dtor
-  ~Test_Exception (void);
+  ~Test_Exception ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -34,16 +34,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index b4e9cf443e7..20118bc7838 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -17,13 +17,13 @@
 //               Test_Fixed_Array
 // ************************************************************************
 
-Test_Fixed_Array::Test_Fixed_Array (void)
+Test_Fixed_Array::Test_Fixed_Array ()
   : opname_ (CORBA::string_dup ("test_fixed_array")),
     ret_ (new Param_Test::Fixed_Array)
 {
 }
 
-Test_Fixed_Array::~Test_Fixed_Array (void)
+Test_Fixed_Array::~Test_Fixed_Array ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -78,9 +78,8 @@ Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Fixed_Array::reset_parameters (void)
+Test_Fixed_Array::reset_parameters ()
 {
-
   for (CORBA::ULong i=0; i < Param_Test::DIM1; i++)
     {
       this->inout_ [i] = 0;
@@ -107,13 +106,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Fixed_Array::check_validity (void)
+Test_Fixed_Array::check_validity ()
 {
   if (this->compare (this->in_, this->inout_) &&
       this->compare (this->in_, this->out_) &&
@@ -143,7 +141,7 @@ Test_Fixed_Array::compare (const Param_Test::Fixed_Array_slice *a1,
 }
 
 void
-Test_Fixed_Array::print_values (void)
+Test_Fixed_Array::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG, "IN array\n"));
   this->print (this->in_);
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index f6cec4953e6..ace255104ef 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -22,10 +22,10 @@ class Test_Fixed_Array
 {
 public:
   /// ctor
-  Test_Fixed_Array (void);
+  Test_Fixed_Array ();
 
   /// dtor
-  ~Test_Fixed_Array (void);
+  ~Test_Fixed_Array ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index ad71a5f7a03..9e6c2fdc2f4 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -17,12 +17,12 @@
 //               Test_Fixed_Struct
 // ************************************************************************
 
-Test_Fixed_Struct::Test_Fixed_Struct (void)
+Test_Fixed_Struct::Test_Fixed_Struct ()
   : opname_ (CORBA::string_dup ("test_fixed_struct"))
 {
 }
 
-Test_Fixed_Struct::~Test_Fixed_Struct (void)
+Test_Fixed_Struct::~Test_Fixed_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -75,7 +75,7 @@ Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Fixed_Struct::reset_parameters (void)
+Test_Fixed_Struct::reset_parameters ()
 {
   ACE_OS::memset (&this->inout_,
                   0,
@@ -106,13 +106,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Fixed_Struct::check_validity (void)
+Test_Fixed_Struct::check_validity ()
 {
   if (this->in_.l == this->inout_.l &&
       this->in_.c == this->inout_.c &&
@@ -148,7 +147,7 @@ Test_Fixed_Struct::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Fixed_Struct::print_values (void)
+Test_Fixed_Struct::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index ac0393a0303..b874bed5250 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -22,10 +22,10 @@ class Test_Fixed_Struct
 {
 public:
   /// ctor
-  Test_Fixed_Struct (void);
+  Test_Fixed_Struct ();
 
   /// dtor
-  ~Test_Fixed_Struct (void);
+  ~Test_Fixed_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
index 8e5b49caf59..048284a6e59 100644
--- a/TAO/tests/Param_Test/helper.cpp
+++ b/TAO/tests/Param_Test/helper.cpp
@@ -16,28 +16,28 @@
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
-Generator::Generator (void)
+Generator::Generator ()
 {
 }
 
-Generator::~Generator (void)
+Generator::~Generator ()
 {
 }
 
 CORBA::Short
-Generator::gen_short (void)
+Generator::gen_short ()
 {
   return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE);
 }
 
 CORBA::Long
-Generator::gen_long (void)
+Generator::gen_long ()
 {
   return ::ACE_OS::rand () % TEST_BUFSIZE;
 }
 
 char *
-Generator::gen_string (void)
+Generator::gen_string ()
 {
   return gen_string (TEST_BUFSIZE);
 }
@@ -64,7 +64,7 @@ Generator::gen_string (int max_length)
 }
 
 CORBA::WChar *
-Generator::gen_wstring (void)
+Generator::gen_wstring ()
 {
   return gen_wstring (TEST_BUFSIZE);
 }
@@ -92,7 +92,7 @@ Generator::gen_wstring (int max_length)
 }
 
 const Param_Test::Fixed_Struct
-Generator::gen_fixed_struct (void)
+Generator::gen_fixed_struct ()
 {
   this->fixed_struct_.l = ACE_OS::rand ();
   this->fixed_struct_.c = ACE_OS::rand () % 128;
@@ -105,7 +105,7 @@ Generator::gen_fixed_struct (void)
 }
 
 const Param_Test::Step
-Generator::gen_step (void)
+Generator::gen_step ()
 {
   this->step_.name.id = this->gen_string ();
   this->step_.name.kind = this->gen_string ();
diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h
index 57648202ecf..37523be1c30 100644
--- a/TAO/tests/Param_Test/helper.h
+++ b/TAO/tests/Param_Test/helper.h
@@ -22,19 +22,19 @@ class Generator
 {
 public:
   /// constructor
-  Generator (void);
+  Generator ();
 
   /// destructor
-  ~Generator (void);
+  ~Generator ();
 
-  CORBA::Short gen_short (void);
-  CORBA::Long gen_long (void);
-  char* gen_string (void);
+  CORBA::Short gen_short ();
+  CORBA::Long gen_long ();
+  char* gen_string ();
   char* gen_string (int maxlength);
-  CORBA::WChar* gen_wstring (void);
+  CORBA::WChar* gen_wstring ();
   CORBA::WChar* gen_wstring (int maxlength);
-  const Param_Test::Fixed_Struct gen_fixed_struct (void);
-  const Param_Test::Step gen_step (void);
+  const Param_Test::Fixed_Struct gen_fixed_struct ();
+  const Param_Test::Step gen_step ();
  private:
   Param_Test::Fixed_Struct fixed_struct_;
   Param_Test::Step step_;
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 4711438c044..e5b09dba3b2 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -18,7 +18,7 @@
 //               Test_Multdim_Array
 // ************************************************************************
 
-Test_Multdim_Array::Test_Multdim_Array (void)
+Test_Multdim_Array::Test_Multdim_Array ()
   : opname_ (CORBA::string_dup ("test_multdim_array")),
     in_ (new Param_Test::Multdim_Array),
     inout_ (new Param_Test::Multdim_Array),
@@ -27,7 +27,7 @@ Test_Multdim_Array::Test_Multdim_Array (void)
 {
 }
 
-Test_Multdim_Array::~Test_Multdim_Array (void)
+Test_Multdim_Array::~Test_Multdim_Array ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/
 }
 
 int
-Test_Multdim_Array::reset_parameters (void)
+Test_Multdim_Array::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -140,7 +140,7 @@ Test_Multdim_Array::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Multdim_Array::check_validity (void)
+Test_Multdim_Array::check_validity ()
 {
   if (this->compare (this->in_.in (),
                      this->inout_.in ()) &&
@@ -179,7 +179,7 @@ Test_Multdim_Array::compare (const Param_Test::Multdim_Array_slice *a1,
 }
 
 void
-Test_Multdim_Array::print_values (void)
+Test_Multdim_Array::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG, "IN array\n"));
   this->print (this->in_.in ());
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
index af149eafb9e..ff6aaa28572 100644
--- a/TAO/tests/Param_Test/multdim_array.h
+++ b/TAO/tests/Param_Test/multdim_array.h
@@ -22,10 +22,10 @@ class Test_Multdim_Array
 {
 public:
   /// ctor
-  Test_Multdim_Array (void);
+  Test_Multdim_Array ();
 
   /// dtor
-  ~Test_Multdim_Array (void);
+  ~Test_Multdim_Array ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 77402115ff3..5d444cae5d2 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -17,7 +17,7 @@
 //               Test_Nested_Struct
 // ************************************************************************
 
-Test_Nested_Struct::Test_Nested_Struct (void)
+Test_Nested_Struct::Test_Nested_Struct ()
   : opname_ (CORBA::string_dup ("test_nested_struct")),
     inout_ (new Param_Test::Nested_Struct),
     out_ (new Param_Test::Nested_Struct),
@@ -25,7 +25,7 @@ Test_Nested_Struct::Test_Nested_Struct (void)
 {
 }
 
-Test_Nested_Struct::~Test_Nested_Struct (void)
+Test_Nested_Struct::~Test_Nested_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -100,7 +100,7 @@ Test_Nested_Struct::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Nested_Struct::reset_parameters (void)
+Test_Nested_Struct::reset_parameters ()
 {
   this->inout_ = new Param_Test::Nested_Struct; // delete the previous ones
   this->out_ = new Param_Test::Nested_Struct;
@@ -132,13 +132,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Nested_Struct::check_validity (void)
+Test_Nested_Struct::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_.vs.seq.length () == this->inout_->vs.seq.length ()) &&
@@ -167,7 +166,7 @@ Test_Nested_Struct::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Nested_Struct::print_values (void)
+Test_Nested_Struct::print_values ()
 {
   for (CORBA::ULong i=0; i < this->in_.vs.seq.length (); i++)
     {
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 2ca813c4142..6138f5ca459 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -23,10 +23,10 @@ class Test_Nested_Struct
 {
 public:
   /// ctor
-  Test_Nested_Struct (void);
+  Test_Nested_Struct ();
 
   /// dtor
-  ~Test_Nested_Struct (void);
+  ~Test_Nested_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 469c812224a..e86581104f8 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -17,12 +17,12 @@
 //               Test_ObjRef
 // ************************************************************************
 
-Test_ObjRef::Test_ObjRef (void)
+Test_ObjRef::Test_ObjRef ()
   : opname_ (CORBA::string_dup ("test_objref"))
 {
 }
 
-Test_ObjRef::~Test_ObjRef (void)
+Test_ObjRef::~Test_ObjRef ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -106,7 +106,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_ObjRef::reset_parameters (void)
+Test_ObjRef::reset_parameters ()
 {
   // Environemnt variable
   Coffee::Desc desc;
@@ -149,13 +149,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_ObjRef::check_validity (void)
+Test_ObjRef::check_validity ()
 {
   // Environemnt variable
 
@@ -210,7 +209,7 @@ Test_ObjRef::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_ObjRef::print_values (void)
+Test_ObjRef::print_values ()
 {
   // Env. variable
 
@@ -259,7 +258,6 @@ Test_ObjRef::print_values (void)
     }
 
 
-
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*"
               "in = %C, "
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index 9f2aa04c937..672ffd948d4 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -22,10 +22,10 @@ class Test_ObjRef
 {
 public:
   /// ctor
-  Test_ObjRef (void);
+  Test_ObjRef ();
 
   /// dtor
-  ~Test_ObjRef (void);
+  ~Test_ObjRef ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 7f67712e794..834d50f3212 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -17,7 +17,7 @@
 //               Test_Objref_Struct
 // ************************************************************************
 
-Test_Objref_Struct::Test_Objref_Struct (void)
+Test_Objref_Struct::Test_Objref_Struct ()
   : opname_ (CORBA::string_dup ("test_objref_struct")),
     inout_ (new Param_Test::Objref_Struct),
     out_ (new Param_Test::Objref_Struct),
@@ -25,7 +25,7 @@ Test_Objref_Struct::Test_Objref_Struct (void)
 {
 }
 
-Test_Objref_Struct::~Test_Objref_Struct (void)
+Test_Objref_Struct::~Test_Objref_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -94,13 +94,12 @@ 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;
 }
 
 int
-Test_Objref_Struct::reset_parameters (void)
+Test_Objref_Struct::reset_parameters ()
 {
   this->inout_ = new Param_Test::Objref_Struct; // delete the previous ones
   this->out_ = new Param_Test::Objref_Struct;
@@ -132,13 +131,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Objref_Struct::check_validity (void)
+Test_Objref_Struct::check_validity ()
 {
   if (this->in_.x != this->inout_->x
       || this->in_.x != this->out_->x
@@ -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;
 }
@@ -188,7 +185,7 @@ Test_Objref_Struct::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Objref_Struct::print_values (void)
+Test_Objref_Struct::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n*=*=*=*=*=*=*=*=*=*=\n"
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index a7b8fb748a3..e5f26fb392b 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -23,10 +23,10 @@ class Test_Objref_Struct
 {
 public:
   /// ctor
-  Test_Objref_Struct (void);
+  Test_Objref_Struct ();
 
   /// dtor
-  ~Test_Objref_Struct (void);
+  ~Test_Objref_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index 6db5429ab92..b029769a160 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -19,7 +19,7 @@
 #include "ace/Log_Msg.h"
 
 // Constructor.
-Options::Options (void)
+Options::Options ()
   : ior_ (CORBA::string_dup ("file://test.ior")),
     test_type_ (Options::NO_TEST),
     invoke_type_ (Options::SII),
@@ -29,7 +29,7 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
@@ -200,19 +200,19 @@ Options::param_test_ior () const
 }
 
 Options::TEST_TYPE
-Options::test_type (void)
+Options::test_type ()
 {
   return this->test_type_;
 }
 
 Options::INVOKE_TYPE
-Options::invoke_type (void)
+Options::invoke_type ()
 {
   return this->invoke_type_;
 }
 
 CORBA::ULong
-Options::loop_count (void)
+Options::loop_count ()
 {
   return this->loop_count_;
 }
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index 1659ce72f23..75d7b99cab2 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -74,10 +74,10 @@ public:
   };
 
   /// constructor
-  Options (void);
+  Options ();
 
   /// destructor
-  ~Options (void);
+  ~Options ();
 
   /// Parses the arguments passed on the command line.
   int parse_args (int argc, ACE_TCHAR **argv);
@@ -86,13 +86,13 @@ public:
   char const * param_test_ior () const;
 
   /// what test to run
-  TEST_TYPE test_type (void);
+  TEST_TYPE test_type ();
 
   /// whether to use SII or DII
-  INVOKE_TYPE invoke_type (void);
+  INVOKE_TYPE invoke_type ();
 
   /// number of times to run the test
-  CORBA::ULong loop_count (void);
+  CORBA::ULong loop_count ();
 
   /// whether debug option is on or not
   CORBA::Boolean debug () const;
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 4a044735a8b..6071e74859e 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -25,13 +25,13 @@ Coffee_i::Coffee_i (const char *name)
 
 // Destructor
 
-Coffee_i::~Coffee_i (void)
+Coffee_i::~Coffee_i ()
 {
 }
 
 // get attribute
 Coffee::Desc *
-Coffee_i::description ( /*env*/)
+Coffee_i::description ()
 {
   Coffee::Desc *desc = new Coffee::Desc;
   desc->name = CORBA::string_dup (this->name_.in ());
@@ -60,7 +60,7 @@ Param_Test_i::Param_Test_i (const char *coffee_name,
 
 // Destructor
 
-Param_Test_i::~Param_Test_i (void)
+Param_Test_i::~Param_Test_i ()
 {
 }
 
@@ -627,7 +627,7 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 
 // make a Coffee object
 Coffee_ptr
-Param_Test_i::make_coffee (void)
+Param_Test_i::make_coffee ()
 {
   return this->obj_._this ();
 }
@@ -973,13 +973,13 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 }
 
 void
-Param_Test_i::shutdown (void)
+Param_Test_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
 
 void
-Param_Test_i::throw_badboy (void)
+Param_Test_i::throw_badboy ()
 {
   throw Param_Test::BadBoy ();
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 8c8af88d3ec..454158c2183 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -22,12 +22,12 @@ public:
   Coffee_i (const char *name);
 
   /// destructor
-  ~Coffee_i (void);
+  ~Coffee_i ();
 
   // =methods for the attribute
 
   /// get attribute
-  virtual Coffee::Desc * description (void);
+  virtual Coffee::Desc * description ();
 
   /// set attribute
   virtual void description (const Coffee::Desc &description);
@@ -53,7 +53,7 @@ public:
                 CORBA::ORB_ptr orb);
 
   /// Destructor
-  ~Param_Test_i (void);
+  ~Param_Test_i ();
 
   /// test for shorts
   virtual CORBA::Short test_short (CORBA::Short s1,
@@ -183,7 +183,7 @@ public:
 
   /// make a coffee object
   virtual Coffee_ptr
-  make_coffee (void);
+  make_coffee ();
 
   /// test for object references
   virtual Coffee_ptr
@@ -245,7 +245,7 @@ public:
                       Param_Test::Multdim_Array ,
                       Param_Test::Multdim_Array_out);
 
-  void shutdown (void);
+  void shutdown ();
 
 
 private:
@@ -261,7 +261,7 @@ private:
    * not in its THROW_SPEC, but still test TAO's
    * conversion of such an exception to UNKNOWN.
    */
-  void throw_badboy (void);
+  void throw_badboy ();
 };
 
 #endif /* PARAM_TEST_I_H */
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 83f03893c24..c05eb8f3c90 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -20,12 +20,12 @@ const CORBA::ULong MAX_SEQ_LENGTH = 3;
 //               Test_Recursive_Struct
 // ************************************************************************
 
-Test_Recursive_Struct::Test_Recursive_Struct (void)
+Test_Recursive_Struct::Test_Recursive_Struct ()
   : opname_ (CORBA::string_dup ("test_recursive_struct"))
 {
 }
 
-Test_Recursive_Struct::~Test_Recursive_Struct (void)
+Test_Recursive_Struct::~Test_Recursive_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -75,7 +75,7 @@ Test_Recursive_Struct::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Recursive_Struct::reset_parameters (void)
+Test_Recursive_Struct::reset_parameters ()
 {
   // Since these are _vars, we do this the first call and
   // every call thereafter (if any).
@@ -119,13 +119,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Recursive_Struct::check_validity (void)
+Test_Recursive_Struct::check_validity ()
 {
   // Pair in_ with each of the returned values and call the
   // helper function with that pair.
@@ -165,7 +164,7 @@ Test_Recursive_Struct::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Recursive_Struct::print_values (void)
+Test_Recursive_Struct::print_values ()
 {
 }
 
diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h
index 3e4141324a1..4fe7bdb9bed 100644
--- a/TAO/tests/Param_Test/recursive_struct.h
+++ b/TAO/tests/Param_Test/recursive_struct.h
@@ -25,10 +25,10 @@ class Test_Recursive_Struct
 {
 public:
   /// ctor
-  Test_Recursive_Struct (void);
+  Test_Recursive_Struct ();
 
   /// dtor
-  ~Test_Recursive_Struct (void);
+  ~Test_Recursive_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -40,16 +40,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 3b19bc3033e..ca65bc1ffaa 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -19,12 +19,12 @@ const CORBA::ULong MAX_SEQ_LENGTH = 2;
 //               Test_Recursive_Union
 // ************************************************************************
 
-Test_Recursive_Union::Test_Recursive_Union (void)
+Test_Recursive_Union::Test_Recursive_Union ()
   : opname_ (CORBA::string_dup ("test_recursive_union"))
 {
 }
 
-Test_Recursive_Union::~Test_Recursive_Union (void)
+Test_Recursive_Union::~Test_Recursive_Union ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -74,7 +74,7 @@ Test_Recursive_Union::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Recursive_Union::reset_parameters (void)
+Test_Recursive_Union::reset_parameters ()
 {
   // Since these are _vars, we do this the first call and
   // every call thereafter (if any).
@@ -120,13 +120,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Recursive_Union::check_validity (void)
+Test_Recursive_Union::check_validity ()
 {
   // Pair in_ with each of the returned values and call the
   // helper function with that pair.
@@ -166,7 +165,7 @@ Test_Recursive_Union::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_Recursive_Union::print_values (void)
+Test_Recursive_Union::print_values ()
 {
 }
 
diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h
index 8b62bfea172..62c729412c7 100644
--- a/TAO/tests/Param_Test/recursive_union.h
+++ b/TAO/tests/Param_Test/recursive_union.h
@@ -24,10 +24,10 @@ class Test_Recursive_Union
 {
 public:
   /// ctor
-  Test_Recursive_Union (void);
+  Test_Recursive_Union ();
 
   /// dtor
-  ~Test_Recursive_Union (void);
+  ~Test_Recursive_Union ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -39,16 +39,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 87fb68e2caa..9c298261969 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -14,17 +14,17 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-Results::Results (void)
+Results::Results ()
 {
 }
 
-Results::~Results (void)
+Results::~Results ()
 {
   delete [] this->elapsed_time_;
 }
 
 void
-Results::print_stats (void)
+Results::print_stats ()
 {
   double
     avg_real_time = 0,
@@ -103,20 +103,20 @@ Results::print_exception (const char * /* call_name */)
 }
 
 void
-Results::start_timer (void)
+Results::start_timer ()
 {
   this->timer_.start ();
 }
 
 void
-Results::stop_timer (void)
+Results::stop_timer ()
 {
   this->timer_.stop ();
   this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]);
 }
 
 CORBA::ULong
-Results::call_count (void)
+Results::call_count ()
 {
   return this->call_count_;
 }
@@ -128,7 +128,7 @@ Results::call_count (CORBA::ULong c)
 }
 
 CORBA::ULong
-Results::error_count (void)
+Results::error_count ()
 {
   return this->error_count_;
 }
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index dd2e62756f7..0607cc430e9 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -33,31 +33,31 @@ class Results
 {
 public:
   /// ctor
-  Results (void);
+  Results ();
 
   /// destructor
-  ~Results (void);
+  ~Results ();
 
   /// prints the time stats
-  void print_stats (void);
+  void print_stats ();
 
   /// print the exception
   void print_exception (const char *call_name);
 
   /// start timing
-  void start_timer (void);
+  void start_timer ();
 
   /// stop timing
-  void stop_timer (void);
+  void stop_timer ();
 
   /// return call count
-  CORBA::ULong call_count (void);
+  CORBA::ULong call_count ();
 
   /// set the call count
   void call_count (CORBA::ULong);
 
   /// return the error count
-  CORBA::ULong error_count (void);
+  CORBA::ULong error_count ();
 
   /// set error count
   void error_count (CORBA::ULong);
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 3cf8c0d1d84..3fd478cd8d9 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -17,12 +17,12 @@
 //               Test_Short
 // ************************************************************************
 
-Test_Short::Test_Short (void)
+Test_Short::Test_Short ()
   : opname_ (CORBA::string_dup ("test_short"))
 {
 }
 
-Test_Short::~Test_Short (void)
+Test_Short::~Test_Short ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -67,7 +67,7 @@ Test_Short::init_parameters (Param_Test_ptr /*objref*/)
 }
 
 int
-Test_Short::reset_parameters (void)
+Test_Short::reset_parameters ()
 {
   this->inout_ =  0;
   this->out_ =  0;
@@ -89,13 +89,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Short::check_validity (void)
+Test_Short::check_validity ()
 {
   if (this->inout_ == this->in_ * 2 &&
       this->out_ == this->in_ * 3 &&
@@ -112,7 +111,7 @@ Test_Short::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Short::print_values (void)
+Test_Short::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index 3434515f78e..f95f247001f 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -22,10 +22,10 @@ class Test_Short
 {
 public:
   /// ctor
-  Test_Short (void);
+  Test_Short ();
 
   /// dtor
-  ~Test_Short (void);
+  ~Test_Short ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index a1f64a7c57c..8f00ade64f4 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -19,12 +19,12 @@
 
 size_t Test_Small_Union::counter = 0;
 
-Test_Small_Union::Test_Small_Union (void)
+Test_Small_Union::Test_Small_Union ()
   : opname_ (CORBA::string_dup ("test_small_union"))
 {
 }
 
-Test_Small_Union::~Test_Small_Union (void)
+Test_Small_Union::~Test_Small_Union ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -86,7 +86,7 @@ Test_Small_Union::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_Small_Union::reset_parameters (void)
+Test_Small_Union::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
   CORBA::ULong index = (counter++ % 2);
@@ -128,13 +128,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Small_Union::check_validity (void)
+Test_Small_Union::check_validity ()
 {
   if (this->in_._d () != this->inout_._d ()
       || this->in_._d () != this->out_->_d ()
@@ -184,6 +183,6 @@ Test_Small_Union::check_validity (CORBA::Request_ptr /*req*/)
 }
 
 void
-Test_Small_Union::print_values (void)
+Test_Small_Union::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h
index 5a0479ba21c..c489d47dafb 100644
--- a/TAO/tests/Param_Test/small_union.h
+++ b/TAO/tests/Param_Test/small_union.h
@@ -22,10 +22,10 @@ class Test_Small_Union
 {
 public:
   /// ctor
-  Test_Small_Union (void);
+  Test_Small_Union ();
 
   /// dtor
-  ~Test_Small_Union (void);
+  ~Test_Small_Union ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 0e478e64972..12f1cf02337 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -17,12 +17,12 @@
 //               Test_TypeCode
 // ************************************************************************
 
-Test_TypeCode::Test_TypeCode (void)
+Test_TypeCode::Test_TypeCode ()
   : opname_ (CORBA::string_dup ("test_typecode"))
 {
 }
 
-Test_TypeCode::~Test_TypeCode (void)
+Test_TypeCode::~Test_TypeCode ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -94,7 +94,7 @@ Test_TypeCode::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_TypeCode::reset_parameters (void)
+Test_TypeCode::reset_parameters ()
 {
   this->in_ = this->tc_holder_;
   this->inout_ = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
@@ -119,15 +119,13 @@ 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;
 }
 
 CORBA::Boolean
-Test_TypeCode::check_validity (void)
+Test_TypeCode::check_validity ()
 {
-
   try
     {
       CORBA::Boolean one, two, three;
@@ -157,6 +155,6 @@ Test_TypeCode::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_TypeCode::print_values (void)
+Test_TypeCode::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index 93c83c58b7d..16f261be28d 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -22,10 +22,10 @@ class Test_TypeCode
 {
 public:
   /// ctor
-  Test_TypeCode (void);
+  Test_TypeCode ();
 
   /// dtor
-  ~Test_TypeCode (void);
+  ~Test_TypeCode ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index 07aab1ddf1c..b471b54a13f 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -21,7 +21,7 @@ const CORBA::ULong NUM_TEST_TYPES = 4;
 //               Test_AnySeq
 // ************************************************************************
 
-Test_AnySeq::Test_AnySeq (void)
+Test_AnySeq::Test_AnySeq ()
   : opname_ (CORBA::string_dup ("test_anyseq")),
     in_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)),
     inout_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)),
@@ -30,7 +30,7 @@ Test_AnySeq::Test_AnySeq (void)
 {
 }
 
-Test_AnySeq::~Test_AnySeq (void)
+Test_AnySeq::~Test_AnySeq ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -140,7 +140,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref)
 }
 
 int
-Test_AnySeq::reset_parameters (void)
+Test_AnySeq::reset_parameters ()
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -198,13 +198,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_AnySeq::check_validity (void)
+Test_AnySeq::check_validity ()
 {
   CORBA::Short short_in, short_inout, short_out, short_ret;
   const char *str_in;
@@ -287,7 +286,7 @@ Test_AnySeq::check_validity (CORBA::Request_ptr)
 }
 
 void
-Test_AnySeq::print_values (void)
+Test_AnySeq::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 50e8431a480..03134228487 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -22,10 +22,10 @@ class Test_AnySeq
 {
 public:
   /// ctor
-  Test_AnySeq (void);
+  Test_AnySeq ();
 
   /// dtor
-  ~Test_AnySeq (void);
+  ~Test_AnySeq ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index f899067802b..2b4370ab015 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Array_Sequence
 // ************************************************************************
 
-Test_Array_Sequence::Test_Array_Sequence (void)
+Test_Array_Sequence::Test_Array_Sequence ()
   : opname_ (CORBA::string_dup ("test_array_sequence")),
     inout_ (new Param_Test::ArraySeq),
     out_ (new Param_Test::ArraySeq),
@@ -25,7 +25,7 @@ Test_Array_Sequence::Test_Array_Sequence (void)
 {
 }
 
-Test_Array_Sequence::~Test_Array_Sequence (void)
+Test_Array_Sequence::~Test_Array_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -104,7 +104,7 @@ Test_Array_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Array_Sequence::reset_parameters (void)
+Test_Array_Sequence::reset_parameters ()
 {
   // Delete the previous ones.
   this->inout_ = new Param_Test::ArraySeq;
@@ -129,13 +129,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Array_Sequence::check_validity (void)
+Test_Array_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -152,7 +151,7 @@ Test_Array_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Array_Sequence::print_values (void)
+Test_Array_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h
index 87701ffaee7..c2328da91c3 100644
--- a/TAO/tests/Param_Test/ub_array_seq.h
+++ b/TAO/tests/Param_Test/ub_array_seq.h
@@ -23,10 +23,10 @@ class Test_Array_Sequence
 {
 public:
   /// ctor
-  Test_Array_Sequence (void);
+  Test_Array_Sequence ();
 
   /// dtor
-  ~Test_Array_Sequence (void);
+  ~Test_Array_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 21992565ad6..2066e19c357 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Long_Sequence
 // ************************************************************************
 
-Test_Long_Sequence::Test_Long_Sequence (void)
+Test_Long_Sequence::Test_Long_Sequence ()
   : opname_ (CORBA::string_dup ("test_long_sequence")),
     in_ (new CORBA::LongSeq),
     inout_ (new CORBA::LongSeq),
@@ -26,7 +26,7 @@ Test_Long_Sequence::Test_Long_Sequence (void)
 {
 }
 
-Test_Long_Sequence::~Test_Long_Sequence (void)
+Test_Long_Sequence::~Test_Long_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -85,7 +85,7 @@ Test_Long_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Long_Sequence::reset_parameters (void)
+Test_Long_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::LongSeq; // delete the previous ones
   this->out_ = new CORBA::LongSeq;
@@ -109,13 +109,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Long_Sequence::check_validity (void)
+Test_Long_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -143,7 +142,7 @@ Test_Long_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Long_Sequence::print_values (void)
+Test_Long_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index 4050e7dc570..1c0408c8c2f 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -23,10 +23,10 @@ class Test_Long_Sequence
 {
 public:
   /// ctor
-  Test_Long_Sequence (void);
+  Test_Long_Sequence ();
 
   /// dtor
-  ~Test_Long_Sequence (void);
+  ~Test_Long_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index aabd1d7835a..29c31d7cd3f 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -26,7 +26,7 @@ static const char *Coffee_Flavor [] = {
   "Swiss Chocolate Mocha"
 };
 
-Test_ObjRef_Sequence::Test_ObjRef_Sequence (void)
+Test_ObjRef_Sequence::Test_ObjRef_Sequence ()
   : opname_ (CORBA::string_dup ("test_coffe_mix")),
     inout_ (new Param_Test::Coffee_Mix),
     out_ (new Param_Test::Coffee_Mix),
@@ -34,7 +34,7 @@ Test_ObjRef_Sequence::Test_ObjRef_Sequence (void)
 {
 }
 
-Test_ObjRef_Sequence::~Test_ObjRef_Sequence (void)
+Test_ObjRef_Sequence::~Test_ObjRef_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -110,13 +110,12 @@ 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;
 }
 
 int
-Test_ObjRef_Sequence::reset_parameters (void)
+Test_ObjRef_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::Coffee_Mix; // delete the previous ones
   this->out_ = new Param_Test::Coffee_Mix;
@@ -140,15 +139,13 @@ 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;
 }
 
 CORBA::Boolean
-Test_ObjRef_Sequence::check_validity (void)
+Test_ObjRef_Sequence::check_validity ()
 {
-
   try
     {
       this->compare (this->in_,
@@ -165,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;
 }
@@ -178,7 +174,7 @@ Test_ObjRef_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_ObjRef_Sequence::print_values (void)
+Test_ObjRef_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
@@ -247,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_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index b9165d990cb..79c70d8bf1f 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -23,10 +23,10 @@ class Test_ObjRef_Sequence
 {
 public:
   /// ctor
-  Test_ObjRef_Sequence (void);
+  Test_ObjRef_Sequence ();
 
   /// dtor
-  ~Test_ObjRef_Sequence (void);
+  ~Test_ObjRef_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 9138a7f0acf..b87466b81d7 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_Short_Sequence
 // ************************************************************************
 
-Test_Short_Sequence::Test_Short_Sequence (void)
+Test_Short_Sequence::Test_Short_Sequence ()
   : opname_ (CORBA::string_dup ("test_short_sequence")),
     in_ (new CORBA::ShortSeq),
     inout_ (new CORBA::ShortSeq),
@@ -26,7 +26,7 @@ Test_Short_Sequence::Test_Short_Sequence (void)
 {
 }
 
-Test_Short_Sequence::~Test_Short_Sequence (void)
+Test_Short_Sequence::~Test_Short_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_Short_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Short_Sequence::reset_parameters (void)
+Test_Short_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::ShortSeq; // delete the previous ones
   this->out_ = new CORBA::ShortSeq;
@@ -111,13 +111,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Short_Sequence::check_validity (void)
+Test_Short_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -145,7 +144,7 @@ Test_Short_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Short_Sequence::print_values (void)
+Test_Short_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index 1105cae9bf7..1aafe12fa2f 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -23,10 +23,10 @@ class Test_Short_Sequence
 {
 public:
   /// ctor
-  Test_Short_Sequence (void);
+  Test_Short_Sequence ();
 
   /// dtor
-  ~Test_Short_Sequence (void);
+  ~Test_Short_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 918bba998e5..979ee4d1ff2 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -17,7 +17,7 @@
 //               Test_String_Sequence
 // ************************************************************************
 
-Test_String_Sequence::Test_String_Sequence (void)
+Test_String_Sequence::Test_String_Sequence ()
   : opname_ (CORBA::string_dup ("test_strseq")),
     in_ (new CORBA::StringSeq),
     inout_ (new CORBA::StringSeq),
@@ -26,7 +26,7 @@ Test_String_Sequence::Test_String_Sequence (void)
 {
 }
 
-Test_String_Sequence::~Test_String_Sequence (void)
+Test_String_Sequence::~Test_String_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -91,7 +91,7 @@ Test_String_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_String_Sequence::reset_parameters (void)
+Test_String_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::StringSeq; // delete the previous ones
   this->out_ = new CORBA::StringSeq;
@@ -115,13 +115,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_String_Sequence::check_validity (void)
+Test_String_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -149,7 +148,7 @@ Test_String_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_String_Sequence::print_values (void)
+Test_String_Sequence::print_values ()
 {
   CORBA::ULong i;
   ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index a4340e8c5d5..28392276af0 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -23,10 +23,10 @@ class Test_String_Sequence
 {
 public:
   /// ctor
-  Test_String_Sequence (void);
+  Test_String_Sequence ();
 
   /// dtor
-  ~Test_String_Sequence (void);
+  ~Test_String_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index a302f8c7036..75c70bd84b8 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -17,7 +17,7 @@
 //               Test_Unbounded_String
 // ************************************************************************
 
-Test_Unbounded_String::Test_Unbounded_String (void)
+Test_Unbounded_String::Test_Unbounded_String ()
   : opname_ (CORBA::string_dup ("test_unbounded_string")),
     in_ (0),
     inout_ (0),
@@ -26,7 +26,7 @@ Test_Unbounded_String::Test_Unbounded_String (void)
 {
 }
 
-Test_Unbounded_String::~Test_Unbounded_String (void)
+Test_Unbounded_String::~Test_Unbounded_String ()
 {
   CORBA::string_free (this->opname_);
   CORBA::string_free (this->in_);
@@ -97,7 +97,7 @@ Test_Unbounded_String::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Unbounded_String::reset_parameters (void)
+Test_Unbounded_String::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::string_free (this->inout_);
@@ -127,13 +127,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Unbounded_String::check_validity (void)
+Test_Unbounded_String::check_validity ()
 {
   CORBA::ULong len = ACE_OS::strlen (this->in_);
 
@@ -156,7 +155,7 @@ Test_Unbounded_String::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_String::print_values (void)
+Test_Unbounded_String::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index d633291c015..92f0f4f61c6 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -21,10 +21,10 @@ class Test_Unbounded_String
 {
 public:
   /// ctor
-  Test_Unbounded_String (void);
+  Test_Unbounded_String ();
 
   /// dtor
-  ~Test_Unbounded_String (void);
+  ~Test_Unbounded_String ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -36,16 +36,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 17d73b4423c..41b7bfa40ec 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -18,7 +18,7 @@
 //               Test_Struct_Sequence
 // ************************************************************************
 
-Test_Struct_Sequence::Test_Struct_Sequence (void)
+Test_Struct_Sequence::Test_Struct_Sequence ()
   : opname_ (CORBA::string_dup ("test_struct_sequence")),
     inout_ (new Param_Test::StructSeq),
     out_ (new Param_Test::StructSeq),
@@ -26,7 +26,7 @@ Test_Struct_Sequence::Test_Struct_Sequence (void)
 {
 }
 
-Test_Struct_Sequence::~Test_Struct_Sequence (void)
+Test_Struct_Sequence::~Test_Struct_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -89,7 +89,7 @@ Test_Struct_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Struct_Sequence::reset_parameters (void)
+Test_Struct_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::StructSeq; // delete the previous one
   this->out_ = new Param_Test::StructSeq;
@@ -113,13 +113,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Struct_Sequence::check_validity (void)
+Test_Struct_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -136,7 +135,7 @@ Test_Struct_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Struct_Sequence::print_values (void)
+Test_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
@@ -215,7 +214,7 @@ Test_Struct_Sequence::print_sequence (const Param_Test::StructSeq &s)
 //               Test_Unbounded_Struct_Sequence
 // ************************************************************************
 
-Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence (void)
+Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence ()
   : opname_ (CORBA::string_dup ("test_unbounded_struct_sequence")),
     inout_ (new Param_Test::PathSpec),
     out_ (new Param_Test::PathSpec),
@@ -223,7 +222,7 @@ Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence (void)
 {
 }
 
-Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence (void)
+Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -287,7 +286,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Unbounded_Struct_Sequence::reset_parameters (void)
+Test_Unbounded_Struct_Sequence::reset_parameters ()
 {
   this->inout_ = new Param_Test::PathSpec; // delete the previous one
   this->out_ = new Param_Test::PathSpec;
@@ -307,7 +306,7 @@ Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 }
 
 CORBA::Boolean
-Test_Unbounded_Struct_Sequence::check_validity (void)
+Test_Unbounded_Struct_Sequence::check_validity ()
 {
   if (this->compare (this->in_, this->inout_.in ()) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -324,7 +323,7 @@ Test_Unbounded_Struct_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_Struct_Sequence::print_values (void)
+Test_Unbounded_Struct_Sequence::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index 4c3ac7ea6db..835b2abc195 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -23,10 +23,10 @@ class Test_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Struct_Sequence (void);
+  Test_Struct_Sequence ();
 
   /// dtor
-  ~Test_Struct_Sequence (void);
+  ~Test_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
@@ -79,15 +79,14 @@ private:
 };
 
 
-
 class Test_Unbounded_Struct_Sequence
 {
 public:
   /// ctor
-  Test_Unbounded_Struct_Sequence (void);
+  Test_Unbounded_Struct_Sequence ();
 
   /// dtor
-  ~Test_Unbounded_Struct_Sequence (void);
+  ~Test_Unbounded_Struct_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -99,16 +98,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index 5a8a760fa44..732dfa60d43 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -18,7 +18,7 @@
 //               Test_WString_Sequence
 // ************************************************************************
 
-Test_WString_Sequence::Test_WString_Sequence (void)
+Test_WString_Sequence::Test_WString_Sequence ()
   : opname_ (CORBA::string_dup ("test_wstrseq")),
     in_ (new CORBA::WStringSeq),
     inout_ (new CORBA::WStringSeq),
@@ -27,7 +27,7 @@ Test_WString_Sequence::Test_WString_Sequence (void)
 {
 }
 
-Test_WString_Sequence::~Test_WString_Sequence (void)
+Test_WString_Sequence::~Test_WString_Sequence ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -87,7 +87,7 @@ Test_WString_Sequence::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_WString_Sequence::reset_parameters (void)
+Test_WString_Sequence::reset_parameters ()
 {
   this->inout_ = new CORBA::WStringSeq; // delete the previous ones
   this->out_ = new CORBA::WStringSeq;
@@ -111,13 +111,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_WString_Sequence::check_validity (void)
+Test_WString_Sequence::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if ((this->in_->length () == this->inout_->length ()) &&
@@ -145,6 +144,6 @@ Test_WString_Sequence::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_WString_Sequence::print_values (void)
+Test_WString_Sequence::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h
index 8e30b16baf3..2c9f0e1ecd5 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.h
+++ b/TAO/tests/Param_Test/ub_wstr_seq.h
@@ -23,10 +23,10 @@ class Test_WString_Sequence
 {
 public:
   /// ctor
-  Test_WString_Sequence (void);
+  Test_WString_Sequence ();
 
   /// dtor
-  ~Test_WString_Sequence (void);
+  ~Test_WString_Sequence ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 2ac6eb0a5f7..a7cb2661178 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -18,7 +18,7 @@
 //               Test_Unbounded_WString
 // ************************************************************************
 
-Test_Unbounded_WString::Test_Unbounded_WString (void)
+Test_Unbounded_WString::Test_Unbounded_WString ()
   : opname_ (CORBA::string_dup ("test_unbounded_wstring")),
     in_ (0),
     inout_ (0),
@@ -27,7 +27,7 @@ Test_Unbounded_WString::Test_Unbounded_WString (void)
 {
 }
 
-Test_Unbounded_WString::~Test_Unbounded_WString (void)
+Test_Unbounded_WString::~Test_Unbounded_WString ()
 {
   CORBA::string_free (this->opname_);
   CORBA::wstring_free (this->in_);
@@ -97,7 +97,7 @@ Test_Unbounded_WString::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Unbounded_WString::reset_parameters (void)
+Test_Unbounded_WString::reset_parameters ()
 {
   // release any previously occupied values
   CORBA::wstring_free (this->inout_);
@@ -127,13 +127,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Unbounded_WString::check_validity (void)
+Test_Unbounded_WString::check_validity ()
 {
   CORBA::ULong len = ACE_OS::wslen (this->in_);
 
@@ -156,6 +155,6 @@ Test_Unbounded_WString::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Unbounded_WString::print_values (void)
+Test_Unbounded_WString::print_values ()
 {
 }
diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h
index 9363e126dc9..f8a4b2869cc 100644
--- a/TAO/tests/Param_Test/ub_wstring.h
+++ b/TAO/tests/Param_Test/ub_wstring.h
@@ -22,10 +22,10 @@ class Test_Unbounded_WString
 {
 public:
   /// ctor
-  Test_Unbounded_WString (void);
+  Test_Unbounded_WString ();
 
   /// dtor
-  ~Test_Unbounded_WString (void);
+  ~Test_Unbounded_WString ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 6f17cb122cd..f605579e183 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -13,12 +13,12 @@
 #include "helper.h"
 #include "ulonglong.h"
 
-Test_ULongLong::Test_ULongLong (void)
+Test_ULongLong::Test_ULongLong ()
   : opname_ (CORBA::string_dup ("test_ulonglong"))
 {
 }
 
-Test_ULongLong::~Test_ULongLong (void)
+Test_ULongLong::~Test_ULongLong ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -63,7 +63,7 @@ Test_ULongLong::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_ULongLong::reset_parameters (void)
+Test_ULongLong::reset_parameters ()
 {
   this->inout_ =  0;
   this->out_ =  0;
@@ -86,13 +86,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_ULongLong::check_validity (void)
+Test_ULongLong::check_validity ()
 {
   if (this->inout_ == this->in_ * 2 &&
       this->out_ == this->in_ * 3 &&
@@ -109,7 +108,7 @@ Test_ULongLong::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_ULongLong::print_values (void)
+Test_ULongLong::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n=*=*=*=*=*=*\n"
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index 3ac6270a6a9..44c091b0f52 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -19,10 +19,10 @@ class Test_ULongLong
 {
 public:
   /// ctor
-  Test_ULongLong (void);
+  Test_ULongLong ();
 
   /// dtor
-  ~Test_ULongLong (void);
+  ~Test_ULongLong ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -34,16 +34,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 845bdeafa58..52697acbe29 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -17,14 +17,14 @@
 //               Test_Var_Array
 // ************************************************************************
 
-Test_Var_Array::Test_Var_Array (void)
+Test_Var_Array::Test_Var_Array ()
   : opname_ (CORBA::string_dup ("test_var_array")),
     out_ (new Param_Test::Var_Array),
     ret_ (new Param_Test::Var_Array)
 {
 }
 
-Test_Var_Array::~Test_Var_Array (void)
+Test_Var_Array::~Test_Var_Array ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -79,7 +79,7 @@ Test_Var_Array::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Var_Array::reset_parameters (void)
+Test_Var_Array::reset_parameters ()
 {
   // free the out, and return value arrays
   Param_Test::Var_Array_free (this->out_._retn ());
@@ -104,13 +104,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Var_Array::check_validity (void)
+Test_Var_Array::check_validity ()
 {
   if (this->compare (this->in_, this->inout_) &&
       this->compare (this->in_, this->out_.in ()) &&
@@ -139,7 +138,7 @@ Test_Var_Array::compare (const Param_Test::Var_Array_slice *a1,
 }
 
 void
-Test_Var_Array::print_values (void)
+Test_Var_Array::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG, "IN array\n"));
   this->print (this->in_);
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 6bdfb158f99..a2819a96748 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -22,10 +22,10 @@ class Test_Var_Array
 {
 public:
   /// ctor
-  Test_Var_Array (void);
+  Test_Var_Array ();
 
   /// dtor
-  ~Test_Var_Array (void);
+  ~Test_Var_Array ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 5ff52e1d467..e865893a4bc 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -17,7 +17,7 @@
 //               Test_Var_Struct
 // ************************************************************************
 
-Test_Var_Struct::Test_Var_Struct (void)
+Test_Var_Struct::Test_Var_Struct ()
   : opname_ (CORBA::string_dup ("test_var_struct")),
     inout_ (new Param_Test::Var_Struct),
     out_ (new Param_Test::Var_Struct),
@@ -25,7 +25,7 @@ Test_Var_Struct::Test_Var_Struct (void)
 {
 }
 
-Test_Var_Struct::~Test_Var_Struct (void)
+Test_Var_Struct::~Test_Var_Struct ()
 {
   CORBA::string_free (this->opname_);
   this->opname_ = 0;
@@ -102,7 +102,7 @@ Test_Var_Struct::init_parameters (Param_Test_ptr)
 }
 
 int
-Test_Var_Struct::reset_parameters (void)
+Test_Var_Struct::reset_parameters ()
 {
   this->inout_ = new Param_Test::Var_Struct; // delete the previous ones
   this->out_ = new Param_Test::Var_Struct;
@@ -134,13 +134,12 @@ 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;
 }
 
 CORBA::Boolean
-Test_Var_Struct::check_validity (void)
+Test_Var_Struct::check_validity ()
 {
   CORBA::Boolean flag = 0;
   if (ACE::is_equal (this->in_.dbl, this->inout_->dbl) &&
@@ -183,7 +182,7 @@ Test_Var_Struct::check_validity (CORBA::Request_ptr )
 }
 
 void
-Test_Var_Struct::print_values (void)
+Test_Var_Struct::print_values ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n*=*=*=*=*=*=*=*=*=*=\n"
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index 810060418bd..63744ac5301 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -23,10 +23,10 @@ class Test_Var_Struct
 {
 public:
   /// ctor
-  Test_Var_Struct (void);
+  Test_Var_Struct ();
 
   /// dtor
-  ~Test_Var_Struct (void);
+  ~Test_Var_Struct ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -38,16 +38,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index d966325e7cc..e005ed056ed 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -75,7 +75,7 @@ marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfil
   TAO_Stub *stub_copy = obj_copy->_stubobj ();
   TAO_MProfile *copy_mprofile  = &(stub_copy->base_profiles ());
 
-  if ( copy_mprofile->size() != other_mprofile->size())
+  if (copy_mprofile->size() != other_mprofile->size())
     return false;
 
   for (size_t i=0; i<copy_mprofile->size(); ++i)
@@ -83,7 +83,7 @@ marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfil
       TAO_Profile *copy_profile  = copy_mprofile->get_profile (i);
       TAO_Profile *other_profile = other_mprofile->get_profile (i);
 
-      if ( ! equal_endpoint (copy_profile, other_profile) )
+      if (! equal_endpoint (copy_profile, other_profile) )
         return false;
     }
 
@@ -108,7 +108,7 @@ test_forward_permanent (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
 
   // ----- forward to obj2 permanently
-  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */ );
+  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -117,7 +117,7 @@ test_forward_permanent (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 4444));
 
   // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())));
 
   // ----- consume second profile of obj2
 
@@ -161,7 +161,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
 
   // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -170,7 +170,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
 
   // ----- forward to obj3
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -179,10 +179,10 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
 
   // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())));
 
   // ----- forward to obj4 permanently
-  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */ );
+  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -191,7 +191,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 4444));
 
   // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())));
 
   // ----- consume second profile from obj4
   profile = stub1->next_profile ();
@@ -199,7 +199,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 4444));
 
   // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -208,7 +208,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
 
   // ----- forward to obj3
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -217,10 +217,10 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
 
   // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())));
 
   // ----- forward to obj5 permanently
-  stub1->add_forward_profiles (stub5->base_profiles(), true /* permanent */ );
+  stub1->add_forward_profiles (stub5->base_profiles(), true /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -229,7 +229,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 5555));
 
   // ----- stringified object reference must be equal to obj5->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())));
 
   // ----- consume second profile from obj5
   profile = stub1->next_profile ();
@@ -237,7 +237,7 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 5555));
 
   // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())));
 
   // reached end of profiles, next_profile must return NULL
 
@@ -266,7 +266,7 @@ test_forward (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
 
   // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -276,7 +276,7 @@ test_forward (CORBA::ORB_ptr orb)
 
   // ----- forward to obj3
 
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
+  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */);
 
   FRANKS_ASSERT (stub1->forward_profiles () != 0);
 
@@ -285,7 +285,7 @@ test_forward (CORBA::ORB_ptr orb)
   FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
 
   // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())) );
+  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())));
 
   // ----- consume second profile of obj3
 
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 1c8ca3a272f..1138c02984e 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -269,7 +269,7 @@ Manipulation::perform_iteration (unsigned int *seed,
 
 
 int
-Manipulation::svc (void)
+Manipulation::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
index 470fb405b73..bb5950624a9 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
@@ -17,18 +17,18 @@ unsigned long Echo_Client_Request_Interceptor::other_count = 0;
 unsigned long Echo_Client_Request_Interceptor::exception_count = 0;
 
 Echo_Client_Request_Interceptor::
-Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Echo_Client_Interceptor");
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
index 9caeacbf816..423d2b4c3c5 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
@@ -16,17 +16,17 @@ class Echo_Client_Request_Interceptor
   , public virtual ::CORBA::LocalObject
 {
 public:
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
 
   static unsigned long request_count;
   static unsigned long reply_count;
   static unsigned long other_count;
   static unsigned long exception_count;
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
index 6c61020b8ad..8f2d59e1c85 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
@@ -17,7 +17,7 @@ Echo::echo_operation(char const * the_input)
 }
 
 void
-Echo::shutdown(void)
+Echo::shutdown()
 {
   this->orb_->shutdown(0);
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h
index 08ccf99822a..cfeeb682916 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h
@@ -16,7 +16,7 @@ public:
   Echo(CORBA::ORB_ptr orb);
 
   virtual char * echo_operation(char const * the_input);
-  virtual void shutdown(void);
+  virtual void shutdown();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index f42f292c474..5035f9222a8 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -5,7 +5,7 @@
  */
 #include "Echo_Handler.h"
 
-Echo_Handler::Echo_Handler(void)
+Echo_Handler::Echo_Handler()
   : replies_ (0)
 {
 }
@@ -22,7 +22,7 @@ Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *)
 }
 
 void
-Echo_Handler::shutdown (void)
+Echo_Handler::shutdown ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
index da7f3446d66..c6724297e0f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
@@ -13,11 +13,11 @@ class Echo_Handler
   : public POA_Test::AMI_EchoHandler
 {
 public:
-  Echo_Handler(void);
+  Echo_Handler();
 
   virtual void echo_operation(char const * retval);
   virtual void echo_operation_excep(::Messaging::ExceptionHolder * h);
-  virtual void shutdown(void);
+  virtual void shutdown();
   virtual void shutdown_excep(::Messaging::ExceptionHolder * h);
 
   CORBA::ULong replies () const;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
index 8c66d25f688..4ad01b0f983 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
@@ -9,18 +9,18 @@
 #include "tao/OctetSeqC.h"
 #include "ace/OS_NS_string.h"
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Echo_Server_Interceptor");
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
index 9c1a3479fd2..642eb6ed55f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
@@ -18,9 +18,9 @@ class Echo_Server_Request_Interceptor
 public:
   Echo_Server_Request_Interceptor ();
 
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
index 90f68a20090..3937b416bee 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
@@ -7,7 +7,7 @@
 #include "Server_ORBInitializer.h"
 #include "Server_Interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
index e7d40ed1447..22e298362fe 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
@@ -16,7 +16,7 @@ class Server_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 5bbf5592e50..e42d0b6dadb 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -150,7 +150,7 @@ namespace
         pi_current,
         location,
         correctTSCvalue,
-        correctRSCvalue );
+        correctRSCvalue);
 
     if (number && (0 != ACE_OS::strcmp( location, "receive_request" )))
     {
@@ -159,7 +159,7 @@ namespace
       data <<= number;
 
       ACE_DEBUG ((LM_DEBUG, "SERVER %C -> set_slot(RSC)", location));
-      ri->set_slot( slot_id, data );
+      ri->set_slot( slot_id, data);
 
       ACE_DEBUG ((LM_DEBUG, " -> long (%d)\n", number));
 
@@ -168,7 +168,7 @@ namespace
           pi_current,
           location,
           correctTSCvalue,
-          number );
+          number);
     }
   }
 }
@@ -207,7 +207,7 @@ class ReplicaController: public virtual ServerRequestInterceptor,
 {
   PortableInterceptor::Current_ptr pi_current_;
 public:
-  ReplicaController ( PortableInterceptor::Current_ptr pi_current )
+  ReplicaController (PortableInterceptor::Current_ptr pi_current )
     : pi_current_( pi_current )
   {
   }
@@ -227,7 +227,7 @@ public:
   virtual void
   tao_ft_interception_point (ServerRequestInfo_ptr ri, OctetSeq_out)
   {
-    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0 );
+    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0);
   }
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
@@ -235,39 +235,37 @@ public:
   receive_request_service_contexts (ServerRequestInfo_ptr ri)
   {
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61);
 #else
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0);
 #endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 */
   }
 
   virtual void
   receive_request (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62);
   }
 
   virtual void
   send_reply (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62);
   }
 
   virtual void
   send_exception (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62);
   }
 
   virtual void
   send_other (ServerRequestInfo_ptr ri)
   {
-    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62 );
+    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62);
   }
 };
 
-
-//
 class ORB_Initializer : public virtual ORBInitializer,
                         public virtual ::CORBA::LocalObject
 {
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_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index bfea67d3b52..5a5c04b804c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -18,7 +18,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   PortableInterceptor::ClientRequestInterceptor_ptr tmp =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index 6bb583988f2..4d6112bc7ef 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -18,7 +18,6 @@ void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   PortableInterceptor::ServerRequestInterceptor_ptr tmp =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 758467497be..bd10a07913b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -43,7 +43,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 
-
 void
 run_test (Test_Interceptors::Secure_Vault_ptr server)
 {
@@ -136,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/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 7289df05aaa..2b058217bb8 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -8,7 +8,7 @@
 const CORBA::ULong request_ctx_id = 0xdead;
 //const CORBA::ULong reply_ctx_id = 0xbeef;   // Never used.
 
-Vault_Client_Request_Interceptor::Vault_Client_Request_Interceptor (void)
+Vault_Client_Request_Interceptor::Vault_Client_Request_Interceptor ()
   : myname_ ("Vault_Client_Interceptor")
 {
 }
@@ -18,13 +18,13 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor ()
 }
 
 char *
-Vault_Client_Request_Interceptor::name (void)
+Vault_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_Interceptor::destroy (void)
+Vault_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -39,7 +39,6 @@ void
 Vault_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
@@ -79,7 +78,6 @@ void
 Vault_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
@@ -102,7 +100,6 @@ void
 Vault_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
@@ -122,7 +119,7 @@ Vault_Client_Request_Interceptor::receive_exception (
 
 //////////////////////////////////  Context /////////////////////////
 
-Vault_Client_Request_Context_Interceptor::Vault_Client_Request_Context_Interceptor (void)
+Vault_Client_Request_Context_Interceptor::Vault_Client_Request_Context_Interceptor ()
   : myname_ ("Vault_Client_Context_Interceptor")
 {
 }
@@ -153,7 +150,6 @@ void
 Vault_Client_Request_Context_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   // MAke the context to send the context to the target
   IOP::ServiceContext sc;
   sc.context_id = request_ctx_id;
@@ -184,14 +180,12 @@ void
 Vault_Client_Request_Context_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
 {
-
 }
 
 void
 Vault_Client_Request_Context_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
@@ -211,7 +205,7 @@ Vault_Client_Request_Context_Interceptor::receive_exception (
 
 ///////////////////////////////////Dynamic ////////////////////////////////////
 
-Vault_Client_Request_Dynamic_Interceptor::Vault_Client_Request_Dynamic_Interceptor (void)
+Vault_Client_Request_Dynamic_Interceptor::Vault_Client_Request_Dynamic_Interceptor ()
   : myname_ ("Vault_Client_Dynamic_Interceptor")
 {
 }
@@ -242,7 +236,6 @@ void
 Vault_Client_Request_Dynamic_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
  if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
@@ -274,7 +267,6 @@ void
 Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
@@ -307,7 +299,6 @@ void
 Vault_Client_Request_Dynamic_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
@@ -327,7 +318,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception (
 
 //////////////////////////////NOOP///////////////////////////////////////
 
-Vault_Client_Request_NOOP_Interceptor::Vault_Client_Request_NOOP_Interceptor (void)
+Vault_Client_Request_NOOP_Interceptor::Vault_Client_Request_NOOP_Interceptor ()
   : myname_ ("Vault_Client_NOOP_Interceptor")
 {
 }
@@ -337,7 +328,7 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor ()
 }
 
 char *
-Vault_Client_Request_NOOP_Interceptor::name (void)
+Vault_Client_Request_NOOP_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
@@ -358,7 +349,6 @@ void
 Vault_Client_Request_NOOP_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr)
 {
-
 }
 
 void
@@ -372,14 +362,12 @@ void
 Vault_Client_Request_NOOP_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
 {
-
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index de95918d721..c03c79af263 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -23,15 +23,15 @@ class Vault_Client_Request_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_Interceptor (void);
+  Vault_Client_Request_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -53,15 +53,15 @@ class Vault_Client_Request_Context_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_Context_Interceptor (void);
+  Vault_Client_Request_Context_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_Context_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -83,15 +83,15 @@ class Vault_Client_Request_Dynamic_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_Dynamic_Interceptor (void);
+  Vault_Client_Request_Dynamic_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_Dynamic_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -113,15 +113,15 @@ class Vault_Client_Request_NOOP_Interceptor
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Client_Request_NOOP_Interceptor (void);
+  Vault_Client_Request_NOOP_Interceptor ();
   // ctor.
   virtual ~Vault_Client_Request_NOOP_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.h b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
index 032e5d1771a..8d506979e33 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
@@ -6,7 +6,6 @@
 class Marker
 {
  public:
-
   void accumulate_into (ACE_Throughput_Stats &throughput,
                         int which_method) const;
   // Accumulate the throughput statistics into <throughput>
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index 1cb6435172c..ca63b652bc1 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -8,7 +8,7 @@
 const CORBA::ULong request_ctx_id = 0xdead;
 //const CORBA::ULong reply_ctx_id = 0xbeef;   // Never used.
 
-Vault_Server_Request_Interceptor::Vault_Server_Request_Interceptor (void)
+Vault_Server_Request_Interceptor::Vault_Server_Request_Interceptor ()
   : myname_ ("Vault_Server_Interceptor")
 {
 }
@@ -18,13 +18,13 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor ()
 }
 
 char *
-Vault_Server_Request_Interceptor::name (void)
+Vault_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_Interceptor::destroy (void)
+Vault_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -39,7 +39,6 @@ void
 Vault_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
@@ -73,7 +72,6 @@ void
 Vault_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
@@ -102,7 +100,7 @@ Vault_Server_Request_Interceptor::send_other (
 
 //////////////////////////////////  Context /////////////////////////
 
-Vault_Server_Request_Context_Interceptor::Vault_Server_Request_Context_Interceptor (void)
+Vault_Server_Request_Context_Interceptor::Vault_Server_Request_Context_Interceptor ()
   : myname_ ("Vault_Server_Context_Interceptor")
 {
 }
@@ -133,7 +131,6 @@ void
 Vault_Server_Request_Context_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   IOP::ServiceId id = request_ctx_id;
   IOP::ServiceContext_var sc =
     ri->get_request_service_context (id);
@@ -148,7 +145,6 @@ void
 Vault_Server_Request_Context_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
 {
-
 }
 
 void
@@ -166,7 +162,7 @@ Vault_Server_Request_Context_Interceptor::send_other (
 
 ///////////////////////////////////Dynamic ////////////////////////////////////
 
-Vault_Server_Request_Dynamic_Interceptor::Vault_Server_Request_Dynamic_Interceptor (void)
+Vault_Server_Request_Dynamic_Interceptor::Vault_Server_Request_Dynamic_Interceptor ()
   : myname_ ("Vault_Server_Dynamic_Interceptor")
 {
 }
@@ -190,7 +186,6 @@ void
 Vault_Server_Request_Dynamic_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
@@ -229,7 +224,6 @@ void
 Vault_Server_Request_Dynamic_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
@@ -264,7 +258,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_other (
 
 //////////////////////////////NOOP///////////////////////////////////////
 
-Vault_Server_Request_NOOP_Interceptor::Vault_Server_Request_NOOP_Interceptor (void)
+Vault_Server_Request_NOOP_Interceptor::Vault_Server_Request_NOOP_Interceptor ()
   : myname_ ("Vault_Server_NOOP_Interceptor")
 {
 }
@@ -274,7 +268,7 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor ()
 }
 
 char *
-Vault_Server_Request_NOOP_Interceptor::name (void)
+Vault_Server_Request_NOOP_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
@@ -301,7 +295,6 @@ void
 Vault_Server_Request_NOOP_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr)
 {
-
 }
 
 void
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index 0f2492ffa39..81b3db59fea 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -23,15 +23,15 @@ class Vault_Server_Request_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_Interceptor (void);
+  Vault_Server_Request_Interceptor ();
   // cotr.
   ~Vault_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -54,15 +54,15 @@ class Vault_Server_Request_Context_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_Context_Interceptor (void);
+  Vault_Server_Request_Context_Interceptor ();
   // cotr.
   ~Vault_Server_Request_Context_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -85,15 +85,15 @@ class Vault_Server_Request_Dynamic_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_Dynamic_Interceptor (void);
+  Vault_Server_Request_Dynamic_Interceptor ();
   // cotr.
   ~Vault_Server_Request_Dynamic_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -116,15 +116,15 @@ class Vault_Server_Request_NOOP_Interceptor
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
-  Vault_Server_Request_NOOP_Interceptor (void);
+  Vault_Server_Request_NOOP_Interceptor ();
   // cotr.
   ~Vault_Server_Request_NOOP_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index 3494d7b5565..83e4589c1ee 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -9,7 +9,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
 // ctor
 
 CORBA::Short
-Secure_Vault_i::ready (void)
+Secure_Vault_i::ready ()
 {
   return 1;
 }
@@ -19,7 +19,6 @@ Secure_Vault_i::authenticate (const char * user)
 {
   if (ACE_OS::strcmp (user, "root") != 0)
     throw Test_Interceptors::Invalid ();
-
 }
 
 CORBA::Long
@@ -30,7 +29,7 @@ return 1;
 }
 
 void
-Secure_Vault_i::shutdown (void)
+Secure_Vault_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
index cf7340431d0..e851bded5d1 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -20,12 +20,11 @@
  */
 class Secure_Vault_i : public POA_Test_Interceptors::Secure_Vault
 {
-
 public:
   /// ctor
   Secure_Vault_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Short ready (void);
+  virtual CORBA::Short ready ();
 
   /// Passwd sent in the service context list
   virtual void authenticate (const char * user);
@@ -33,7 +32,7 @@ public:
   virtual CORBA::Long update_records (CORBA::Long id,
                                       const Test_Interceptors::Secure_Vault::Record & val);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
  private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index 8477a62bab0..566d38b8efb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
@@ -16,7 +16,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index 83fff97dd0e..ebcb1dea9b6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Server_ORBInitializer.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
@@ -27,7 +27,7 @@ Server_ORBInitializer::post_init (
 }
 
 Echo_Server_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index 78a1655f7cd..5e0bcf8d23d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -35,7 +35,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  Echo_Server_Request_Interceptor * server_interceptor (void);
+  Echo_Server_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index 50382009f30..2c332e94e2b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -34,7 +34,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 void
 run_test (Test_Interceptors::Visual_ptr server)
 {
-
   server->normal (10);
 
   ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n"));
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index f295510e9df..31bcf86a546 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -18,18 +18,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -169,7 +169,6 @@ void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
@@ -278,7 +277,6 @@ void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index 571addecc3e..2d45f3da618 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index 044a8d74dac..2754caf08c9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -11,7 +11,7 @@ const char *forward_msg = "FORWARD message";
 int send_request_count = 0;
 int exception_count = 0;
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -22,7 +22,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::Object_
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
@@ -39,13 +39,13 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -53,7 +53,6 @@ void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -122,7 +121,6 @@ void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -168,7 +166,6 @@ void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 940b75fd189..ddad3bc28d5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -22,7 +22,7 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   Echo_Server_Request_Interceptor (CORBA::Object_ptr forward_location);
@@ -32,10 +32,10 @@ public:
 
   void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 268a43a0843..782c68db4b9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long arg)
 }
 
 void
-Visual_i::nothing (void)
+Visual_i::nothing ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
index b3bc101f5c0..9575ea19d64 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
@@ -21,26 +21,22 @@
  */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-
 public:
-
   Visual_i (CORBA::ORB_ptr orb);
 
   void normal (CORBA::Long arg);
 
-  void nothing (void);
+  void nothing ();
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
-
   /// The ORB pseudo-reference (for shutdown).
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
index 928a4bcaf22..d866b6b4bc4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Client_ORBInitializer.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void) :
+Client_ORBInitializer::Client_ORBInitializer () :
   pre_init_called (false),
   post_init_called (false)
 {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index 8370ccc962f..e9a21bcabfb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
index 45d43b27eca..04d12398ace 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
@@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
     client_interceptor = cri;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
index 55063792acd..346b31b2b5a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
@@ -33,7 +33,6 @@ class ClientORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
index 3c88fae18c2..776f2b80058 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
@@ -7,12 +7,12 @@
   CORBA::Boolean
   ClientRequest_Interceptor::success_flag_ = 0;
 
-  ClientRequest_Interceptor::ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::ClientRequest_Interceptor ()
     : name_ ("ClientRequest_Interceptor")
   {
   }
 
-  ClientRequest_Interceptor::~ClientRequest_Interceptor (void)
+  ClientRequest_Interceptor::~ClientRequest_Interceptor ()
   {
   }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
index 53d5ad3bed2..1ba41d68aba 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
@@ -28,10 +28,9 @@ class ClientRequest_Interceptor
   public virtual ::CORBA::LocalObject
 {
 public:
+ClientRequest_Interceptor ();
 
-ClientRequest_Interceptor (void);
-
-~ClientRequest_Interceptor (void);
+~ClientRequest_Interceptor ();
 
 /// Canonical name of the interceptor.
 virtual char * name ();
@@ -52,10 +51,8 @@ virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 static CORBA::Boolean success_flag_;
 
 private:
-
 /// Name of the interceptor
 const char *name_;
-
 };
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
index 2e31783440f..16f276e957c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
@@ -14,5 +14,5 @@ Hello::get_string ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0 );
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
index 517fc42e10b..5aba8dd860f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         orb->string_to_object (ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () );
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
index 951ccc19cb7..f62002d9634 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
@@ -39,10 +39,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" );
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () );
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () );
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index e161807d365..61c8e926566 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index bf5d836fee0..af2c08b472e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "Server_ORBInitializer.h"
 extern PortableInterceptor::SlotId slotId;
 
-Server_ORBInitializer::Server_ORBInitializer (void) :
+Server_ORBInitializer::Server_ORBInitializer () :
   server_interceptor_ (0)
 {
 }
@@ -31,7 +31,7 @@ Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 }
 
 Echo_Server_Request_Interceptor *
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return this->server_interceptor_;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
index 78a1655f7cd..5e0bcf8d23d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -35,7 +35,7 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  Echo_Server_Request_Interceptor * server_interceptor (void);
+  Echo_Server_Request_Interceptor * server_interceptor ();
 
 private:
   /// Pointer to the server request interceptor.  ORB is responsible
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index 684b13eb11b..e0ab454d3b6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -84,7 +84,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
         ACE_hthread_t threadHandle;
-        if ( ACE_Thread::spawn(run_test,
+        if (ACE_Thread::spawn(run_test,
                                static_cast<void*>(server.in()),
                                THR_NEW_LWP | THR_JOINABLE ,
                                0,
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index ae8793e46e2..7b759392ab7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -13,18 +13,18 @@ Echo_Client_Request_Interceptor ()
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index 33ed2b76898..b95a9c42942 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index b3ba85faa40..a72fdff27e8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0x08154711;
 const char * const request_msg = "TEST 0123456789 TEST";
 PortableInterceptor::SlotId slotId = 0;
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -32,7 +32,6 @@ void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index 40f5e613113..d1a0232cc2c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 8c8edb1a9b0..fb2a94f49a7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -16,7 +16,7 @@ Visual_i::normal (CORBA::Long arg)
   // retrieve Slot
   CORBA::Object_var piobj = orb_->resolve_initial_references ("PICurrent");
   PortableInterceptor::Current_var pi_current =
-      PortableInterceptor::Current::_narrow (piobj.in () );
+      PortableInterceptor::Current::_narrow (piobj.in ());
 
   if (CORBA::is_nil (pi_current.in ()))
   {
@@ -49,7 +49,7 @@ Visual_i::normal (CORBA::Long arg)
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
index 7d4b75dbc4d..907bd7cf5c1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
@@ -21,19 +21,15 @@
  */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-
 public:
-
   Visual_i (CORBA::ORB_ptr orb);
 
   void normal (CORBA::Long arg);
-  void shutdown (void);
+  void shutdown ();
 
 private:
-
   /// The ORB pseudo-reference (for shutdown).
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
index 8b78e2b5f97..b744352dca6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
@@ -59,7 +59,6 @@ Client_ORBInitializer::post_init (
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
index 93609cf3607..0d450a559b7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
@@ -27,7 +27,6 @@ class Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
index 3847c69378d..2bbe7130977 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
@@ -19,13 +19,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
index 6a7adb205d8..f49952472cb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
@@ -27,7 +27,6 @@ class Client_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *orb_id,
                               const char *first_forward_str,
@@ -43,9 +42,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
@@ -64,7 +63,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -80,7 +78,6 @@ private:
 
   CORBA::String_var first_forward_str_;
   CORBA::String_var second_forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
index a59e89f3924..8102a86f94b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
index 116752a998e..d00d8969405 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
@@ -31,7 +31,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
index a30c6d173d6..cfd431d23c5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
@@ -4,23 +4,23 @@
 #include "ace/Log_Msg.h"
 #include "CrashPoint.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
index 1f2abcbc24b..dfe78ead1d4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
@@ -26,9 +26,8 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -40,9 +39,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -61,15 +60,12 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
-
   /// The number of requests intercepted by this interceptor.
   CORBA::ULong request_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
index 6f1099729ed..230593e47fb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
@@ -15,28 +15,25 @@
 class test_i : public virtual POA_RedirectionTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
index 3d1aedf4e24..965ca540dbb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
@@ -29,7 +29,6 @@ class Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
index 696af631cbd..98c570dbe97 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
@@ -3,7 +3,7 @@
 #include "testC.h"
 #include "ace/Log_Msg.h"
 
-Client_Request_Interceptor::Client_Request_Interceptor (void)
+Client_Request_Interceptor::Client_Request_Interceptor ()
   : request_count_ (0),
     receive_exception_count_ (0)
 {
@@ -22,13 +22,13 @@ Client_Request_Interceptor::request_count () const
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
index 143f7b9f0c6..1f0022bb517 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
@@ -27,9 +27,8 @@ class Client_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Client_Request_Interceptor (void);
+  Client_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Client Request Interceptor
@@ -41,9 +40,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
index 6f1099729ed..230593e47fb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
@@ -15,28 +15,25 @@
 class test_i : public virtual POA_RedirectionTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
index ee3dd1054dc..85d6db42080 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
@@ -48,7 +48,6 @@ Client_ORBInitializer::post_init (
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
index 93609cf3607..0d450a559b7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
@@ -27,7 +27,6 @@ class Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
index d8033778330..d525a2c6d2b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
@@ -16,13 +16,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
index c9090eae741..c2e3149538d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
@@ -41,9 +41,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
index 8757a4d19ab..59f89e64428 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
@@ -16,22 +16,20 @@
 class test_i : public virtual POA_RTTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index 33dbd1eff79..b09c3d471ea 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -42,7 +42,6 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
 
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
index a50d948a0a2..e2771dc35d1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
@@ -15,14 +15,13 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
@@ -30,7 +29,6 @@ private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index bfe8918012a..ef18249f61e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -25,7 +25,6 @@ class Echo_Collocated_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index d59fc6c198a..02379f9d593 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -16,11 +16,10 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
-
       CORBA::Object_var poa_object =
         sorb_->resolve_initial_references ("RootPOA");
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index 23dfac6b088..4d610d156c7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index fb93e7ba264..d3bc9c6d76f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -10,7 +10,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -20,13 +20,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -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)
     {
@@ -164,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_exception (
               exception_id.in ()));
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -174,13 +173,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -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/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 27ee8755b50..48808b448be 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -24,16 +24,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
@@ -60,15 +59,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 24d6b91041f..bf3e91814a7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
index d2ee1a7d7a4..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
@@ -20,7 +20,6 @@
  */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-
 public:
   /// ctor
   Visual_i (CORBA::ORB_ptr orb);
@@ -31,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 22691fc3001..ccbc53f7bfe 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -12,7 +12,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
index bc2ed90101e..9def7b204d8 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
@@ -17,14 +17,13 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
@@ -32,7 +31,6 @@ private:
   const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
index e86871a0cae..30a760155d1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "interceptors.h"
 #include "ace/OS_NS_string.h"
 
-Collocated_ORBInitializer::Collocated_ORBInitializer (void)
+Collocated_ORBInitializer::Collocated_ORBInitializer ()
 {
 }
 
@@ -16,7 +16,6 @@ void
 Collocated_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 7d7fd7ebafe..6f89c98c60b 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -24,7 +24,7 @@ class Collocated_ORBInitializer :
 {
 public:
   /// Constructor
-  Collocated_ORBInitializer (void);
+  Collocated_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index 9217cbc8aae..352a9d43559 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -15,7 +15,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
index 022376a0ccd..2700b4b77c3 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
@@ -26,7 +26,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index d37a68bc5aa..b2fafc6a4f3 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -14,18 +14,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -40,7 +40,6 @@ void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
@@ -101,7 +100,6 @@ void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
@@ -245,24 +243,24 @@ Echo_Client_Request_Interceptor::receive_exception (
     }
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) ~Echo_Server_Request_Interceptor\n"));
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -324,7 +322,6 @@ void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -370,7 +367,6 @@ void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index 009b2779714..c82ef51c8ee 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
@@ -59,16 +59,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index 651aa681fc6..f255f6fad0f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long)
 }
 
 void
-Visual_i::nothing (void)
+Visual_i::nothing ()
 {
 //  ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   //  this->_remove_ref ();
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n"));
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
index 5be947e1c67..4593c3e7f18 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
@@ -19,26 +19,22 @@
  */
 class Visual_i : public virtual POA_Test_Interceptors::Visual
 {
-
 public:
-
   Visual_i (CORBA::ORB_ptr orb);
 
   void normal (CORBA::Long arg);
 
-  void nothing (void);
+  void nothing ();
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
-
   /// The ORB pseudo-reference (for shutdown).
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* SERVICE_CONTEXT_MANIPULATION_COLLOCATED_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index a51d948d3a1..024e5d6fd5e 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -19,7 +19,6 @@ void
 Echo_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index f50e351c6f2..3d16645c0a9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -19,7 +19,6 @@ void
 Echo_Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
 
@@ -32,7 +31,6 @@ Echo_Server_ORBInitializer::post_init (
     server_interceptor = interceptor;
 
   info->add_server_request_interceptor (server_interceptor.in ());
-
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/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/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index d852f17e999..36ee9800e63 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -49,7 +49,6 @@ Client_ORBInitializer::post_init (
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index b5fdc3533d4..aeb353b6d47 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -39,7 +39,6 @@ class Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index f16500edbc4..472d2c4b846 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -21,7 +21,7 @@ Client_Request_Interceptor::name ()
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -90,7 +90,6 @@ void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Boolean response_expected =
     ri->response_expected ();
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index df858f6df1f..100a1c7de26 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -62,9 +62,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index d014deb7204..8ee1d22830c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -7,7 +7,7 @@
 
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
   : server_interceptor_ ()
 {
 }
@@ -38,7 +38,7 @@ Server_ORBInitializer::post_init (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-Server_ORBInitializer::server_interceptor (void)
+Server_ORBInitializer::server_interceptor ()
 {
   return
     PortableInterceptor::ServerRequestInterceptor::_duplicate (
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index d114eaad4a2..31dab8edb87 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -42,9 +42,8 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
@@ -52,10 +51,9 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor ();
 
 private:
-
   /// Pointer to the server request interceptor.  ORB is responsible
   /// for storage.
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor_;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index abb69742827..4bb03f0dea1 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -4,14 +4,14 @@
 #include "tao/ORB_Constants.h"
 #include "ace/Log_Msg.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
 {
   this->obj_[0] = CORBA::Object::_nil ();
   this->obj_[1] = CORBA::Object::_nil ();
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
@@ -32,13 +32,13 @@ Server_Request_Interceptor::forward_references (
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   CORBA::release (this->obj_[0]);
   CORBA::release (this->obj_[1]);
@@ -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/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 7b39129e39c..0afdbc2cc13 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -57,9 +57,8 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
@@ -75,9 +74,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -96,18 +95,15 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
-
   /// The number of requests intercepted by this interceptor.
   CORBA::ULong request_count_;
 
   /// References to the two objects used in this test.
   CORBA::Object_ptr obj_[2];
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
index b090101f442..4d1bf88b83e 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
@@ -26,28 +26,25 @@
 class test_i : public virtual POA_ForwardRequestTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index cf8278aade8..1050f2e24dd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -18,7 +18,7 @@ FOO_ClientRequestInterceptor::name ()
 }
 
 void
-FOO_ClientRequestInterceptor::destroy (void)
+FOO_ClientRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index 98d52470874..63c5da7f136 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -44,7 +44,6 @@ class FOO_ClientRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor
   FOO_ClientRequestInterceptor (IOP::Codec_ptr codec);
 
@@ -58,9 +57,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
@@ -79,11 +78,9 @@ public:
   //@}
 
 private:
-
   /// The CDR encapsulation coder/decoder used to retrieve data
   /// from the CDR encapsulation in the tagged component.
   IOP::Codec_var codec_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index b0133e9c020..e3683bcaba5 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -41,7 +41,6 @@ class FOO_Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the ORBInitializer Interface
    *
@@ -58,7 +57,6 @@ public:
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index 3edbd032331..1c8ba647fe6 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -9,13 +9,13 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec)
 }
 
 char *
-FOO_IORInterceptor::name (void)
+FOO_IORInterceptor::name ()
 {
   return CORBA::string_dup ("FOO_IORInterceptor");
 }
 
 void
-FOO_IORInterceptor::destroy (void)
+FOO_IORInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 9a1a9d29007..3c112084dbb 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -44,7 +44,6 @@ class FOO_IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor
   FOO_IORInterceptor (IOP::Codec_ptr codec);
 
@@ -57,10 +56,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -80,11 +79,9 @@ public:
   //@}
 
 private:
-
   /// The CDR encapsulation coder/decoder used to encapsulate data
   /// into a CDR encapsulation.
   IOP::Codec_var codec_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index 3b18ab97d9f..e113ae0c8ff 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -41,7 +41,6 @@ class FOO_IORInterceptor_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the ORBInitializer Interface
    *
@@ -58,7 +57,6 @@ public:
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index b5d29c3c716..9c39d8a1caf 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\"test_i\" is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
index 8fac6acd218..d134932f461 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
@@ -27,18 +27,15 @@
 class test_i : public virtual POA_FOO::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::ORB_ptr orb);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
index 3d40a03806b..b0153e132fd 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
@@ -40,7 +40,6 @@ class Server_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Server_ORBInitializer (bool & destroy_called);
 
@@ -49,11 +48,9 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Flag that states whether this interceptor's @c destroy() method
   /// was called.
   bool & destroy_called_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index d8b124a8f65..9d4b972d2db 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -7,7 +7,7 @@ Server_Request_Interceptor::Server_Request_Interceptor (bool & destroy_called)
   this->destroy_called_ = false;  // Sanity check.
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
   // ORB::destroy() should have been called, which in turn should have
   // called the Interceptor::destroy() method in all registered
@@ -16,13 +16,13 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
   this->destroy_called_ = true;
 }
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
index 5ff49c29e94..0d5145d6f5e 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
@@ -44,7 +44,6 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Server_Request_Interceptor (bool & destroy_called);
 
@@ -58,9 +57,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -79,16 +78,13 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
-
   /// Flag that states whether this interceptor's @c destroy() method
   /// was called.
   bool & destroy_called_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index b49ee6ca120..2b3a90c9569 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -5,18 +5,18 @@ test_i::test_i (CORBA::ORB_ptr orb)
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 void
-test_i::hello (void)
+test_i::hello ()
 {
   ACE_DEBUG ((LM_DEBUG, "Hello!\n"));
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Shutting down ORB.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
index 4c92469bd14..0a9f179428e 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
@@ -26,24 +26,21 @@
 class test_i : public virtual POA_test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Say hello.
-  virtual void hello (void);
+  virtual void hello ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index bdb22b875ce..5b9b0d95de9 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -18,7 +18,7 @@ ClientRequestInterceptor::name ()
 }
 
 void
-ClientRequestInterceptor::destroy (void)
+ClientRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index 0bca4b49de4..efac9183c17 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -57,9 +57,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 04cb706bf19..2e4b67a75d0 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -16,7 +16,7 @@ ClientRequestInterceptor2::name ()
 }
 
 void
-ClientRequestInterceptor2::destroy (void)
+ClientRequestInterceptor2::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index bb69b5c1e82..0ec007e0330 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -53,9 +53,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index 74b6a11a33f..bc573411f0a 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -13,13 +13,13 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (void)
+ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (void)
+ServerRequestInterceptor::destroy ()
 {
 }
 
@@ -27,7 +27,6 @@ void
 ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
@@ -105,14 +104,12 @@ ServerRequestInterceptor::receive_request (
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Server side RSC/TSC semantics appear "
               "to be correct.\n"));
-
 }
 
 void
 ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index d9990d5b102..314cdc19524 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -56,9 +56,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index d8deb2c5e89..6562d415e01 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -10,12 +10,12 @@ test_i::test_i (PortableInterceptor::Current_ptr current,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 void
-test_i::invoke_me (void)
+test_i::invoke_me ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test method invoked.\n"));
@@ -121,14 +121,14 @@ test_i::invoke_me (void)
 }
 
 void
-test_i::invoke_you (void)
+test_i::invoke_you ()
 {
   // Nothing to be tested here.  This method is here just so that we
   // have a different method
 }
 
 void
-test_i::invoke_we (void)
+test_i::invoke_we ()
 {
   // Insert some data into the TSC PICurrent object.
   const char str[] = "We drink milk!";
@@ -160,7 +160,7 @@ test_i::invoke_we (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Server is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index 9e370707c0e..19c056bcc77 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -35,21 +35,21 @@ public:
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Main servant test method.
-  virtual void invoke_me (void);
+  virtual void invoke_me ();
 
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
-  virtual void invoke_you (void);
+  virtual void invoke_you ();
 
   /// Test just a set slot
-  virtual void invoke_we (void);
+  virtual void invoke_we ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Reference to the PICurrent object.
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index f33cdc51bb2..11d2a656315 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -1,24 +1,24 @@
 #include "IORInterceptor.h"
 #include "testC.h"
 
-IORInterceptor::IORInterceptor (void)
+IORInterceptor::IORInterceptor ()
   : success_ (false)
 {
 }
 
-IORInterceptor::~IORInterceptor (void)
+IORInterceptor::~IORInterceptor ()
 {
   ACE_ASSERT (this->success_);
 }
 
 char *
-IORInterceptor::name (void)
+IORInterceptor::name ()
 {
   return CORBA::string_dup ("");
 }
 
 void
-IORInterceptor::destroy (void)
+IORInterceptor::destroy ()
 {
   ACE_ASSERT (this->success_);
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index 8645f7923fd..7fdcf1fe48b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -43,9 +43,8 @@ class IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor
-  IORInterceptor (void);
+  IORInterceptor ();
 
   /**
    * @name Methods Required by the IOR Interceptor Interface
@@ -56,10 +55,10 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
@@ -67,19 +66,16 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  ~IORInterceptor (void);
+  ~IORInterceptor ();
 
 private:
-
   /// IORInterceptor successfully called and executed.
   bool success_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index bd8f1ee2fd1..76dc3704ee8 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -8,24 +8,24 @@ Policy::Policy (CORBA::ULong val)
 {
 }
 
-Policy::~Policy (void)
+Policy::~Policy ()
 {
 }
 
 CORBA::ULong
-Policy::value (void)
+Policy::value ()
 {
   return this->value_;
 }
 
 CORBA::PolicyType
-Policy::policy_type (void)
+Policy::policy_type ()
 {
   return Test::POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-Policy::copy (void)
+Policy::copy ()
 {
   CORBA::Policy_ptr p;
   ACE_NEW_THROW_EX (p,
@@ -36,6 +36,6 @@ Policy::copy (void)
 }
 
 void
-Policy::destroy (void)
+Policy::destroy ()
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
index 13dbb42bc94..5fc98b06d6b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
@@ -29,33 +29,29 @@ class Policy
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Policy (CORBA::ULong val);
 
   /// Test method defined in test IDL.
-  virtual CORBA::ULong value (void);
+  virtual CORBA::ULong value ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce proper memory management through
    * the reference counting mechanism.
    */
-  ~Policy (void);
+  ~Policy ();
 
 private:
-
   /// Pseudo-reference to the ORB.
   const CORBA::ULong value_;
-
 };
 
 #endif  /* POLICY_H */
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
index e9ae6e787d8..e09da0fda7b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
@@ -40,7 +40,6 @@ class PolicyFactory
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the PolicyFactory Interface
    *
@@ -49,13 +48,11 @@ public:
    * methods required for all PolicyFactory sub-classes.
    */
   //@{
-
   /// Construct a Test::Policy object as a test.
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value);
 
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
index 6abfc989558..0ef06a407d1 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
@@ -41,7 +41,6 @@ class Server_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the ORBInitializer Interface
    *
@@ -58,7 +57,6 @@ public:
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index 545aac08305..024ccda2a71 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
@@ -42,7 +42,6 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
 
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
index 617fef26373..6cf5b7383db 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
@@ -15,14 +15,13 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
index 9fc120bc16b..f84549feba5 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
@@ -27,7 +27,6 @@ class Echo_Collocated_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   Echo_Collocated_ORBInitializer
     (PortableInterceptor::ProcessingMode server_proc_mode,
      PortableInterceptor::ProcessingMode client_proc_mode);
@@ -37,7 +36,6 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   PortableInterceptor::ProcessingMode server_processing_mode_;
   PortableInterceptor::ProcessingMode client_processing_mode_;
 };
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index d59fc6c198a..02379f9d593 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -16,11 +16,10 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
-
       CORBA::Object_var poa_object =
         sorb_->resolve_initial_references ("RootPOA");
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
index ce62b3f44da..e37c9eeb814 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   /// The status of the svc loop
   int status () const;
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 f74bba712bd..e6908f39945 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -12,7 +12,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -22,13 +22,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -81,7 +81,6 @@ void
 Echo_Client_Request_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
@@ -99,7 +98,6 @@ void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
@@ -122,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)
     {
@@ -151,7 +148,6 @@ void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
@@ -173,7 +169,7 @@ Echo_Client_Request_Interceptor::receive_exception (
               exception_id.in ()));
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -183,13 +179,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -203,7 +199,6 @@ void
 Echo_Server_Request_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
@@ -232,7 +227,6 @@ Echo_Server_Request_Interceptor::receive_request (
       ACE_DEBUG ((LM_DEBUG,
                   "The arg is %d\n",
                   param));
-
      }
 
   CORBA::String_var tmdi =
@@ -247,7 +241,6 @@ void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
@@ -301,7 +294,6 @@ void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index e7a1e47c1ab..861dea81496 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -23,16 +23,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
@@ -59,15 +58,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index f46bcf08ccb..5d544f50620 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
index d2ee1a7d7a4..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
@@ -20,7 +20,6 @@
  */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-
 public:
   /// ctor
   Visual_i (CORBA::ORB_ptr orb);
@@ -31,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index c7e728d43c4..da7362004ab 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -13,11 +13,10 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
-
       CORBA::Object_var object =
         corb_->string_to_object (input_);
 
@@ -43,7 +42,6 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
 
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
index 6490e7cd1c6..b22248e78a8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
@@ -15,14 +15,13 @@
 class Client_Task : public ACE_Task_Base
 {
 public:
-
   /// Constructor
   Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
index 51fdd6e6f9f..1cd1106af9c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
@@ -28,7 +28,6 @@ class Echo_Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   Echo_Client_ORBInitializer
     (PortableInterceptor::ProcessingMode proc_mode);
 
@@ -37,7 +36,6 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   PortableInterceptor::ProcessingMode processing_mode_;
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
index 1918eb4f31f..45b01980a1c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
@@ -27,7 +27,6 @@ class Echo_Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   Echo_Server_ORBInitializer
     (PortableInterceptor::ProcessingMode proc_mode);
 
@@ -36,7 +35,6 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   PortableInterceptor::ProcessingMode processing_mode_;
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index a219c75da48..748a2d9369b 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -16,11 +16,10 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
-
       CORBA::Object_var poa_object =
         sorb_->resolve_initial_references ("RootPOA");
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
index 9915f4e1969..e3a9adfb055 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   /// The status of the svc loop
   int status () const;
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..6fe6f526325 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
@@ -9,7 +9,7 @@ const char *request_msg = "The Echo_Client_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Client_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -19,13 +19,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -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/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index a62acd3012d..d47ed43f261 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -22,16 +22,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
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..e0fe9d6e6dc 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
@@ -9,7 +9,7 @@ const char *request_msg = "The Echo_Server_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Server_Request_Interceptor reply message";
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -19,13 +19,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -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/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 88c30fa2ce7..60c57d76787 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -23,15 +23,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index c16b0f9373c..a5d7cfe5503 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -21,21 +21,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
index d2ee1a7d7a4..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
@@ -20,7 +20,6 @@
  */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-
 public:
   /// ctor
   Visual_i (CORBA::ORB_ptr orb);
@@ -31,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index ee3dd1054dc..85d6db42080 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -48,7 +48,6 @@ Client_ORBInitializer::post_init (
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
index 93609cf3607..0d450a559b7 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
@@ -27,7 +27,6 @@ class Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 8d7ff33ea6b..7f06dcd7863 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -14,13 +14,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index c9090eae741..c2e3149538d 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -41,9 +41,9 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri);
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index a59e89f3924..8102a86f94b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index 6ca5ef7f4b1..d00d8969405 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -30,14 +30,12 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index a30c6d173d6..cfd431d23c5 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -4,23 +4,23 @@
 #include "ace/Log_Msg.h"
 #include "CrashPoint.h"
 
-Server_Request_Interceptor::Server_Request_Interceptor (void)
+Server_Request_Interceptor::Server_Request_Interceptor ()
   : request_count_ (0)
 {
 }
 
-Server_Request_Interceptor::~Server_Request_Interceptor (void)
+Server_Request_Interceptor::~Server_Request_Interceptor ()
 {
 }
 
 char *
-Server_Request_Interceptor::name (void)
+Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (void)
+Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 5907543ac8b..dfe78ead1d4 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -27,7 +27,7 @@ class Server_Request_Interceptor
 {
 public:
   /// Constructor.
-  Server_Request_Interceptor (void);
+  Server_Request_Interceptor ();
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -39,9 +39,9 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -61,7 +61,7 @@ public:
 
 protected:
   /// Destructor.
-  ~Server_Request_Interceptor (void);
+  ~Server_Request_Interceptor ();
 
 private:
   /// The number of requests intercepted by this interceptor.
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index 74f41eb6ccf..e86eaeb1744 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
 CORBA::Short
-test_i::number (void)
+test_i::number ()
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
index 6f1099729ed..230593e47fb 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
@@ -15,28 +15,25 @@
 class test_i : public virtual POA_RedirectionTest::test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (void);
+  virtual CORBA::Short number ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   /// The number assigned to this object.
   CORBA::Short number_;
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index f2c9fe409a2..340afbd7ba1 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -4,7 +4,7 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORB_Constants.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
index cb446a73d5f..186a826090b 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
@@ -27,7 +27,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
index 6a8d2fbfb2e..a0f82547975 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 #include "test_i.h"
 
-test_i::test_i (void)
+test_i::test_i ()
 {
 }
 
-test_i::~test_i (void)
+test_i::~test_i ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h
index 8ea04fa1591..54f35968e3f 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h
@@ -23,12 +23,11 @@
 class test_i : public virtual POA_TestModule::test
 {
 public:
-
   /// Constructor.
-  test_i (void);
+  test_i ();
 
   /// Destructor.
-  ~test_i (void);
+  ~test_i ();
 
 private:
 };
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index d01f7c76f92..2989b40d3c7 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -13,7 +13,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   // Create and register the test request interceptors.
   PortableInterceptor::ClientRequestInterceptor_ptr ci =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index ca47ad3f403..3102e499835 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -69,7 +69,6 @@ void
 Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Boolean client_side =
     this->client_side_test (ri);
 
@@ -87,7 +86,6 @@ void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Boolean client_side =
     this->client_side_test (ri);
 
@@ -142,7 +140,6 @@ void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Boolean client_side =
     this->client_side_test (ri);
 
@@ -219,7 +216,6 @@ void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::Boolean client_side =
     this->client_side_test (ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index 0a4590bf850..d26df8265d4 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -15,9 +15,8 @@ Request_Interceptor::name ()
 }
 
 void
-Request_Interceptor::destroy (void)
+Request_Interceptor::destroy ()
 {
-
   CORBA::ULong s_count =
     this->starting_interception_point_count_.value ();
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
index 662b8e79d85..18448765d73 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -55,9 +55,9 @@ public:
    */
   //@{
   /// Return the name of this Requestinterceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index 7fd43c132b1..d87b33ee59f 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -13,7 +13,6 @@ void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   // Create and register the test request interceptors.
   PortableInterceptor::ServerRequestInterceptor_ptr si =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index 0caaf005906..848ae9d00a4 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -72,7 +72,6 @@ void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::Boolean server_side =
     this->server_side_test (ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 9f87a70c3f5..35a71eaa5ff 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -46,7 +46,7 @@ test_i::server_test (Test::TestScenario scenario,
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
index 91260b771db..98f877dd83b 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -37,7 +37,7 @@ public:
                             CORBA::ULongSeq_out myseq);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index 1f166b93d43..cc83c5b7e3b 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
@@ -17,7 +17,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index dd22dcc19d3..2d12efbd1f0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-Server_ORBInitializer::Server_ORBInitializer (void)
+Server_ORBInitializer::Server_ORBInitializer ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index 9554057647d..e3d1af0b6df 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -26,7 +26,7 @@ class Server_ORBInitializer :
 {
 public:
   /// Constructor
-  Server_ORBInitializer (void);
+  Server_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 1fe2ff983db..de2fa616bfb 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 void
 run_test (Test_Interceptors::Visual_ptr server)
 {
-
   server->normal (10);
 
   ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n"));
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index b33f1b1692b..5aab1315fc5 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -15,18 +15,18 @@ Echo_Client_Request_Interceptor (const char *id)
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -41,7 +41,6 @@ void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
@@ -67,7 +66,6 @@ Echo_Client_Request_Interceptor::send_request (
 #endif /*if 0*/
 
 
-
   // Populate target member of the ClientRequestInfo.
 
   // Make the context to send the context to the target
@@ -105,7 +103,6 @@ void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
@@ -180,7 +177,6 @@ void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index e7b490fa096..d3fb25ea8be 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -28,10 +28,10 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index d27ae377027..f8f4f5bd5d9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
@@ -32,7 +32,6 @@ void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -137,7 +136,6 @@ void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
 #if 0
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index 2755fd363b3..1659c5f6071 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
 
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 268a43a0843..782c68db4b9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long arg)
 }
 
 void
-Visual_i::nothing (void)
+Visual_i::nothing ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index 3937af13fdd..3f139b0fa66 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -25,13 +25,13 @@ public:
 
   void normal (CORBA::Long arg);
 
-  void nothing (void);
+  void nothing ();
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pseudo-reference (for shutdown).
diff --git a/TAO/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
index e1519d1b7ee..d2d70067138 100644
--- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp
+++ b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
@@ -25,7 +25,6 @@ public:
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
   {
     PortableInterceptor::ORBInitializer_var orb_initializer = new ORB_Initializer ();
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 6dc109b89c1..09d3f4f91ef 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -8,7 +8,6 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   ACE_Argv_Type_Converter ct (argc, argv);
   QApplication app (argc,  ct.get_ASCII_argv ());
   TAO::QtResource_Loader qt_resources (&app);
@@ -49,7 +48,7 @@ Client::Client (CORBA::ORB_ptr orb,
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   delete this->slider_;
   delete this->push_button_;
@@ -131,11 +130,10 @@ Client::create_widgets (/**/)
 
   this->mainwindow_.setLayout(&box_);
 
-
 }
 
 void
-Client::show (void)
+Client::show ()
 {
   this->mainwindow_.show ();
 }
@@ -147,7 +145,7 @@ Client::remote_call (int val)
 }
 
 void
-Client::shutdown_call (void)
+Client::shutdown_call ()
 {
   this->server_->shutdown ();
 }
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index 838779141b0..06237659dc6 100644
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -22,18 +22,17 @@ class Client : public QObject
 {
   Q_OBJECT
 public:
-
   /// ctor
   Client (CORBA::ORB_ptr orb,
           QApplication &app);
 
   ///Dtor..
-  ~Client (void);
+  ~Client ();
 
   /// Adds the callbacks to the GUI underneath.....
-  void create_widgets (void);
+  void create_widgets ();
 
-  void show (void);
+  void show ();
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
 
@@ -44,10 +43,9 @@ public:
  public slots:
    /// Two slot handlers for the two widgets that we have
    void remote_call (int val);
-   void shutdown_call (void);
+   void shutdown_call ();
 
 private:
-
   /// A push button
   QPushButton *push_button_;
 
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/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index c0074bd073f..f321fe0e5fa 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -7,7 +7,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 }
 
 void
-LCD_Display_imp::shutdown (void)
+LCD_Display_imp::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "The ORB has been shutdown, Close the windows to exit\n"));
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 055d2438111..562ba8595c5 100644
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -33,7 +33,7 @@ public:
 
   // ctor
 
-  void shutdown (void);
+  void shutdown ();
 
   void send_val (CORBA::Long val);
 
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
index 97f659ec0cb..9580e893db9 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -19,7 +19,7 @@
 const size_t max_block_length = 256;
 
 static TAO_Queued_Message *
-create_new_message (void)
+create_new_message ()
 {
   // First create a message block
   size_t block_size =
@@ -83,7 +83,6 @@ static void del_message (TAO_Queued_Message *&head,
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
-
   // Initialize a random seed to get better coverage.
   // @@ The random seed and default values should be configurable
   // using command line options.
diff --git a/TAO/tests/README b/TAO/tests/README
index fa3e9e74cc9..d97edb21e0e 100644
--- a/TAO/tests/README
+++ b/TAO/tests/README
@@ -1,5 +1,3 @@
-
-
 This directory contains a number of tests to validate that TAO is
 functioning correctly.  The individual directories contain READMEs on
 how to run the following tests:
@@ -35,7 +33,7 @@ how to run the following tests:
 
         . Bidirectional
 
-          This is a test that exercises the birectional GIOP connection
+          This is a test that exercises the bidirectional GIOP connection
           implementation in TAO.
 
         . Bidirectional_NestedUpcall
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.irix b/TAO/tests/RTCORBA/Banded_Connections/bands.irix
deleted file mode 100644
index fe403f56fda..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/bands.irix
+++ /dev/null
@@ -1 +0,0 @@
-19 23 24 28 29 33
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.tru64 b/TAO/tests/RTCORBA/Banded_Connections/bands.tru64
deleted file mode 100644
index fe403f56fda..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/bands.tru64
+++ /dev/null
@@ -1 +0,0 @@
-19 23 24 28 29 33
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 6942d174cd2..c821f25d5a0 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -94,14 +94,12 @@ invocation_exception_test (Test_ptr obj,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -112,7 +110,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index e598f8a12f7..b7e699a64f4 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -53,18 +53,10 @@ if ($^O eq "MSWin32") {
     $server_args =
         "-b bands.nt";
 }
-elsif ($^O eq "dec_osf") {
-    $server_args =
-        "-b bands.tru64";
-}
 elsif ($^O eq "hpux") {
     $server_args =
         "-b bands.hpux";
 }
-elsif ($^O eq "irix") {
-    $server_args =
-        "-b bands.irix";
-}
 else {
     $server_args =
         "-b bands.unix";
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index 9681db29429..681bbad7e11 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -15,7 +15,7 @@ public:
                     CORBA::Short priority);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -104,7 +104,7 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
index 9e925634654..8b3e04d3774 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
@@ -17,7 +17,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
index 671d565d4b8..5c3004eea7f 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
@@ -38,11 +38,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -55,9 +54,8 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
-
   int result = 0;
   try
     {
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
index 3e5e24aa0d4..b714dfa3e49 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
@@ -9,18 +9,18 @@ Client_Request_Interceptor (const char *id)
 {
 }
 
-Client_Request_Interceptor::~Client_Request_Interceptor (void)
+Client_Request_Interceptor::~Client_Request_Interceptor ()
 {
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -42,7 +42,6 @@ void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   try
     {
       // Try to get the RTCorbaPriority context.  If its not there,
@@ -71,7 +70,6 @@ void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
index 34cebae1f23..ddede0c5438 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
@@ -29,10 +29,10 @@ public:
   virtual ~Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
index 5429782ab61..ad4588a3b80 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
@@ -100,14 +100,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -118,7 +116,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
@@ -213,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/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
index 7e0342f40b4..f7cea023958 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
@@ -72,14 +72,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -90,7 +88,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
index e981333a51e..3d347af46b3 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
@@ -150,14 +150,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -168,7 +166,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
index 4f22163fed7..59002204b8a 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
@@ -50,13 +50,13 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h
index 3dafef71563..49d55231c1b 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h
@@ -23,10 +23,10 @@ public:
                       CORBA::Long_out thread_count);
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index 9e925634654..8b3e04d3774 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -3,7 +3,7 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-Client_ORBInitializer::Client_ORBInitializer (void)
+Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
 
@@ -17,7 +17,6 @@ void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
 {
-
   CORBA::String_var orb_id =
     info->orb_id ();
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index e8e845f1793..a9108fadae8 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -26,7 +26,7 @@ class Client_ORBInitializer :
 {
 public:
   /// Constructor
-  Client_ORBInitializer (void);
+  Client_ORBInitializer ();
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index f6c5804dff7..b91f6002b60 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -38,14 +38,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -56,7 +54,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index 3e5e24aa0d4..b714dfa3e49 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -9,18 +9,18 @@ Client_Request_Interceptor (const char *id)
 {
 }
 
-Client_Request_Interceptor::~Client_Request_Interceptor (void)
+Client_Request_Interceptor::~Client_Request_Interceptor ()
 {
 }
 
 char *
-Client_Request_Interceptor::name (void)
+Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Client_Request_Interceptor::destroy (void)
+Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -42,7 +42,6 @@ void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   try
     {
       // Try to get the RTCorbaPriority context.  If its not there,
@@ -71,7 +70,6 @@ void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index 34cebae1f23..ddede0c5438 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -29,10 +29,10 @@ public:
   virtual ~Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index bbb4f8a5a7d..d257aa53b1b 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -19,7 +19,7 @@ public:
   void test_method (CORBA::Short priority);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -63,7 +63,7 @@ Test_i::test_method (CORBA::Short priority)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -102,14 +102,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -120,7 +118,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
@@ -213,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_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 3e12434cb55..a880f583214 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -14,10 +14,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -31,14 +31,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method ( /**/)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test method invoked on the sever\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Shutting down\n"));
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index e164eda6df7..98494b81b1d 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -31,29 +31,29 @@ public:
           PortableServer::POA_ptr poa,
           Tests &tests);
 
-  void start (void);
+  void start ();
 
-  void method (void);
+  void method ();
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
-  int client_propagated (void);
+  int client_propagated ();
 
   void client_propagated (int);
 
-  int server_declared (void);
+  int server_declared ();
 
   void server_declared (int);
 
-  RTCORBA::Priority server_priority (void);
+  RTCORBA::Priority server_priority ();
 
   void server_priority (RTCORBA::Priority);
 
-  int in_lane (void);
+  int in_lane ();
 
   void in_lane (int);
 
-  int serviced_by_rt_tp (void);
+  int serviced_by_rt_tp ();
 
   void serviced_by_rt_tp (int);
 
@@ -66,12 +66,11 @@ public:
 
   void invocation_lane (CORBA::ULong lane);
 
-  RTCORBA::Priority invocation_priority (void);
+  RTCORBA::Priority invocation_priority ();
 
   void invocation_priority (RTCORBA::Priority);
 
 private:
-
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
   Tests &tests_;
@@ -109,7 +108,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 int
-test_i::client_propagated (void)
+test_i::client_propagated ()
 {
   return this->client_propagated_;
 }
@@ -121,7 +120,7 @@ test_i::client_propagated (int client_propagated)
 }
 
 int
-test_i::server_declared (void)
+test_i::server_declared ()
 {
   return this->server_declared_;
 }
@@ -133,7 +132,7 @@ test_i::server_declared (int server_declared)
 }
 
 RTCORBA::Priority
-test_i::server_priority (void)
+test_i::server_priority ()
 {
   return this->server_priority_;
 }
@@ -145,7 +144,7 @@ test_i::server_priority (RTCORBA::Priority server_priority)
 }
 
 int
-test_i::in_lane (void)
+test_i::in_lane ()
 {
   return this->in_lane_;
 }
@@ -157,7 +156,7 @@ test_i::in_lane (int in_lane)
 }
 
 int
-test_i::serviced_by_rt_tp (void)
+test_i::serviced_by_rt_tp ()
 {
   return this->serviced_by_rt_tp_;
 }
@@ -189,7 +188,7 @@ test_i::invocation_lane (CORBA::ULong lane)
 }
 
 RTCORBA::Priority
-test_i::invocation_priority (void)
+test_i::invocation_priority ()
 {
   return this->invocation_priority_;
 }
@@ -201,7 +200,7 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority)
 }
 
 void
-test_i::start (void)
+test_i::start ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n"));
@@ -280,13 +279,13 @@ test_i::thread_info (const char *method_name)
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   this->thread_info ("test_i::method");
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -373,17 +372,17 @@ class Server
 public:
   Server (CORBA::ORB_ptr orb);
 
-  void create_servant_in_root_poa (void);
+  void create_servant_in_root_poa ();
   void create_poa_and_servant_with_tp_policy (const char *poa_name,
                                               int set_priority_model,
                                               RTCORBA::PriorityModel priority_model);
   void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                          RTCORBA::PriorityModel priority_model);
-  void test (void);
-  void start_testing (void);
+  void test ();
+  void start_testing ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
   CORBA::ORB_var orb_;
@@ -441,7 +440,7 @@ Server::Server (CORBA::ORB_ptr orb)
 }
 
 void
-Server::create_servant_in_root_poa (void)
+Server::create_servant_in_root_poa ()
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -708,7 +707,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
 }
 
 void
-Server::start_testing (void)
+Server::start_testing ()
 {
   Tests::ITERATOR iterator (this->tests_);
   while (!iterator.done ())
@@ -727,7 +726,7 @@ Server::start_testing (void)
 }
 
 void
-Server::test (void)
+Server::test ()
 {
   this->start_testing ();
 
@@ -740,7 +739,7 @@ Server::test (void)
 }
 
 void
-Server::shutdown (void)
+Server::shutdown ()
 {
   this->orb_->shutdown (true);
 
@@ -750,14 +749,12 @@ Server::shutdown (void)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -768,7 +765,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
index ff80804b53d..356061f3cba 100644
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
@@ -78,7 +78,7 @@ static const char *dscp_char[]=
 };
 */
 
-Custom_Network_Priority_Mapping::Custom_Network_Priority_Mapping (void)
+Custom_Network_Priority_Mapping::Custom_Network_Priority_Mapping ()
   : corba_priority_ (RTCORBA::minPriority)
 {
 }
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
index 93d67b423c1..2bb2e9071f6 100644
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
+++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
@@ -33,7 +33,7 @@
 class Custom_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
 public:
-  Custom_Network_Priority_Mapping (void);
+  Custom_Network_Priority_Mapping ();
 
   CORBA::Boolean to_network (RTCORBA::Priority corba_priority,
                              RTCORBA::NetworkPriority &network_priority);
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 1658d903351..3e7aaf5ec1d 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -13,10 +13,10 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -29,14 +29,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (void)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Test_i::test_method\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index c18442452a1..f57bdda98c6 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -51,14 +51,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -69,7 +67,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
@@ -175,7 +173,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       else
       {
-
         // Thread Manager for managing task.
         ACE_Thread_Manager thread_manager;
 
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 3de5fa0d2bb..eec7da5d71f 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -153,10 +153,9 @@ public:
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -167,7 +166,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 4f22163fed7..59002204b8a 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -50,13 +50,13 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
index 17dc7cbdea7..ab2fa2e9de7 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
@@ -22,10 +22,10 @@ public:
                       CORBA::Long_out thread_count);
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index 9dfa5127741..86ba3654e6e 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -15,10 +15,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -39,7 +39,7 @@ Test_i::test_method (/* */)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 8267d9a2e70..9d82bd361fc 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -75,9 +75,9 @@ public:
                  RTCORBA::Current_ptr current,
                  CORBA::Short priority);
 
-  int svc (void);
+  int svc ();
 
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   test_var test_;
@@ -97,7 +97,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Worker_Thread::validate_connection (void)
+Worker_Thread::validate_connection ()
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
@@ -131,7 +131,7 @@ Worker_Thread::validate_connection (void)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
@@ -154,14 +154,12 @@ Worker_Thread::svc (void)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -172,7 +170,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 5a6a921115a..65afe698d1f 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -13,16 +13,15 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
-
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
 };
@@ -35,14 +34,14 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -51,7 +50,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -138,14 +137,12 @@ write_iors_to_file (CORBA::Object_ptr object,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -156,7 +153,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index bdb4d340acc..f152599b8ad 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -143,14 +143,12 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -161,7 +159,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
@@ -356,7 +354,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb,
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index ae53602db94..aafa46c19bf 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -37,18 +37,10 @@ if ($^O eq "MSWin32") {
     $priority1 = 2;
     $priority2 = 1;
 }
-elsif ($^O eq "dec_osf") {
-    $priority1 = 20;
-    $priority2 = 25;
-}
 elsif ($^O eq "hpux") {
     $priority1 = 17;
     $priority2 = 22;
 }
-elsif ($^O eq "irix") {
-    $priority1 = 27;
-    $priority2 = 33;
-}
 else {
     $priority1 = 45;
     $priority2 = 50;
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 9eb297af4a4..f46cebfc87c 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -33,13 +33,13 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method ( /* */)
+Test_i::test_method ()
 {
   ACE_DEBUG ((LM_DEBUG, "test_method invoked\n"));
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -90,14 +90,12 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -108,7 +106,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index e3e9ce72fac..96e72cfbca7 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -13,16 +13,15 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
-
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
 };
@@ -35,14 +34,14 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -51,7 +50,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index e044720eec1..b7c6e4b06e1 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -21,7 +21,6 @@
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB first.
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index a078e62bc71..5819b2d4553 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -54,14 +54,12 @@ parse_args (int argc, ACE_TCHAR **argv)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -72,7 +70,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 58ba9bb2226..a4c66f8dcd4 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -14,18 +14,17 @@ public:
           CORBA::Short server_priority,
           CORBA::Short client_priority);
 
-  CORBA::Short method (void);
+  CORBA::Short method ();
 
-  void prioritized_method (void);
+  void prioritized_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
-
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
   CORBA::Short server_priority_;
@@ -44,7 +43,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Short
-test_i::method (void)
+test_i::method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::method\n"));
@@ -53,7 +52,7 @@ test_i::method (void)
 }
 
 void
-test_i::prioritized_method (void)
+test_i::prioritized_method ()
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTCurrent");
@@ -74,7 +73,7 @@ test_i::prioritized_method (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
@@ -83,7 +82,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -162,8 +161,8 @@ public:
           PortableServer::POA_ptr root_poa,
           PortableServer::POAManager_ptr poa_manager);
 
-  void test_root_poa (void);
-  void test_child_poa (void);
+  void test_root_poa ();
+  void test_child_poa ();
 
   typedef void (server::*test_function) (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
@@ -211,32 +210,31 @@ public:
                                        CORBA::Short client_priority,
                                        const char *test_name);
 
-  void test_default_pool_no_bands_client_propagated_poa (void);
+  void test_default_pool_no_bands_client_propagated_poa ();
 
-  void test_no_lanes_no_bands_client_propagated_poa (void);
+  void test_no_lanes_no_bands_client_propagated_poa ();
 
-  void test_lanes_no_bands_client_propagated_poa (void);
+  void test_lanes_no_bands_client_propagated_poa ();
 
-  void test_default_pool_bands_client_propagated_poa (void);
+  void test_default_pool_bands_client_propagated_poa ();
 
-  void test_no_lanes_bands_client_propagated_poa (void);
+  void test_no_lanes_bands_client_propagated_poa ();
 
-  void test_lanes_bands_client_propagated_poa (void);
+  void test_lanes_bands_client_propagated_poa ();
 
-  void test_default_pool_no_bands_server_declared_poa (void);
+  void test_default_pool_no_bands_server_declared_poa ();
 
-  void test_no_lanes_no_bands_server_declared_poa (void);
+  void test_no_lanes_no_bands_server_declared_poa ();
 
-  void test_lanes_no_bands_server_declared_poa (void);
+  void test_lanes_no_bands_server_declared_poa ();
 
-  void test_default_pool_bands_server_declared_poa (void);
+  void test_default_pool_bands_server_declared_poa ();
 
-  void test_no_lanes_bands_server_declared_poa (void);
+  void test_no_lanes_bands_server_declared_poa ();
 
-  void test_lanes_bands_server_declared_poa (void);
+  void test_lanes_bands_server_declared_poa ();
 
 private:
-
   CORBA::ORB_var orb_;
   RTCORBA::RTORB_var rt_orb_;
   PortableServer::POA_var root_poa_;
@@ -255,7 +253,7 @@ server::server (CORBA::ORB_ptr orb,
 }
 
 void
-server::test_root_poa (void)
+server::test_root_poa ()
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -281,7 +279,7 @@ server::test_root_poa (void)
 }
 
 void
-server::test_child_poa (void)
+server::test_child_poa ()
 {
   CORBA::PolicyList policies;
   policies.length (1);
@@ -482,7 +480,7 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
 }
 
 void
-server::test_default_pool_no_bands_client_propagated_poa (void)
+server::test_default_pool_no_bands_client_propagated_poa ()
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
@@ -491,7 +489,7 @@ server::test_default_pool_no_bands_client_propagated_poa (void)
 }
 
 void
-server::test_no_lanes_no_bands_client_propagated_poa (void)
+server::test_no_lanes_no_bands_client_propagated_poa ()
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
@@ -500,7 +498,7 @@ server::test_no_lanes_no_bands_client_propagated_poa (void)
 }
 
 void
-server::test_lanes_no_bands_client_propagated_poa (void)
+server::test_lanes_no_bands_client_propagated_poa ()
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority,
@@ -509,7 +507,7 @@ server::test_lanes_no_bands_client_propagated_poa (void)
 }
 
 void
-server::test_default_pool_bands_client_propagated_poa (void)
+server::test_default_pool_bands_client_propagated_poa ()
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
@@ -518,7 +516,7 @@ server::test_default_pool_bands_client_propagated_poa (void)
 }
 
 void
-server::test_no_lanes_bands_client_propagated_poa (void)
+server::test_no_lanes_bands_client_propagated_poa ()
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
@@ -527,13 +525,12 @@ server::test_no_lanes_bands_client_propagated_poa (void)
 }
 
 void
-server::test_lanes_bands_client_propagated_poa (void)
+server::test_lanes_bands_client_propagated_poa ()
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority + 1,
                         &server::test_bands_client_propagated_poa,
                         "lanes_bands_client_propagated");
-
 }
 
 void
@@ -591,7 +588,7 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
 }
 
 void
-server::test_default_pool_no_bands_server_declared_poa (void)
+server::test_default_pool_no_bands_server_declared_poa ()
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority + 1,
@@ -600,7 +597,7 @@ server::test_default_pool_no_bands_server_declared_poa (void)
 }
 
 void
-server::test_no_lanes_no_bands_server_declared_poa (void)
+server::test_no_lanes_no_bands_server_declared_poa ()
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority - 1,
@@ -609,7 +606,7 @@ server::test_no_lanes_no_bands_server_declared_poa (void)
 }
 
 void
-server::test_lanes_no_bands_server_declared_poa (void)
+server::test_lanes_no_bands_server_declared_poa ()
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority + 1,
@@ -618,7 +615,7 @@ server::test_lanes_no_bands_server_declared_poa (void)
 }
 
 void
-server::test_default_pool_bands_server_declared_poa (void)
+server::test_default_pool_bands_server_declared_poa ()
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority - 1,
@@ -627,7 +624,7 @@ server::test_default_pool_bands_server_declared_poa (void)
 }
 
 void
-server::test_no_lanes_bands_server_declared_poa (void)
+server::test_no_lanes_bands_server_declared_poa ()
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority + 1,
@@ -636,7 +633,7 @@ server::test_no_lanes_bands_server_declared_poa (void)
 }
 
 void
-server::test_lanes_bands_server_declared_poa (void)
+server::test_lanes_bands_server_declared_poa ()
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority - 1,
@@ -647,14 +644,12 @@ server::test_lanes_bands_server_declared_poa (void)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -665,7 +660,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index bb1ff6f6332..621a8106df6 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -59,11 +59,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
 };
@@ -76,7 +75,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index 75130ee1850..437bc8c8094 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -151,14 +151,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -169,7 +167,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index 8b0cf47ea8b..5635e9d438d 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -17,10 +17,8 @@ test_i::test_i (CORBA::ORB_ptr orb,
     current_iteration_ (0),
     total_iterations_ (0)
 {
-
   try
     {
-
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTCurrent");
 
@@ -90,7 +88,7 @@ test_i::method (CORBA::ULong work,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -102,7 +100,7 @@ test_i::initialize (CORBA::ULong total_iterations)
 }
 
 int
-test_i::estimate_iterations (void)
+test_i::estimate_iterations ()
 {
   // Estimate for 2 seconds.
   ACE_Time_Value work_time (2);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
index 5c8ad620c53..3ab143950c2 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
@@ -27,13 +27,13 @@ public:
                const char *iteration);
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
   /// Work (burn CPU).
   void work (CORBA::ULong work);
 
   /// Estimates work iterations performed per second.
-  int estimate_iterations (void);
+  int estimate_iterations ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 7d33d8e2a48..63d5ec79ab1 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -14,10 +14,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (void);
+  void test_method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -38,7 +38,7 @@ Test_i::test_method (/* */)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index 3477cd371a2..00f1bab03a1 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -91,16 +91,14 @@ parse_args (int argc, ACE_TCHAR **argv)
 
 class Client
 {
-
 public:
-
   Client (test_ptr test,
           CORBA::ORB_ptr orb,
           RTCORBA::Current_ptr current,
           RTCORBA::RTORB_ptr rt_orb,
           CORBA::PolicyManager_ptr policy_manager);
 
-  void vanilla_invocations (void);
+  void vanilla_invocations ();
 
   void priority_invocations (int debug);
 
@@ -108,19 +106,17 @@ public:
 
   void set_priority_bands (int debug);
 
-  void set_private_connection_policies (void);
+  void set_private_connection_policies ();
 
-  void reset_policies (void);
+  void reset_policies ();
 
 
 private:
-
   test_var test_;
   CORBA::ORB_var orb_;
   RTCORBA::Current_var current_;
   RTCORBA::RTORB_var rt_orb_;
   CORBA::PolicyManager_var policy_manager_;
-
 };
 
 class Worker_Thread : public ACE_Task_Base
@@ -132,9 +128,9 @@ public:
                  RTCORBA::Current_ptr current,
                  CORBA::Short priority);
 
-  int svc (void);
+  int svc ();
 
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   Client client_;
@@ -157,7 +153,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Worker_Thread::validate_connection (void)
+Worker_Thread::validate_connection ()
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
@@ -191,7 +187,7 @@ Worker_Thread::validate_connection (void)
 }
 
 int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
 {
   try
     {
@@ -222,7 +218,7 @@ Client::Client (test_ptr test,
 }
 
 void
-Client::vanilla_invocations (void)
+Client::vanilla_invocations ()
 {
   for (int i = 0; i < iterations; i++)
     {
@@ -343,7 +339,7 @@ Client::set_priority_bands (int debug)
 }
 
 void
-Client::set_private_connection_policies (void)
+Client::set_private_connection_policies ()
 {
   CORBA::PolicyList policies;
   policies.length (1);
@@ -356,7 +352,7 @@ Client::set_private_connection_policies (void)
 }
 
 void
-Client::reset_policies (void)
+Client::reset_policies ()
 {
   CORBA::PolicyList empty_policies;
 
@@ -367,14 +363,12 @@ Client::reset_policies (void)
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -385,7 +379,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
@@ -478,7 +472,6 @@ Task::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 644a7c9ea5b..a54df58297e 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -28,16 +28,15 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (void);
+  void method ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
-
   CORBA::ORB_var orb_;
   PortableServer::POA_var poa_;
 };
@@ -50,7 +49,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (void)
+test_i::method ()
 {
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -74,7 +73,7 @@ test_i::method (void)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -84,7 +83,7 @@ test_i::shutdown (void)
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -288,14 +287,12 @@ rt_poa (CORBA::ORB_ptr orb,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -306,7 +303,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
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/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index 3e29c9671ff..494b89cbd07 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -55,10 +55,6 @@ if ($^O eq "MSWin32") {
     $server_args =
         "-a 1 -b 2";
 }
-elsif ($^O eq "dec_osf") {
-    $server_args =
-        "-a 20 -b 30";
-}
 elsif ($^O eq "hpux") {
     $continuous = 1;
     $server_args =
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index 78bade30931..e84e8a3b901 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -18,7 +18,7 @@ public:
   void test_method (CORBA::Short priority);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -62,7 +62,7 @@ Test_i::test_method (CORBA::Short priority)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -192,14 +192,12 @@ create_object (RTPortableServer::POA_ptr poa,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -210,7 +208,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index dbfe11fae93..d3be7dda05a 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -17,7 +17,7 @@ public:
   // ctor
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown (void);
+  void shutdown ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -31,7 +31,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received request to shut down the ORB\n"));
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 6b3ab9377b1..26ebd2508b1 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -50,14 +50,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -68,7 +66,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 93f3a714a7a..702ea91a7f7 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -147,14 +147,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
 class Task : public ACE_Task_Base
 {
 public:
-
   Task (ACE_Thread_Manager &thread_manager,
         CORBA::ORB_ptr orb);
 
-  int svc (void);
+  int svc ();
 
   CORBA::ORB_var orb_;
-
 };
 
 Task::Task (ACE_Thread_Manager &thread_manager,
@@ -165,7 +163,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Task::svc (void)
+Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index f05b9b314f5..d448c539159 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -44,13 +44,13 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index fa025e013dc..e57f4a6cfb9 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -22,10 +22,10 @@ public:
                       CORBA::Long iteration);
 
   /// Shutdown the server.
-  void shutdown (void);
+  void shutdown ();
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (void);
+  PortableServer::POA_ptr _default_POA ();
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index 5184795bebd..979c3376d25 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -10,7 +10,6 @@ Thread_Task::Thread_Task (CORBA::ORB_ptr orb)
 int
 Thread_Task::activate_task (int thr_count)
 {
-
   try
     {
       ACE_NEW_RETURN (shutdown_lock_,
@@ -85,7 +84,7 @@ Thread_Task::activate_task (int thr_count)
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   try
     {
@@ -169,7 +168,7 @@ Thread_Task::svc (void)
   return 0;
 }
 
-Thread_Task::~Thread_Task (void)
+Thread_Task::~Thread_Task ()
 {
   delete shutdown_lock_;
   delete lock_;
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h
index eca0f6da253..2051a7bafdf 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.h
@@ -13,7 +13,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH>
 
   int activate_task (int thr_count);
 
-  ~Thread_Task (void);
+  ~Thread_Task ();
 
  protected:
   /// task svc
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index cffcf82dbaf..97ef880d374 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -17,7 +17,7 @@ class Test_Thread_Action:
 public RTScheduling::ThreadAction
 {
  public:
-  Test_Thread_Action (void);
+  Test_Thread_Action ();
 
   virtual void _cxx_do (CORBA::VoidData data);
 };
@@ -25,14 +25,13 @@ public RTScheduling::ThreadAction
 #endif /*Thread_Action_H*/
 
 
-Test_Thread_Action::Test_Thread_Action (void)
+Test_Thread_Action::Test_Thread_Action ()
 {
 }
 
 void
 Test_Thread_Action::_cxx_do (CORBA::VoidData data)
 {
-
   Data* tmp = (Data*) data;
   ACE_DEBUG ((LM_DEBUG,
               "Test_Thread_Action::do %C\n",
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index fe6cfa85767..c25fcaec69d 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -11,12 +11,12 @@ TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb)
   current_ = RTScheduling::Current::_narrow (current_obj.in ());
 }
 
-TAO_Scheduler::~TAO_Scheduler (void)
+TAO_Scheduler::~TAO_Scheduler ()
 {
 }
 
 CORBA::PolicyList*
-TAO_Scheduler::scheduling_policies (void)
+TAO_Scheduler::scheduling_policies ()
 {
   return 0;
 }
@@ -27,13 +27,13 @@ TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &)
 }
 
 CORBA::PolicyList*
-TAO_Scheduler::poa_policies (void)
+TAO_Scheduler::poa_policies ()
 {
   return 0;
 }
 
 char *
-TAO_Scheduler::scheduling_discipline_name (void)
+TAO_Scheduler::scheduling_discipline_name ()
 {
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h
index 20bab1d2c17..ab11173f9a0 100644
--- a/TAO/tests/RTScheduling/Scheduler.h
+++ b/TAO/tests/RTScheduling/Scheduler.h
@@ -9,18 +9,17 @@ public RTScheduling::Scheduler,
   public ::CORBA::LocalObject
 {
  public:
-
   TAO_Scheduler (CORBA::ORB_ptr orb);
 
-  ~TAO_Scheduler (void);
+  ~TAO_Scheduler ();
 
-  virtual CORBA::PolicyList * scheduling_policies (void);
+  virtual CORBA::PolicyList * scheduling_policies ();
 
   virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies);
 
-  virtual CORBA::PolicyList * poa_policies (void);
+  virtual CORBA::PolicyList * poa_policies ();
 
-  virtual char * scheduling_discipline_name (void);
+  virtual char * scheduling_discipline_name ();
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
                                                                      CORBA::Policy_ptr scheduling_parameter);
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 292b1e7ba73..346fb25315e 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -45,7 +45,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       try
         {
-
           orb = CORBA::ORB_init (argc, argv);
 
           if (parse_args (argc, argv) == -1)
@@ -98,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/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 689176c7dc2..0f42bfcc6f7 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -9,7 +9,6 @@ const ACE_TCHAR* filename = ACE_TEXT("test.ior");
 class test_impl : public POA_test
 {
 public:
-
   test_impl (CORBA::ORB_ptr orb,
              RTScheduling::Current_ptr current)
     : orb_ (orb),
@@ -40,7 +39,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual void shutdown (void)
+  virtual void shutdown ()
   {
     orb_->shutdown ();
   }
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index 8791b9e4fad..66cdc33242b 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -6,7 +6,7 @@
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_index;
 
 RTScheduling::Current::IdType*
-Thread_Task::guids (void)
+Thread_Task::guids ()
 {
   return this->guid_;
 }
@@ -46,7 +46,7 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
 #endif /* THREAD_CANCELLED */
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   try
     {
@@ -100,13 +100,10 @@ Thread_Task::svc (void)
       //  End - Nested Scheduling Segment
 
 
-
       this->current_->end_scheduling_segment (name);
       //  End - Nested Scheduling Segment
 
       this->current_->end_scheduling_segment (name);
-
-
     }
   catch (const CORBA::THREAD_CANCELLED& )
     {
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
index 55c479befcb..642c23d55eb 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
@@ -11,7 +11,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH>
  public:
   int activate_task (CORBA::ORB_ptr orb);
 
-  RTScheduling::Current::IdType* guids (void);
+  RTScheduling::Current::IdType* guids ();
 
  protected:
   /// task svc
diff --git a/TAO/tests/RTScheduling/VoidData/test.idl b/TAO/tests/RTScheduling/VoidData/test.idl
index 72f3daefdf3..498fc227d99 100644
--- a/TAO/tests/RTScheduling/VoidData/test.idl
+++ b/TAO/tests/RTScheduling/VoidData/test.idl
@@ -1,5 +1,5 @@
 #include "tao/RTScheduling/RTScheduler_include.pidl"
 local interface test
 {
-   void bar (in CORBA::VoidData data );
+   void bar (in CORBA::VoidData data);
 };
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index 22e9d2969df..0427cbd91c5 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -7,13 +7,13 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Oneway_Receiver::raise_no_permission (void)
+Oneway_Receiver::raise_no_permission ()
 {
   throw CORBA::NO_PERMISSION ();
 }
 
 void
-Oneway_Receiver::destroy (void)
+Oneway_Receiver::destroy ()
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -24,7 +24,7 @@ Oneway_Receiver::destroy (void)
 }
 
 Test::Shutdown_Helper_ptr
-Oneway_Receiver::get_shutdown_helper (void)
+Oneway_Receiver::get_shutdown_helper ()
 {
   Shutdown_Helper *shutdown_helper;
   ACE_NEW_THROW_EX (shutdown_helper,
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index f7653e237c2..84671b4eea9 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -14,11 +14,11 @@ public:
   Oneway_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void raise_no_permission (void);
+  virtual void raise_no_permission ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void);
+  virtual Test::Shutdown_Helper_ptr get_shutdown_helper ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index ca529160340..ae0b79e779b 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -6,7 +6,7 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
 }
 
 void
-Shutdown_Helper::shutdown (void)
+Shutdown_Helper::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 994bf94396b..607cf8b0e24 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -14,7 +14,7 @@ public:
   Shutdown_Helper (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
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/Sequence_Unit_Tests/fwd_mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
index 70ac48de6eb..4d4c3276cdb 100644
--- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
@@ -23,7 +23,7 @@ TAO::Objref_Traits<fwd_mock_reference>::release (
 }
 
 fwd_mock_reference_ptr
-TAO::Objref_Traits<fwd_mock_reference>::nil (void)
+TAO::Objref_Traits<fwd_mock_reference>::nil ()
 {
   return 0;
 }
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
index 008f15cda78..95e4c273736 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
@@ -70,7 +70,7 @@ TAO::Objref_Traits<mock_reference>::release (
 }
 
 mock_reference_ptr
-TAO::Objref_Traits<mock_reference>::nil (void)
+TAO::Objref_Traits<mock_reference>::nil ()
 {
   return mock_reference::_nil ();
 }
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
index e5467e6a70f..8f7cefb47d2 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
@@ -49,8 +49,8 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
       FAIL_RETURN_IF_NOT(mr.expect(1), mr);
     }
 
-    FAIL_RETURN_IF_NOT(d.expect(0),d );
-    FAIL_RETURN_IF_NOT(r.expect(0),r );
+    FAIL_RETURN_IF_NOT(d.expect(0),d);
+    FAIL_RETURN_IF_NOT(r.expect(0),r);
     FAIL_RETURN_IF_NOT(md.expect(0), md);
     FAIL_RETURN_IF_NOT(mr.expect(1), mr);
 
@@ -74,7 +74,7 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
       x = y;
 
-      FAIL_RETURN_IF_NOT(d.expect(0), d );
+      FAIL_RETURN_IF_NOT(d.expect(0), d);
       FAIL_RETURN_IF_NOT(r.expect(0), r);
       FAIL_RETURN_IF_NOT(md.expect(1), md);
       FAIL_RETURN_IF_NOT(mr.expect(1), mr);
@@ -87,7 +87,7 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
       FAIL_RETURN_IF_NOT(mr.expect(2), mr);
     }
 
-    FAIL_RETURN_IF_NOT(d.expect(0),d );
+    FAIL_RETURN_IF_NOT(d.expect(0),d);
     FAIL_RETURN_IF_NOT(r.expect(0), r);
     FAIL_RETURN_IF_NOT(md.expect(0), md);
     FAIL_RETURN_IF_NOT(mr.expect(1), mr);
@@ -159,7 +159,7 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
       tested_element_traits::release(xe);
       tested_element_traits::release(ye);
-      FAIL_RETURN_IF_NOT(r.expect(2),r );
+      FAIL_RETURN_IF_NOT(r.expect(2),r);
       FAIL_RETURN_IF_NOT(mr.expect(2), mr);
     }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/run_test.pl b/TAO/tests/Sequence_Unit_Tests/run_test.pl
index bfe170454bc..264c52b73cc 100755
--- a/TAO/tests/Sequence_Unit_Tests/run_test.pl
+++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl
@@ -27,8 +27,7 @@ my @testsToRun = qw(unbounded_value_sequence_ut
                Unbounded_Simple_Types
                Bounded_Simple_Types
                Unbounded_String
-               Bounded_String
-              );
+               Bounded_String);
 
 if ($^O ne "MSWin32") {
     push @testsToRun, qw(unbounded_octet_sequence_nocopy_ut);
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
index 56985021e43..4ae6b243b72 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
@@ -19,7 +19,6 @@
 using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 
-
 template<typename charT>
 struct helper
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
index 51fe07bb213..00be9a2f8e1 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
@@ -17,7 +17,6 @@ try { statement; } catch(...) { \
 using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 
-
 CORBA::ULong const MAXIMUM = 32;
 
 template<class value_type>
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
index 6f98d20f46f..b04e16125cf 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
@@ -6,7 +6,7 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-One_Impl::get_string (void)
+One_Impl::get_string ()
 {
   return CORBA::string_dup ("One_Impl there!");
 }
@@ -17,7 +17,7 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-Two_Impl::get_string (void)
+Two_Impl::get_string ()
 {
   return CORBA::string_dup ("One_Impl there!");
 }
@@ -29,7 +29,7 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-Three_Impl::get_string (void)
+Three_Impl::get_string ()
 {
   return CORBA::string_dup ("Three_Impl there!");
 }
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index a33ac60baf4..11e14547108 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -13,7 +13,7 @@ public:
   One_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
@@ -29,7 +29,7 @@ public:
   Two_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
@@ -45,7 +45,7 @@ public:
   Three_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 4f820fd6b1f..2fcf8fd65e5 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -19,7 +19,7 @@ public:
   {
   }
 
-  int svc (void);
+  int svc ();
 
 private:
   PortableServer::POA_var p_;
@@ -29,9 +29,8 @@ private:
 };
 
 int
-MT_Task::svc (void)
+MT_Task::svc ()
 {
-
   try
     {
       for (CORBA::Long i = 0;
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp
index 32bcd87338f..6343eee9ac3 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.cpp
+++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp
@@ -12,7 +12,7 @@ test_i::send_stuff (const char* string)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown...\n"));
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h
index ab8730f8b3f..0d88882e59e 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.h
+++ b/TAO/tests/Server_Connection_Purging/Test_i.h
@@ -14,7 +14,7 @@ public:
   // = The skeleton methods
   virtual void send_stuff (const char* string);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
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/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp
index 0ff2c2fd269..a6a6eec142f 100644
--- a/TAO/tests/Server_Connection_Purging/client2.cpp
+++ b/TAO/tests/Server_Connection_Purging/client2.cpp
@@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR **argv)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index d7c4dc6c141..a7bf81eb0b9 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -32,7 +32,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index 3ad4f33e1f8..4b2c6a46b3d 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -6,12 +6,12 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Ping_Service::ping (void)
+Ping_Service::ping ()
 {
 }
 
 void
-Ping_Service::shutdown (void)
+Ping_Service::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 1488a615128..ae6b6806e2c 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -14,9 +14,9 @@ public:
   Ping_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp
index 0d000b9f195..bdfcac050fb 100644
--- a/TAO/tests/Server_Port_Zero/Hello.cpp
+++ b/TAO/tests/Server_Port_Zero/Hello.cpp
@@ -6,13 +6,13 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (void)
+Hello::get_string ()
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index 8b2124d9fe5..88fd5ffb5b8 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -14,9 +14,9 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index a2c13bc6ef7..1db6e239f6b 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -66,7 +66,6 @@ parse_args (int argc, ACE_TCHAR **argv)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 44acb005512..c066d4b7c03 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -39,7 +39,7 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown... "));
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index e6869668f37..100978728df 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -28,7 +28,7 @@ public:
   void method (CORBA::ULong request_number,
                const test::data &);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
index dff1368f8de..fbde599f444 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
@@ -7,13 +7,13 @@ interface_3_i::interface_3_i (CORBA::ORB_ptr orb)
 
 // INTERFACE 1
 char *
-interface_3_i::operation_1 (void)
+interface_3_i::operation_1 ()
 {
   return CORBA::string_dup ("Invoked operation one");
 }
 
 ::CORBA::Long
-interface_3_i::attribute_1 (void)
+interface_3_i::attribute_1 ()
 {
   return 10;
 }
@@ -27,13 +27,13 @@ interface_3_i::attribute_1 (::CORBA::Long attribute_1)
 // INTERFACE 2
 
 char *
-interface_3_i::operation_2 (void)
+interface_3_i::operation_2 ()
 {
   return CORBA::string_dup ("Invoked operation two");
 }
 
 char *
-interface_3_i::attribute_2 (void)
+interface_3_i::attribute_2 ()
 {
   return CORBA::string_dup ("Returning attribute_2");
 }
@@ -41,19 +41,19 @@ interface_3_i::attribute_2 (void)
 //INTERFACE 3
 
 char *
-interface_3_i::operation_3 (void)
+interface_3_i::operation_3 ()
 {
   return CORBA::string_dup ("Invoked operation three");
 }
 
 void
-interface_3_i::shutdown (void)
+interface_3_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
 
 ::CORBA::Short
-interface_3_i::attribute_3 (void)
+interface_3_i::attribute_3 ()
 {
   return 10;
 }
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.h b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
index c532071b5c6..b536d54146f 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.h
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
@@ -12,18 +12,18 @@ public:
   /// Constructor
   interface_3_i (CORBA::ORB_ptr orb);
 
-  virtual char * operation_1 (void);
-  virtual char * operation_2 (void);
-  virtual char * operation_3 (void);
+  virtual char * operation_1 ();
+  virtual char * operation_2 ();
+  virtual char * operation_3 ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual ::CORBA::Long attribute_1 (void);
+  virtual ::CORBA::Long attribute_1 ();
   virtual void attribute_1 (::CORBA::Long attribute_1);
 
-  virtual char * attribute_2 (void);
+  virtual char * attribute_2 ();
 
-  virtual ::CORBA::Short attribute_3 (void);
+  virtual ::CORBA::Short attribute_3 ();
   virtual void attribute_3 (::CORBA::Short attribute_3);
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 9af4c84e1ce..8a1ccf20498 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -1,5 +1,5 @@
 #include "Smart_Proxy_Impl.h"
-Smart_Test_Factory::Smart_Test_Factory (void)
+Smart_Test_Factory::Smart_Test_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Smart_Test_Factory\n"));
@@ -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)
@@ -25,7 +24,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 CORBA::Short
-Smart_Test_Proxy::box_prices (void)
+Smart_Test_Proxy::box_prices ()
 {
   if (this->price_ == 0)
     {
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index af205ea5619..cffbbb30f72 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -2,8 +2,7 @@
 class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 {
 public:
-
-  Smart_Test_Factory (void);
+  Smart_Test_Factory ();
 
   virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
@@ -14,7 +13,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short box_prices(void);
+  virtual CORBA::Short box_prices();
   // "Smartify" the method call!
 
  private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 57c559330aa..8ec4f0bf503 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -28,7 +28,6 @@ int register_smart_proxy = 1;
 class Marker
 {
  public:
-
   void accumulate_into (ACE_Throughput_Stats &throughput) const
     {
       // Accumulate the throughput statistics into <throughput>
@@ -46,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/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index c6c407c2e99..04f63a733b8 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -21,17 +21,16 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short box_prices  (void);
+  CORBA::Short box_prices  ();
 
   CORBA::Long tickets  (CORBA::Short number);
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb)
@@ -40,7 +39,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i::box_prices (void)
+Test_i::box_prices ()
 {
   return 125;
 }
@@ -52,7 +51,7 @@ Test_i::tickets (CORBA::Short number)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -87,7 +86,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index 6ea80855fc1..93e35c36308 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -14,7 +14,7 @@
 #include "Coll_Tester.h"
 #include "Smart_Proxy_Impl.h"
 
-Collocation_Test::Collocation_Test (void)
+Collocation_Test::Collocation_Test ()
 {
 }
 
@@ -67,7 +67,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 
   return 0;
 
-
 }
 
 int
@@ -77,7 +76,7 @@ Collocation_Test::parse_args (int, ACE_TCHAR *[])
 }
 
 int
-Collocation_Test::test_narrow (void)
+Collocation_Test::test_narrow ()
 {
   // Ensure that the smart proxy is the one which is used by registering
   // the user-defined factory. Its necessary to create one on the heap so
@@ -115,7 +114,7 @@ Collocation_Test::test_narrow (void)
 }
 
 int
-Collocation_Test::run (void)
+Collocation_Test::run ()
 {
   this->poa_manager_->activate ();
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index f7b8a7f346e..b1309a4f502 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -24,7 +24,7 @@
 class Collocation_Test
 {
 public:
-  Collocation_Test (void);
+  Collocation_Test ();
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initializing the Collocation_Test object.
@@ -32,11 +32,11 @@ public:
   int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (void);
+  int test_narrow ();
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (void);
+  int run ();
   // Run the test.
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index 6dcf936df1f..349d03c1061 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -9,7 +9,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (void)
+Top_i::shape ()
 {
   return CORBA::string_dup ("a point.");
 }
@@ -25,13 +25,13 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (void)
+Left_i::shape ()
 {
   return CORBA::string_dup ("the left line");
 }
 
 char *
-Left_i::color (void)
+Left_i::color ()
 {
   return CORBA::string_dup ("black");
 }
@@ -45,20 +45,20 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (void)
+Right_i::shape ()
 {
   return CORBA::string_dup ("the right line");
 }
 
 char *
-Right_i::color (void)
+Right_i::color ()
 {
   return CORBA::string_dup ("red");
   //
 }
 
 CORBA::Long
-Right_i::width (void)
+Right_i::width ()
 {
   return 0;
 }
@@ -72,25 +72,25 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (void)
+Buttom_i::shape ()
 {
   return CORBA::string_dup ("a diamond");
 }
 
 char *
-Buttom_i::color (void)
+Buttom_i::color ()
 {
   return CORBA::string_dup ("translucent");
 }
 
 CORBA::Long
-Buttom_i::width (void)
+Buttom_i::width ()
 {
   return 100;
 }
 
 char *
-Buttom_i::name (void)
+Buttom_i::name ()
 {
   return CORBA::string_dup ("Jubilee");
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 354ae97d32b..147b9e862b6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Diamond_Export Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char* shape (void);
+  virtual char* shape ();
   // Return the shape of this object (interface.)
 };
 
 class Diamond_Export Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Diamond_Export Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Diamond_Export Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index bcda296ad7f..bb628f8abab 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -3,7 +3,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
+Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG, "Smart_Diamond_Top_Factory\n"));
 }
@@ -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/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index 1dd3fc82864..043a501e6a4 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -8,7 +8,7 @@
 class MY_Stub_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Diamond_Top_Default_Proxy_Factory
 {
 public:
-  Smart_Diamond_Top_Factory (void);
+  Smart_Diamond_Top_Factory ();
 
   virtual Diamond::Top_ptr create_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..8379e0391a6 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -1,7 +1,7 @@
 #define ACE_BUILD_SVC_DLL
 #include "Smart_Test_Factory.h"
 
-Smart_Test_Factory::Smart_Test_Factory (void)
+Smart_Test_Factory::Smart_Test_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Smart_Test_Factory\n"));
@@ -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/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index c982fedccc3..974505ca8e0 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -8,8 +8,7 @@ class ACE_Svc_Export Smart_Test_Factory
 
 {
 public:
-
-  Smart_Test_Factory (void);
+  Smart_Test_Factory ();
 
   // This method will create the smart_proxy.
   virtual Test_ptr create_proxy (Test_ptr proxy);
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index e6cc247edf7..bdf03d05fa3 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -25,11 +25,10 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb)
@@ -49,7 +48,7 @@ Test_i :: method (CORBA::Short boo)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown ();
 }
@@ -84,7 +83,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
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/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index 2f64d451b43..99d2d90ad89 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -3,7 +3,6 @@
 class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 {
 public:
-
   Smart_Test_Factory (int one_shot_factory = 1);
 
   virtual Test_ptr create_proxy (Test_ptr proxy);
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 4e1e4c1fa73..567999aac8e 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -25,11 +25,10 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb)
@@ -49,7 +48,7 @@ Test_i :: method (CORBA::Short boo)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 097c5217a69..e21bc567688 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -2,7 +2,7 @@
 
 ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior");
 
-Smart_Test_Factory::Smart_Test_Factory (void)
+Smart_Test_Factory::Smart_Test_Factory ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Smart_Test_Factory\n"));
@@ -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)
@@ -63,7 +62,7 @@ Smart_Test_Proxy::method (CORBA::Short boo)
 }
 
 const ACE_CString&
-Smart_Test_Proxy::fake_ior (void)
+Smart_Test_Proxy::fake_ior ()
 {
   return fake_ior_;
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index f749b8d668c..9f44e9d5dc3 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -4,7 +4,7 @@
 class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 {
 public:
-  Smart_Test_Factory (void);
+  Smart_Test_Factory ();
 
   virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
@@ -23,7 +23,7 @@ public:
   virtual CORBA::Short method (CORBA::Short boo);
   // "Smartify" the method call!
 
-  static const ACE_CString& fake_ior (void);
+  static const ACE_CString& fake_ior ();
 
   // Don't need to add any extra functionality into <shutdown>, hence
   // we don't define it.
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index 1ccc4ed8a80..2969f2471b8 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -10,7 +10,7 @@ public:
   void hello (CORBA::Long howmany);
 
   //FUZZ: disable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -29,7 +29,7 @@ Test_i::hello (CORBA::Long howmany)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -63,7 +63,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
   {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 00b5e43f2c9..61dff5a477d 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -25,11 +25,10 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void shutdown  (void);
+  void shutdown  ();
 
 private:
   CORBA::ORB_var orb_;
-
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb)
@@ -49,7 +48,7 @@ Test_i :: method (CORBA::Short boo)
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
@@ -84,7 +83,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index 25f130a5545..4954166719c 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Sender_ptr sender,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
@@ -43,14 +43,13 @@ Client_Task::svc (void)
 
 
 void
-Client_Task::validate_connections (void)
+Client_Task::validate_connections ()
 {
   for (int i = 0 ; i != 100; i++)
     {
       try
         {
           this->sender_->ping ();
-
         }
       catch (const CORBA::Exception&){}
     }
diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h
index 85ca7e45a0c..bd87305f41e 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.h
+++ b/TAO/tests/Stack_Recursion/Client_Task.h
@@ -22,12 +22,11 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
-
   /// Simple pings to prune up the connections
-  void validate_connections (void);
+  void validate_connections ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index bcc4987e608..57c53074518 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -9,7 +9,7 @@ Sender::Sender (CORBA::ORB_ptr orb)
 }
 
 void
-Sender::dump_results (void)
+Sender::dump_results ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   ACE_DEBUG ((LM_DEBUG,
@@ -44,7 +44,7 @@ Sender::get_data (CORBA::ULong size,
 }
 
 CORBA::Long
-Sender::get_event_count (void)
+Sender::get_event_count ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -55,13 +55,12 @@ Sender::get_event_count (void)
 
 
 void
-Sender::ping (void)
+Sender::ping ()
 {
-  return;
 }
 
 void
-Sender::shutdown (void)
+Sender::shutdown ()
 {
   if (this->is_done_ == false)
     {
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index c403ab93083..3cbadc6ec63 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -17,7 +17,7 @@ public:
   Sender (CORBA::ORB_ptr orb);
 
   /// Print out the results
-  void dump_results (void);
+  void dump_results ();
 
   /// Get the status of the flag..
   bool is_done () const;
@@ -26,11 +26,11 @@ public:
   virtual CORBA::Boolean get_data (CORBA::ULong size,
                                    Test::Payload_out payload);
 
-  virtual CORBA::Long get_event_count (void);
+  virtual CORBA::Long get_event_count ();
 
-  virtual void ping (void);
+  virtual void ping ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   TAO_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp
index 5a3cf60f539..939beccbc61 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Server_Task.cpp
@@ -12,7 +12,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
diff --git a/TAO/tests/Stack_Recursion/Server_Task.h b/TAO/tests/Stack_Recursion/Server_Task.h
index 0bada3e7344..a4612707d64 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.h
+++ b/TAO/tests/Stack_Recursion/Server_Task.h
@@ -22,7 +22,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Reference to the ORB
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index 8b5fd8d0389..65f0e90bdc4 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -79,7 +79,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       sender->shutdown ();
 
 
-
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp
index 11aad54585a..ee4667f0fb8 100644
--- a/TAO/tests/Storable/Savable.cpp
+++ b/TAO/tests/Storable/Savable.cpp
@@ -10,7 +10,6 @@ const int Savable::bytes_size_max = 128;
 class Savable_File_Guard: public TAO::Storable_File_Guard
 {
 public:
-
   Savable_File_Guard (Savable & savable, Method_Type method_type);
 
   ~Savable_File_Guard ();
@@ -91,7 +90,6 @@ Savable::Savable (TAO::Storable_Factory & storable_factory)
   : storable_factory_(storable_factory)
   , loaded_from_stream_ (false)
 {
-
   for (int index = 0; index < 2; ++index)
     {
       this->i_[index] = 0;
@@ -104,8 +102,7 @@ Savable::Savable (TAO::Storable_Factory & storable_factory)
         }
     }
 
-  ACE_Auto_Ptr<TAO::Storable_Base>
-    stream (storable_factory_.create_stream("test.dat", "r"));
+  ACE_Auto_Ptr<TAO::Storable_Base> stream (storable_factory_.create_stream("test.dat", "r"));
   if (stream->exists ())
     {
       Savable_File_Guard fg(*this, SFG::CREATE_WITH_FILE);
diff --git a/TAO/tests/Storable/run_test.pl b/TAO/tests/Storable/run_test.pl
index f7a823a850e..15618165556 100755
--- a/TAO/tests/Storable/run_test.pl
+++ b/TAO/tests/Storable/run_test.pl
@@ -20,7 +20,7 @@ my $test_stderr_file = $test1->LocalFile ($stderr_file);
 sub cat_file($)
 {
     my $file_name = shift;
-    if (-s $file_name ) # size of file is greater than zero
+    if (-s $file_name) # size of file is greater than zero
     {
         open TESTFILE, $file_name or die "Couldn't open file: $!";
         my @teststring = <TESTFILE>; # read in all of the file
diff --git a/TAO/tests/Storable/test.cpp b/TAO/tests/Storable/test.cpp
index 0748cb9b409..568e6aa9848 100644
--- a/TAO/tests/Storable/test.cpp
+++ b/TAO/tests/Storable/test.cpp
@@ -112,7 +112,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       for (int j = 0; j < num_loops; ++j)
         {
-
           // Constructor called num_loops times.
           // Each time state read from persistent store.
           Savable savable(factory);
@@ -121,7 +120,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           // written from other process is correct.
           if (savable.is_loaded_from_stream ())
             {
-
               int int_read = savable.int_get(read_index);
               // If value read is not 0 then the other
               // process has written to persistent store.
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index 1ef663928e2..a236a8e1d9f 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -48,7 +48,6 @@ class Client
 public:
   Client ();
   // ctor
-
 };
 
 // ****************************************************************
diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index 6e6012b4613..46a3a25a599 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -6,7 +6,7 @@
 #endif /* __ACE_INLINE__ */
 
 CORBA::Boolean
-Simple_Server_i::print_status (void)
+Simple_Server_i::print_status ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -15,7 +15,7 @@ Simple_Server_i::print_status (void)
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h
index fa074ddbe2b..86c1acf10e2 100644
--- a/TAO/tests/Strategies/simple_test_i.h
+++ b/TAO/tests/Strategies/simple_test_i.h
@@ -27,9 +27,9 @@ public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // = The Simple_Server methods.
-  CORBA::Boolean print_status (void);
+  CORBA::Boolean print_status ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
index 803f6e98555..2241cdf9a62 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
@@ -25,7 +25,7 @@ Custom_Time_Policy_Strategy::~Custom_Time_Policy_Strategy ()
 {
 }
 
-ACE_Timer_Queue * Custom_Time_Policy_Strategy::create_timer_queue (void)
+ACE_Timer_Queue * Custom_Time_Policy_Strategy::create_timer_queue ()
 {
   ACE_Timer_Queue * tmq = 0;
 
@@ -44,7 +44,7 @@ Custom_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq)
   delete tmq;
 }
 
-ACE_Dynamic_Time_Policy_Base * Custom_Time_Policy_Strategy::get_time_policy (void)
+ACE_Dynamic_Time_Policy_Base * Custom_Time_Policy_Strategy::get_time_policy ()
 {
   return &custom_time_policy_;
 }
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h
index 470147e86e7..5230f79d341 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h
@@ -33,11 +33,11 @@ class TPTEST_Export Custom_Time_Policy_Strategy
 public:
   virtual ~Custom_Time_Policy_Strategy ();
 
-  virtual ACE_Timer_Queue * create_timer_queue (void);
+  virtual ACE_Timer_Queue * create_timer_queue ();
 
   virtual void destroy_timer_queue (ACE_Timer_Queue *tmq);
 
-  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void);
+  virtual ACE_Dynamic_Time_Policy_Base * get_time_policy ();
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TPTEST, Custom_Time_Policy_Strategy)
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 0b93b2eece0..a80f7fbca30 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -116,7 +116,6 @@ parse_args (int argc, ACE_TCHAR **argv)
 test_ptr
 setup_policies (CORBA::ORB_ptr orb, test_ptr object)
 {
-
   test_var object_with_policy;
   CORBA::PolicyList policy_list (1);
   if (timeout == -1)
@@ -168,7 +167,6 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index 969d9534bc5..fbc9e7f8c4a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -30,7 +30,7 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::flush (void)
+test_i::flush ()
 {
   ACE_DEBUG ((LM_DEBUG, "server: got flush request\n"));
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h
index 0d30b7009e1..581f2244a49 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.h
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h
@@ -31,7 +31,7 @@ public:
                const test::data &,
                CORBA::ULong work);
 
-  void flush (void);
+  void flush ();
 
   void shutdown (CORBA::Long start_time);
 
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 6faa56e1516..463a4e63837 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -165,7 +165,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
 
-
           ACE_DEBUG ((LM_DEBUG,
                       "client(%P) Set the ORB policies\n"));
 
@@ -185,8 +184,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
 
-
-
           ACE_DEBUG ((LM_DEBUG,
                       "client(%P) Set the thread policies\n"));
 
@@ -206,8 +203,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
 
-
-
           ACE_DEBUG ((LM_DEBUG,
                       "client(%P) Use the object policies\n"));
           send_echo (object1, orb.in (), timeout_server.in (), t);
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index d615af9689d..a240a7d9e6c 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -33,7 +33,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (void)
+Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 32129102136..a175271fcd8 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -29,7 +29,7 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs);
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index d800764960b..191b2ac6a64 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -12,18 +12,18 @@ Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
 {
 }
 
-Current_Test_Impl::~Current_Test_Impl (void)
+Current_Test_Impl::~Current_Test_Impl ()
 {
 }
 
 ::CORBA::Long
-Current_Test_Impl::self_test (void)
+Current_Test_Impl::self_test ()
 {
   return 0;
 }
 
 void
-Current_Test_Impl::test_transport_current (void)
+Current_Test_Impl::test_transport_current ()
 {
   if (TAO_debug_level > 2)
     {
@@ -66,7 +66,7 @@ Current_Test_Impl::test_transport_current (void)
 }
 
 void
-Current_Test_Impl::invoked_by_client (void)
+Current_Test_Impl::invoked_by_client ()
 {
   try
     {
@@ -85,7 +85,7 @@ Current_Test_Impl::invoked_by_client (void)
 }
 
 void
-Current_Test_Impl::invoked_by_client_i (void)
+Current_Test_Impl::invoked_by_client_i ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -120,7 +120,7 @@ Current_Test_Impl::invoked_by_client_i (void)
 }
 
 void
-Current_Test_Impl::invoked_during_upcall (void)
+Current_Test_Impl::invoked_during_upcall ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -131,7 +131,7 @@ Current_Test_Impl::invoked_during_upcall (void)
 }
 
 void
-Current_Test_Impl::shutdown (void)
+Current_Test_Impl::shutdown ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
index f91eea955d1..c17b7d4b697 100644
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ b/TAO/tests/TransportCurrent/Framework/client.cpp
@@ -99,14 +99,12 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server,
 /// interceptor
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
-
       for (int i = 0; i < this->niterations_; ++i)
         {
-
   // Minimum CORBA does not define Object::_request, so we're just
   // skipping the DII part in those cases.
 #if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0))
@@ -249,7 +247,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       else
         {
-
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n")));
 
           // Self-test the server side
diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl
index 8024151a0f4..3c87cca9597 100755
--- a/TAO/tests/TransportCurrent/Framework/run_test.pl
+++ b/TAO/tests/TransportCurrent/Framework/run_test.pl
@@ -12,9 +12,9 @@ my $status = 0;
 my $confmod = "";
 
 my $mode = shift (@ARGV);
-if ( $mode =~ /-dynamic/) {
+if ($mode =~ /-dynamic/) {
 }
-elsif  ( $mode =~ /-static/) {
+elsif ($mode =~ /-static/) {
     $confmod = "-static";
 }
 else {
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 7d3caf9d35d..bff3fe20ae0 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -73,7 +73,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 /// interceptor
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -93,7 +93,6 @@ server_main (int argc,
              ACE_TCHAR *argv[],
              Test::Server_Request_Interceptor *cri)
 {
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
   try
@@ -205,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/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 5c9f92d54b9..e5d271f837e 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -29,7 +29,6 @@ testCurrentORBInitializer (int argc, ACE_TCHAR *argv[])
 int
 testCurrentLoader (int, char *[])
 {
-
   ACE_Service_Object *factory = 0;
 
   factory = ACE_Dynamic_Service<ACE_Service_Object>::instance
@@ -50,7 +49,6 @@ testCurrentLoader (int, char *[])
                           -1);
       else
         {
-
 #if !defined (TAO_AS_STATIC_LIBS)
           int ret = ACE_Service_Config::process_directive
             (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
@@ -70,7 +68,6 @@ testCurrentLoader (int, char *[])
   //  ACE_ASSERT (factory != 0);
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentLoader: OK\n")));
   return 0;
-
 }
 
 
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index 08bcc61a7ed..4f8461eb7e5 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -13,18 +13,18 @@ Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
 {
 }
 
-Current_Test_Impl::~Current_Test_Impl (void)
+Current_Test_Impl::~Current_Test_Impl ()
 {
 }
 
 ::CORBA::Long
-Current_Test_Impl::self_test (void)
+Current_Test_Impl::self_test ()
 {
   return 0;
 }
 
 void
-Current_Test_Impl::test_transport_current (void)
+Current_Test_Impl::test_transport_current ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -58,9 +58,8 @@ Current_Test_Impl::test_transport_current (void)
 }
 
 
-
 void
-Current_Test_Impl::invoked_by_client (void)
+Current_Test_Impl::invoked_by_client ()
 {
   if (TAO_debug_level >= 1) {
     ACE_DEBUG ((LM_DEBUG,
@@ -96,7 +95,7 @@ Current_Test_Impl::invoked_by_client (void)
 }
 
 void
-Current_Test_Impl::invoked_during_upcall (void)
+Current_Test_Impl::invoked_during_upcall ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -106,7 +105,7 @@ Current_Test_Impl::invoked_during_upcall (void)
 }
 
 void
-Current_Test_Impl::shutdown (void)
+Current_Test_Impl::shutdown ()
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 4e1a630dd06..0411ed36200 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -6,22 +6,16 @@
 #include "IIOP_Server_Request_Interceptor.h"
 
 namespace Test {
-
   using namespace TAO;
 
   IIOP_Server_Request_Interceptor::IIOP_Server_Request_Interceptor (const char* orbid, TEST test)
     : Server_Request_Interceptor (orbid, test)
     , iiop_test_successful_ (true)
-    , mult_thr_test_successful_ (true)
-  {
-  }
-
-  IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor (void)
   {
   }
 
   char *
-  IIOP_Server_Request_Interceptor::name (void)
+  IIOP_Server_Request_Interceptor::name ()
   {
     return CORBA::string_dup ("II SRI");
   }
@@ -74,7 +68,6 @@ namespace Test {
                   ACE_TEXT ("push_request_info: Can't track that many requests %d\n"),
                   name.in (),
                   requestID));
-
   }
 
   void
@@ -133,7 +126,7 @@ namespace Test {
   /// Checks if all the endpoints, encountered on the way in have been
   /// cleaned on the way out of the interception point
   bool
-  IIOP_Server_Request_Interceptor::self_test (void)
+  IIOP_Server_Request_Interceptor::self_test ()
   {
     CORBA::String_var name (this->name ());
     bool has_remaining_endpoints = false;
@@ -226,7 +219,6 @@ namespace Test {
       }
 
     Server_Request_Interceptor::receive_request_service_contexts (ri);
-
   }
 
   void
@@ -235,7 +227,6 @@ namespace Test {
     try
       {
         outbound_process_context (ri);
-
       }
     catch (const CORBA::Exception&)
       {
@@ -247,7 +238,6 @@ namespace Test {
       }
 
     Server_Request_Interceptor::send_reply (ri);
-
   }
 
   void
@@ -256,8 +246,6 @@ namespace Test {
     try
       {
         outbound_process_context (ri);
-
-
       }
     catch (const CORBA::Exception&)
       {
@@ -266,7 +254,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 1470c9348f3..ed110479a1c 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -27,18 +27,16 @@
 
 namespace Test
 {
-
   class IIOP_Server_Request_Interceptor
     : public virtual Test::Server_Request_Interceptor
     , public virtual ::CORBA::LocalObject
   {
   public:
-
     /// Constructor.
     IIOP_Server_Request_Interceptor (const char* orbid, TEST test);
 
     /// Destructor.
-    virtual ~IIOP_Server_Request_Interceptor ();
+    virtual ~IIOP_Server_Request_Interceptor () = default;
 
     /// queries the status of the test
     virtual bool self_test ();
@@ -53,7 +51,7 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
     /// incomming interception point
     virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
@@ -69,7 +67,6 @@ namespace Test
     //@}
 
   protected:
-
     /// process incomming requests context
     void inbound_process_context
     (PortableInterceptor::ServerRequestInfo_ptr ri);
@@ -87,7 +84,6 @@ namespace Test
     TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid);
 
   private:
-
     /// transport ID dtata structure
     typedef struct EP {
       CORBA::UShort port_;
@@ -112,21 +108,15 @@ namespace Test
       {
         return !(this->operator== (ep));
       };
-
     } EndPoint;
 
   private:
-
     /// IIOPTraits test status
     bool iiop_test_successful_;
 
-    /// Multi-threaded test status
-    bool mult_thr_test_successful_;
-
     /// Endpoints hash table
     EndPoint endPoints_[1001];
   };
-
 } // namespace Test
 
 #endif  /* ISERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index 843baeaeb6f..141d2517b7a 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -99,14 +99,12 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server,
 /// interceptor
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
-
       for (int i = 0; i < this->niterations_; ++i)
         {
-
   // Minimum CORBA does not define Object::_request, so we're just
   // skipping the DII part in those cases.
 #if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0))
@@ -249,7 +247,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       else
         {
-
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n")));
 
           // Self-test the server side
diff --git a/TAO/tests/TransportCurrent/IIOP/run_test.pl b/TAO/tests/TransportCurrent/IIOP/run_test.pl
index 3d75daf65a7..293f4c2bf34 100755
--- a/TAO/tests/TransportCurrent/IIOP/run_test.pl
+++ b/TAO/tests/TransportCurrent/IIOP/run_test.pl
@@ -23,13 +23,13 @@ $client->DeleteFile($iorbase);
 $status = 0;
 
 $mode = shift (@ARGV);
-if ( $mode =~ /-dynamic/) {
+if ($mode =~ /-dynamic/) {
     $base_client_conf = "client_dynamic" . $PerlACE::svcconf_ext;
     $base_server_conf = "server_dynamic" . $PerlACE::svcconf_ext;
     $client_conf_file = $client->LocalFile ("$base_client_conf");
     $server_conf_file = $server->LocalFile ("$base_server_conf");
 }
-elsif  ( $mode =~ /-static/) {
+elsif ($mode =~ /-static/) {
     $base_client_conf = "client_static" . $PerlACE::svcconf_ext;
     $base_server_conf = "server_static" . $PerlACE::svcconf_ext;
     $client_conf_file = $client->LocalFile ("$base_client_conf");
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index b7c0e769a28..1a5ea9153a6 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -71,7 +71,7 @@ Worker::Worker (CORBA::ORB_ptr orb)
 /// Test referencing the TC data *inside* the context of a client-side
 /// interceptor
 int
-Worker::svc (void)
+Worker::svc ()
 {
   try
     {
@@ -85,7 +85,6 @@ Worker::svc (void)
 }
 
 
-
 /// Main driver
 
 int
@@ -93,7 +92,6 @@ server_main (int argc,
              ACE_TCHAR *argv[],
              Test::Server_Request_Interceptor *cri)
 {
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
   try
@@ -195,7 +193,6 @@ server_main (int argc,
       server->shutdown ();
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index 2eb5c6e8d19..5d78736cbf0 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -6,7 +6,6 @@
 
 namespace Test
 {
-
   Client_ORBInitializer::Client_ORBInitializer
     (PortableInterceptor::ClientRequestInterceptor_ptr interceptor)
       : interceptor_
@@ -15,7 +14,7 @@ namespace Test
     /* no-op */
   }
 
-  Client_ORBInitializer::~Client_ORBInitializer (void)
+  Client_ORBInitializer::~Client_ORBInitializer ()
   {
     /* no-op */
   }
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
index 985ee093b60..e89f12deda2 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -25,14 +25,13 @@
 
 namespace Test
 {
-
   class Current_Test_Export Client_ORBInitializer :
     public virtual PortableInterceptor::ORBInitializer,
     public virtual ::CORBA::LocalObject
   {
   public:
     Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
-    virtual ~Client_ORBInitializer (void);
+    virtual ~Client_ORBInitializer ();
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
@@ -41,7 +40,6 @@ namespace Test
   private:
     PortableInterceptor::ClientRequestInterceptor_var interceptor_;
   };
-
 }
 
 #include /**/ "ace/post.h"
@@ -49,4 +47,3 @@ namespace Test
 #endif  /* CLIENT_ORBINITIALIZER_T_H */
 
 
-
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index 5374a39a00f..3ef844d0e41 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -7,7 +7,6 @@
 
 namespace Test
 {
-
   Client_Request_Interceptor::Client_Request_Interceptor (const char *orb_id,
                                                           TEST test)
     : orb_id_ (CORBA::string_dup (orb_id))
@@ -18,13 +17,13 @@ namespace Test
   }
 
   CORBA::Long
-  Client_Request_Interceptor::interceptions (void)
+  Client_Request_Interceptor::interceptions ()
   {
     return this->request_count_;
   }
 
   char *
-  Client_Request_Interceptor::name (void)
+  Client_Request_Interceptor::name ()
   {
     return CORBA::string_dup ("Client_Request_Interceptor");
   }
@@ -54,7 +53,7 @@ namespace Test
   }
 
   void
-  Client_Request_Interceptor::destroy (void)
+  Client_Request_Interceptor::destroy ()
   {
   }
 
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
index 5ec9300d868..49bbe7f5619 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
@@ -29,7 +29,6 @@
 
 namespace Test
 {
-
   /// A metod doing the actual testing, so we could change it for the
   /// different traits implementations
   typedef int (*TEST) (CORBA::ORB_ptr);
@@ -52,7 +51,6 @@ namespace Test
       public virtual ::CORBA::LocalObject
   {
  public:
-
     /// Constructor.
     Client_Request_Interceptor (const char *orb_id,
                                 TEST test);
@@ -66,9 +64,9 @@ namespace Test
      */
     //@{
     /// Return the name of this ClientRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
@@ -82,7 +80,7 @@ namespace Test
     //@}
 
     // Number of interceptions
-    CORBA::Long interceptions (void);
+    CORBA::Long interceptions ();
 
   private:
     // Implementation method, every inteception point will have to
@@ -113,7 +111,6 @@ namespace Test
     /// Test function
     TEST test_;
   };
-
 } // namespace Test
 
 #endif  /* CLIENT_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
index 07b0831456d..0d585a7ea9a 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
@@ -27,26 +27,25 @@
 class Current_Test_Impl : public virtual POA_Test::Transport::CurrentTest
 {
 public:
-
   /// Constructor.
   Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls = 1);
 
   /// Destructor.
-  ~Current_Test_Impl (void);
+  ~Current_Test_Impl ();
 
   /// Main servant test method.
-  virtual void invoked_by_client (void);
+  virtual void invoked_by_client ();
 
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
-  virtual void invoked_during_upcall (void);
+  virtual void invoked_during_upcall ();
 
   /// Shutdown the ORB.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   // A self-test for coherency
-  virtual ::CORBA::Long self_test (void);
+  virtual ::CORBA::Long self_test ();
 
 public:
   /// Reports if unexpected errors have been encountered for the
@@ -54,10 +53,10 @@ public:
   bool is_successful () const;
 
 private:
-  void test_transport_current (void);
+  void test_transport_current ();
 
   /// Main servant test method.
-  void invoked_by_client_i (void);
+  void invoked_by_client_i ();
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index f15ce0662e4..974781ef717 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -6,7 +6,6 @@
 
 namespace Test
 {
-
   Server_ORBInitializer::Server_ORBInitializer
     (PortableInterceptor::ServerRequestInterceptor_ptr interceptor)
       : interceptor_
@@ -15,7 +14,7 @@ namespace Test
     /* no-op */
   }
 
-  Server_ORBInitializer::~Server_ORBInitializer (void)
+  Server_ORBInitializer::~Server_ORBInitializer ()
   {
     /* no-op */
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
index d90aa84936f..2dc95808f3f 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -24,14 +24,13 @@
 
 namespace Test
 {
-
   class Current_Test_Export Server_ORBInitializer :
     public virtual PortableInterceptor::ORBInitializer,
     public virtual ::CORBA::LocalObject
   {
   public:
     Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
-    virtual ~Server_ORBInitializer (void);
+    virtual ~Server_ORBInitializer ();
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
@@ -40,7 +39,6 @@ namespace Test
   private:
     PortableInterceptor::ServerRequestInterceptor_var interceptor_;
   };
-
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 17064f19bbe..2e79dc33976 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -6,7 +6,6 @@
 
 namespace Test
 {
-
   Server_Request_Interceptor::Server_Request_Interceptor (const char* orbid, TEST test)
     : request_count_ (0)
     , orb_id_ (::CORBA::string_dup (orbid))
@@ -14,7 +13,7 @@ namespace Test
   {
   }
 
-  Server_Request_Interceptor::~Server_Request_Interceptor (void)
+  Server_Request_Interceptor::~Server_Request_Interceptor ()
   {
   }
 
@@ -58,20 +57,20 @@ namespace Test
 
   /// queries the status of the test
   bool
-  Server_Request_Interceptor::self_test (void)
+  Server_Request_Interceptor::self_test ()
   {
     return true;
   }
 
 
   char *
-  Server_Request_Interceptor::name (void)
+  Server_Request_Interceptor::name ()
   {
     return CORBA::string_dup ("SRI   ");
   }
 
   void
-  Server_Request_Interceptor::destroy (void)
+  Server_Request_Interceptor::destroy ()
   {
   }
 
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index 3830c787546..ba8378de000 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -30,7 +30,6 @@
 
 namespace Test
 {
-
   /// A metod doing the actual testing, so we could change it for the
   /// different traits implementations
 
@@ -51,12 +50,12 @@ namespace Test
     Server_Request_Interceptor (const char*orb_id, TEST test);
 
     /// Destructor.
-    virtual ~Server_Request_Interceptor (void);
+    virtual ~Server_Request_Interceptor ();
 
     virtual void test_transport_current (const ACE_TCHAR* amethod);
 
     /// Coherency test
-    virtual bool self_test (void);
+    virtual bool self_test ();
 
     /**
      * @name Methods Required by the Server Request Interceptor
@@ -68,9 +67,9 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void);
+    virtual char * name ();
 
-    virtual void destroy (void);
+    virtual void destroy ();
 
     virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri);
 
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/tests/Transport_Cache_Manager/mock_tdi.h b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
index 91e4b79d78e..b646ccfe784 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_tdi.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
@@ -1,10 +1,9 @@
 class mock_tdi
 {
 public:
-  mock_tdi () {}
-  u_long hash (void) {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));}
-  mock_tdi *duplicate (void) {return 0;}
+  mock_tdi () = default;
+  u_long hash () {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));}
+  mock_tdi *duplicate () {return 0;}
   CORBA::Boolean is_equivalent (const mock_tdi *) {return true;}
-
 };
 
diff --git a/TAO/tests/Transport_Cache_Manager/mock_transport.h b/TAO/tests/Transport_Cache_Manager/mock_transport.h
index 1a383b0dd59..31e8441b819 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_transport.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_transport.h
@@ -8,13 +8,13 @@ public:
   void purging_order (unsigned long purging_order) { this->purging_order_ = purging_order;}
   bool is_connected () const {return is_connected_;}
   void is_connected (bool is_connected) { this->is_connected_ = is_connected;}
-  ACE_Event_Handler::Reference_Count add_reference (void) {return 0;}
-  ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;}
+  ACE_Event_Handler::Reference_Count add_reference () {return 0;}
+  ACE_Event_Handler::Reference_Count remove_reference () {return 0;}
   void cache_map_entry (TCM::HASH_MAP_ENTRY *entry) {this->entry_ = entry;}
-  TCM::HASH_MAP_ENTRY *cache_map_entry (void) {return this->entry_;}
-  void close_connection (void) { purged_count_ = ++global_purged_count;};
-  int purged_count (void) { return this->purged_count_;}
-  bool can_be_purged (void) { return true;}
+  TCM::HASH_MAP_ENTRY *cache_map_entry () {return this->entry_;}
+  void close_connection () { purged_count_ = ++global_purged_count;};
+  int purged_count () { return this->purged_count_;}
+  bool can_be_purged () { return true;}
 private:
   size_t id_;
   bool is_connected_;
diff --git a/TAO/tests/Transport_Cache_Manager/run_test.pl b/TAO/tests/Transport_Cache_Manager/run_test.pl
index 9053a8fb406..fbf93564456 100755
--- a/TAO/tests/Transport_Cache_Manager/run_test.pl
+++ b/TAO/tests/Transport_Cache_Manager/run_test.pl
@@ -11,8 +11,7 @@ use strict;
 my $final_result = 0;
 
 my @testsToRun = qw(Bug_3549_Regression
-               Bug_3558_Regression
-              );
+                    Bug_3558_Regression);
 
 foreach my $process (@testsToRun) {
 
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index 7909a5a3de1..9d4bb52a1f0 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -13,7 +13,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
 }
 
 void
-First_i::oneway_method (void)
+First_i::oneway_method ()
 {
   ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n"));
 
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 0d15b14b8d1..56a2506f20d 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -14,15 +14,13 @@ class First_i
   : public virtual POA_Two_Objects_Test::First
 {
 public:
-
   // Ctor..
   First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done);
 
   /// Interface methods..
-  void oneway_method (void);
+  void oneway_method ();
 
 private:
-
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index a28794209cd..e14f9d6e7ad 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -12,13 +12,13 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
 
 //factory method to create first object
 Two_Objects_Test::First_ptr
-Object_Factory_i::create_first (void)
+Object_Factory_i::create_first ()
 {
   First_i *first_impl;
 
   ACE_NEW_THROW_EX (first_impl,
                     First_i (orb_.in(), two_way_done_ ),
-                    CORBA::NO_MEMORY() );
+                    CORBA::NO_MEMORY());
   // Ownership is transfered to the POA.
   PortableServer::ServantBase_var safe (first_impl);
 
@@ -41,7 +41,7 @@ Object_Factory_i::create_first (void)
 
 //factory method to create second object
 Two_Objects_Test::Second_ptr
-Object_Factory_i::create_second (void)
+Object_Factory_i::create_second ()
 {
   Second_i *second_impl;
 
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 5d7c6f53d26..e851eae2fcd 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -14,13 +14,12 @@ class Object_Factory_i
   : public virtual POA_Two_Objects_Test::Object_Factory
 {
 public:
-
   Object_Factory_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len);
 
-  Two_Objects_Test::First_ptr create_first (void);
+  Two_Objects_Test::First_ptr create_first ();
 
-  Two_Objects_Test::Second_ptr create_second (void);
+  Two_Objects_Test::Second_ptr create_second ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/README b/TAO/tests/Two_Objects/README
index bb59441a183..1269794533e 100644
--- a/TAO/tests/Two_Objects/README
+++ b/TAO/tests/Two_Objects/README
@@ -16,7 +16,7 @@ for subsequent requests on the same connection handle.
 
 Description:
 
-The server creates two servants ( each implementing different
+The server creates two servants (each implementing different
 interfaces ). Two threads are created on the server and each
 one of them listens for requests (has a orb->run() call). The
 client first makes a one way call to Servant 1. It then makes
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index 324a470f8f5..c4f0211bc57 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -11,11 +11,10 @@ Second_i::Second_i (CORBA::ORB_ptr orb,
     length_(len),
     two_way_done_(two_way_done)
 {
-
 }
 
 Two_Objects_Test::Octet_Seq *
-Second_i::twoway_method (void)
+Second_i::twoway_method ()
 {
   Two_Objects_Test::Octet_Seq  *preply_mesg = 0;
 
@@ -25,7 +24,7 @@ Second_i::twoway_method (void)
 
   Two_Objects_Test::Octet_Seq_var reply_var =
     preply_mesg;
-  reply_var->length ( this->length_);
+  reply_var->length (this->length_);
 
   ACE_DEBUG ((LM_DEBUG,
               "Twoway servant : (%P|%t) two way method called.\n"));
@@ -46,7 +45,7 @@ Second_i::twoway_method (void)
 }
 
 void
-Second_i::shutdown (void)
+Second_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n"));
   this->orb_->shutdown (false);
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index c4f54572700..22b67aad6c5 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -13,14 +13,12 @@ class Second_i
   : public virtual POA_Two_Objects_Test::Second
 {
 public:
+  Second_i (CORBA::ORB_ptr orb,
+            CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
-  Second_i ( CORBA::ORB_ptr orb,
-             CORBA::ULong len, ACE_Auto_Event &two_way_done);
+  Two_Objects_Test::Octet_Seq *twoway_method ();
 
-  Two_Objects_Test::Octet_Seq *
-    twoway_method (void);
-
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index 7c88437acac..126f4e82561 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -7,9 +7,8 @@ Worker::Worker (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
-
   try
     {
       this->orb_->run ();
diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h
index 2e50f9c9982..82dba9770b1 100644
--- a/TAO/tests/Two_Objects/worker.h
+++ b/TAO/tests/Two_Objects/worker.h
@@ -10,7 +10,6 @@
 class Worker : public ACE_Task_Base
 {
 public:
-
   // Ctor
   Worker (CORBA::ORB_ptr orb);
 
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 1245a1f3650..0bdedee34a8 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -7,7 +7,7 @@ const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 static int done = 0;
 
 void
-throw_exception (void)
+throw_exception ()
 {
   throw 1;
 }
@@ -16,17 +16,16 @@ class test_i :
   public POA_test
 {
 public:
-
   test_i (CORBA::ORB_ptr orb);
 
-  void normal_method (void);
+  void normal_method ();
 
-  void unknown_exception_in_method (void);
+  void unknown_exception_in_method ();
 
-  void unknown_exception_during_deactivation (void);
+  void unknown_exception_during_deactivation ();
 
-  void _add_ref (void);
-  void _remove_ref (void);
+  void _add_ref ();
+  void _remove_ref ();
 
   CORBA::ORB_var orb_;
 
@@ -40,14 +39,14 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::normal_method (void)
+test_i::normal_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::normal_method() called\n"));
 }
 
 void
-test_i::unknown_exception_in_method (void)
+test_i::unknown_exception_in_method ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::unknown_exception_in_method() called\n"));
@@ -59,7 +58,7 @@ test_i::unknown_exception_in_method (void)
 }
 
 void
-test_i::unknown_exception_during_deactivation (void)
+test_i::unknown_exception_during_deactivation ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::unknown_exception_during_deactivation() called\n"));
@@ -74,7 +73,7 @@ test_i::unknown_exception_during_deactivation (void)
 }
 
 void
-test_i::_add_ref (void)
+test_i::_add_ref ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::_add_ref() called; current refcount = %d\n",
@@ -82,7 +81,7 @@ test_i::_add_ref (void)
 }
 
 void
-test_i::_remove_ref (void)
+test_i::_remove_ref ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::_remove_ref() called; current refcount = %d\n",
@@ -104,12 +103,11 @@ class test_factory_i :
   public POA_test_factory
 {
 public:
-
   test_factory_i (CORBA::ORB_ptr orb);
 
-  test_ptr create_test (void);
+  test_ptr create_test ();
 
-  void shutdown (void);
+  void shutdown ();
 
   CORBA::ORB_var orb_;
 };
@@ -121,7 +119,7 @@ test_factory_i::test_factory_i (CORBA::ORB_ptr orb)
 }
 
 test_ptr
-test_factory_i::create_test (void)
+test_factory_i::create_test ()
 {
   test_i *servant =
     new test_i (this->orb_.in ());
@@ -147,7 +145,7 @@ test_factory_i::create_test (void)
 }
 
 void
-test_factory_i::shutdown (void)
+test_factory_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "factory_i::shutdown() called\n"));
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 8d4507c83aa..f2a869ca3a3 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -20,12 +20,11 @@ class Control;
 class Client
 {
 public:
-
   /// ctor
   Client (CORBA::ORB_ptr orb);
 
   ///Dtor..
-  ~Client (void);
+  ~Client ();
 
   /// The callbacks
   static void start_callback (Widget w,
@@ -36,15 +35,14 @@ public:
                               XtPointer call_data);
 
   /// The hooks...
-  void start_hook (void);
-  void stop_hook (void);
+  void start_hook ();
+  void stop_hook ();
 
   /// Adds the callbacks to the GUI underneath.....
   void add_callback (Control &);
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
 private:
-
   /// The ORB
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index b539334d7f8..770a7f1303d 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -7,12 +7,12 @@ Control::Control (Widget &parent)
   this->frame_ = XmCreateFrame (parent,
                                 (char *) "frame",
                                 0,
-                                0 );
+                                0);
 
   this->rowcolumn_ = XmCreateRowColumn (this->frame_,
                                          (char *)"rwc",
                                         0,
-                                        0 );
+                                        0);
 
   this->startwidget_ = XmCreatePushButton (this->rowcolumn_,
                                            (char *) "Start",
@@ -25,12 +25,12 @@ Control::Control (Widget &parent)
                                           0);
 }
 
-Control::~Control (void)
+Control::~Control ()
 {
 }
 
 void
-Control::manage (void)
+Control::manage ()
 {
   XtManageChild (frame_);
   XtManageChild (rowcolumn_);
@@ -39,13 +39,13 @@ Control::manage (void)
 }
 
 Widget &
-Control::startwidget (void)
+Control::startwidget ()
 {
   return this->startwidget_;
 }
 
 Widget &
-Control::stopwidget (void)
+Control::stopwidget ()
 {
   return this->stopwidget_;
 }
diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h
index ecda322aef1..959acddd14e 100644
--- a/TAO/tests/Xt_Stopwatch/Control.h
+++ b/TAO/tests/Xt_Stopwatch/Control.h
@@ -27,19 +27,18 @@ class Control
   Control (Widget &parent);
 
   /// Destructor
-  virtual ~Control (void);
+  virtual ~Control ();
 
   /// Manage the widget
-  virtual void manage (void);
+  virtual void manage ();
 
   /// Return the start widget
-  Widget& startwidget (void);
+  Widget& startwidget ();
 
   /// Return the stop widget..
-  Widget& stopwidget (void);
+  Widget& stopwidget ();
 
  private:
-
   /// A frame widget...
   Widget frame_;
 
@@ -51,7 +50,6 @@ class Control
 
   /// Pushbutton widget that is used to stop the timer..
   Widget stopwidget_;
-
 };
 
 
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index fb6095fd925..b3826ed29f9 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -17,13 +17,13 @@ Stopwatch_display::Stopwatch_display (Widget &parent)
                                  0);
 }
 
-Stopwatch_display::~Stopwatch_display (void)
+Stopwatch_display::~Stopwatch_display ()
 {
   //No-op
 }
 
 void
-Stopwatch_display::manage (void)
+Stopwatch_display::manage ()
 {
   XtManageChild (this->frame_);
   XtManageChild (this->label_);
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
index 16b2227b330..1c255ddfb33 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
@@ -19,15 +19,14 @@
 class Stopwatch_display
 {
 public:
-
   /// Stopwatch_display constructor
   Stopwatch_display (Widget &parent);
 
   /// Destructor
-  virtual ~Stopwatch_display (void);
+  virtual ~Stopwatch_display ();
 
   /// Manage the widget
-  virtual void manage (void);
+  virtual void manage ();
 
   /// Change the displayed time
   void set_time (CORBA::Float value);
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 7dd4d0ad804..8990d63b475 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -52,7 +52,7 @@ Client::Client (CORBA::ORB_ptr orb)
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
 }
 
@@ -130,7 +130,7 @@ Client::stop_callback (Widget /*widget*/,
 }
 
 void
-Client::start_hook (void)
+Client::start_hook ()
 {
   try
     {
@@ -145,7 +145,7 @@ Client::start_hook (void)
 }
 
 void
-Client::stop_hook (void)
+Client::stop_hook ()
 {
   try
     {
@@ -155,7 +155,6 @@ Client::stop_hook (void)
     {
       ex._tao_print_exception (
         "Caught an exception in the stop button callback");
-      return;
     }
 }
 
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index 5f7a480883e..b348655e7d8 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -7,19 +7,19 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
 }
 
 void
-Stopwatch_imp::start (void)
+Stopwatch_imp::start ()
 {
   this->timer_->start ();
 }
 
 void
-Stopwatch_imp::stop (void)
+Stopwatch_imp::stop ()
 {
   this->timer_->stop ();
 }
 
 void
-Stopwatch_imp::shutdown (void)
+Stopwatch_imp::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 9e720422d35..7621b3e4ecb 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -29,11 +29,11 @@ public:
   Stopwatch_imp (CORBA::ORB_ptr, Timer_imp *);
 
   // = The Simple_Server methods.
-  void start (void);
+  void start ();
 
-  void stop (void);
+  void stop ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index 06050a3169a..35b54df65f4 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -1,6 +1,5 @@
 #include "timer.h"
 
-
 Timer_imp::Timer_imp (XtAppContext &app,
                       CORBA::Long interval,
                       Stopwatch_display *stopwatch)
@@ -17,7 +16,7 @@ Timer_imp::~Timer_imp ()
 }
 
 void
-Timer_imp::start (void)
+Timer_imp::start ()
 {
   // Reset the elapsed time
   this->counter_ = 0;
@@ -33,11 +32,11 @@ Timer_imp::start (void)
   this->id_ = XtAppAddTimeOut (this->app_,
                                this->interval_,
                                &Timer_imp::tick_callback,
-                               (XtPointer) this );
+                               (XtPointer) this);
 }
 
 void
-Timer_imp::stop (void)
+Timer_imp::stop ()
 {
     // Remove the current timeout function, if any
   if (this->id_)
@@ -47,9 +46,9 @@ Timer_imp::stop (void)
 }
 
 CORBA::Float
-Timer_imp::elapsed_time(void)
+Timer_imp::elapsed_time()
 {
-    return ((CORBA::Float) counter_ * interval_ / 1000.0 );
+    return ((CORBA::Float) counter_ * interval_ / 1000.0);
 }
 
 void
@@ -61,9 +60,8 @@ Timer_imp::tick_callback (XtPointer client_data,
   obj->tick ();
 }
 
-
 void
-Timer_imp::tick (void)
+Timer_imp::tick ()
 {
   // Increment a counter for each tick
   counter_++;
@@ -83,5 +81,3 @@ Timer_imp::report_time (CORBA::Float time)
 {
   stopwatch_->set_time (time);
 }
-
-
diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h
index 48979fd954b..a9fd30dc470 100644
--- a/TAO/tests/Xt_Stopwatch/timer.h
+++ b/TAO/tests/Xt_Stopwatch/timer.h
@@ -20,7 +20,6 @@
 class Timer_imp
 {
  public:
-
   /// Constructor
   Timer_imp (XtAppContext &,
              CORBA::Long,
@@ -30,22 +29,21 @@ class Timer_imp
   virtual ~Timer_imp ();
 
   /// Resets, and starts the clock ticking
-  void start (void);
+  void start ();
 
   /// Stops the clock
-  void stop (void);
+  void stop ();
 
   /// Returns time since timer started
-  CORBA::Float  elapsed_time (void);
+  CORBA::Float  elapsed_time ();
 
  private:
-
   /// Static member function used for TimeOut callback.
   static void tick_callback (XtPointer,
                              XtIntervalId *);
 
   /// Called every interval_ milliseconds
-  void tick (void);
+  void tick ();
 
   /// Called at each clock tick...
   virtual void report_time (CORBA::Float);
diff --git a/TAO/tests/ZIOP/Hello.cpp b/TAO/tests/ZIOP/Hello.cpp
index 27e011bc7dd..40baa27e09f 100644
--- a/TAO/tests/ZIOP/Hello.cpp
+++ b/TAO/tests/ZIOP/Hello.cpp
@@ -44,7 +44,7 @@ Hello::big_request (const ::Test::Octet_Seq & octet_in)
 }
 
 void
-Hello::shutdown (void)
+Hello::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h
index e92bfe83d9f..1c53b73a4ad 100644
--- a/TAO/tests/ZIOP/Hello.h
+++ b/TAO/tests/ZIOP/Hello.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual char * get_string (const char * mystring);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
index 471d36cde19..b8dfc070d21 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
@@ -5,8 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
-Test_CompressorFactory::Test_CompressorFactory (void) :
+Test_CompressorFactory::Test_CompressorFactory () :
   ::TAO::CompressorFactory (COMPRESSORID_FOR_TESTING),
   compressor_ (::Compression::Compressor::_nil ())
 {
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h
index 61445b5e13a..78ced488b2e 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h
@@ -32,7 +32,7 @@ namespace TAO
       public ::TAO::CompressorFactory
     {
       public:
-        Test_CompressorFactory (void);
+        Test_CompressorFactory ();
 
         virtual ::Compression::Compressor_ptr get_compressor (
             ::Compression::CompressionLevel compression_level);
diff --git a/TAO/utils/NamingViewer/AddNameServerDlg.h b/TAO/utils/NamingViewer/AddNameServerDlg.h
index 56b86500e2d..0dcdc561196 100644
--- a/TAO/utils/NamingViewer/AddNameServerDlg.h
+++ b/TAO/utils/NamingViewer/AddNameServerDlg.h
@@ -33,7 +33,6 @@ public:
 
 // Implementation
 protected:
-
   // Generated message map functions
   //{{AFX_MSG(CAddNameServerDlg)
   virtual void OnOK();
diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h
index 27ce08764ee..384bb7a7be1 100644
--- a/TAO/utils/NamingViewer/BindDialog.h
+++ b/TAO/utils/NamingViewer/BindDialog.h
@@ -37,7 +37,6 @@ public:
 
 // Implementation
 protected:
-
   // Generated message map functions
   //{{AFX_MSG(CBindDialog)
   afx_msg void OnViewior();
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index 637823c89d0..0ca48484bb8 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -33,7 +33,6 @@ public:
 
 // Implementation
 protected:
-
   // Generated message map functions
   //{{AFX_MSG(CBindNewContext)
   virtual void OnOK();
diff --git a/TAO/utils/NamingViewer/NamingObject.cpp b/TAO/utils/NamingViewer/NamingObject.cpp
index b67dcb5e3ef..5de175f6684 100644
--- a/TAO/utils/NamingViewer/NamingObject.cpp
+++ b/TAO/utils/NamingViewer/NamingObject.cpp
@@ -21,24 +21,23 @@ CNamingObject::CNamingObject(CosNaming::Name &Name,
     m_Object (CORBA::Object::_duplicate (pObject)),
     m_Context (Context)
 {
-
 }
 
-CNamingObject::~CNamingObject (void)
+CNamingObject::~CNamingObject ()
 {
 }
 
-CosNaming::NamingContext_ptr CNamingObject::NamingContext (void)
+CosNaming::NamingContext_ptr CNamingObject::NamingContext ()
 {
   return CosNaming::NamingContext::_narrow (m_Object);
 }
 
-CORBA::Object_ptr CNamingObject::Object (void)
+CORBA::Object_ptr CNamingObject::Object ()
 {
   return m_Object;
 }
 
-CosNaming::Name& CNamingObject::Name (void)
+CosNaming::Name& CNamingObject::Name ()
 {
   return m_Name;
 }
diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h
index dec96a57aa2..e0a8d55f1d2 100644
--- a/TAO/utils/NamingViewer/NamingObject.h
+++ b/TAO/utils/NamingViewer/NamingObject.h
@@ -17,19 +17,19 @@ public:
   CNamingObject (CosNaming::Name& Name,
                  CORBA::Object_ptr pObject,
                  bool Context);
-  ~CNamingObject (void);
+  ~CNamingObject ();
 
-  CosNaming::NamingContext_ptr NamingContext (void);
+  CosNaming::NamingContext_ptr NamingContext ();
 
   // Returns a duplicated naming context ptr if this is a context or
   // nil if its not.
-  CORBA::Object_ptr Object (void);
+  CORBA::Object_ptr Object ();
 
   // returns a non duplicated object reference
-  CosNaming::Name& Name (void);
+  CosNaming::Name& Name ();
   // returns the name of the object
 
-  bool IsContext (void) { return m_Context; }
+  bool IsContext () { return m_Context; }
 
   // Returns true if this is a context
 private:
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index 2a7f2791148..9ffe80324ba 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -15,13 +15,13 @@ static char THIS_FILE[] = __FILE__;
 /////////////////////////////////////////////////////////////////////////////
 // CNamingTreeCtrl
 
-CNamingTreeCtrl::CNamingTreeCtrl (void)
+CNamingTreeCtrl::CNamingTreeCtrl ()
 {
   m_ContextPopup.LoadMenu (IDR_CONTEXT_POPUP);
   m_ObjectPopup.LoadMenu (IDR_OBJECT_POPUP);
 }
 
-CNamingTreeCtrl::~CNamingTreeCtrl (void)
+CNamingTreeCtrl::~CNamingTreeCtrl ()
 {
 }
 
@@ -125,7 +125,6 @@ void CNamingTreeCtrl::ClearChildren(HTREEITEM hItem)
     HTREEITEM hItem = GetRootItem();
     if(hItem)
     {
-
       //CORBA::Object_var Object = (CORBA::Object_ptr)GetItemData(hItem);
       ClearChildren(hItem);
       delete GetTreeObject(hItem);
@@ -351,7 +350,6 @@ void CNamingTreeCtrl::OnDestroy()
 
   // TODO: Add your message handler code here
   ClearChildren();
-
 }
 
 
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index ad8f422ae33..16ed157e9d1 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -70,7 +70,6 @@ CNamingViewerDlg::CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent /*=0*/)
   m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 
   m_pORB = pORB;
-
 }
 
 void CNamingViewerDlg::DoDataExchange(CDataExchange* pDX)
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp
index ab5f2cbc154..32d9378bc21 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.cpp
+++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp
@@ -78,7 +78,6 @@ void CSelectNSDialog::OnAdd()
   ACE_TCHAR* pIOR = new ACE_TCHAR[Value.length() + 1];
   ACE_OS::strcpy(pIOR, Value.c_str());
   m_Servers.SetItemData(pos, (DWORD)pIOR);
-
 }
 
 void CSelectNSDialog::OnRemove()
@@ -92,7 +91,7 @@ void CSelectNSDialog::OnRemove()
   delete (char*)m_Servers.GetItemData(index);
   CString Name;
   m_Servers.GetText(index, Name);
-  ACE_Configuration_Section_Key Section = m_pConfig->root_section();;
+  ACE_Configuration_Section_Key Section = m_pConfig->root_section();
   m_pConfig->remove_value(Section, Name);
   m_Servers.DeleteString(index);
 }
@@ -104,7 +103,7 @@ BOOL CSelectNSDialog::OnInitDialog()
   // TODO: Add extra initialization here
   HKEY hKey = ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, ACE_TEXT("Software\\TAO\\NamingViewer\\Servers"));
   m_pConfig = new ACE_Configuration_Win32Registry(hKey);
-  ACE_Configuration_Section_Key Section = m_pConfig->root_section();;
+  ACE_Configuration_Section_Key Section = m_pConfig->root_section();
   int index = 0;
   ACE_TString name;
   ACE_Configuration::VALUETYPE type;
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.h b/TAO/utils/NamingViewer/SelectNSDialog.h
index acee77ff4f2..815dab44505 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.h
+++ b/TAO/utils/NamingViewer/SelectNSDialog.h
@@ -34,7 +34,6 @@ public:
 
 // Implementation
 protected:
-
   // Generated message map functions
   //{{AFX_MSG(CSelectNSDialog)
   virtual void OnOK();
diff --git a/TAO/utils/NamingViewer/StdAfx.cpp b/TAO/utils/NamingViewer/StdAfx.cpp
index 51dc942d791..12270aa03b2 100644
--- a/TAO/utils/NamingViewer/StdAfx.cpp
+++ b/TAO/utils/NamingViewer/StdAfx.cpp
@@ -5,4 +5,3 @@
 #include "stdafx.h"
 
 
-
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.h b/TAO/utils/NamingViewer/ViewIORDialog.h
index a49de2b8724..b600a9703ff 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.h
+++ b/TAO/utils/NamingViewer/ViewIORDialog.h
@@ -33,7 +33,6 @@ public:
 
 // Implementation
 protected:
-
   // Generated message map functions
   //{{AFX_MSG(ViewIORDialog)
   virtual BOOL OnInitDialog();
diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp
index 917d965291b..c0489e7329d 100644
--- a/TAO/utils/catior/Catior_i.cpp
+++ b/TAO/utils/catior/Catior_i.cpp
@@ -90,7 +90,6 @@ Catior_i::decode (const ACE_CString& aString, ACE_CString& output)
 }
 
 
-
 CORBA::Boolean
 Catior_i::catiiop (char* string)
 {
@@ -727,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,
@@ -1100,7 +1098,7 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
                        "for char.\n"),
                       false);
 
-  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for char %u\n", c_ccslen);
+  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for char: %u\n", c_ccslen);
   buffer_ += buf;
 
   if (c_ccslen)
@@ -1131,7 +1129,7 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
                        "for wchar.\n"),
                       false);
 
-  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for wchar %u\n", w_ccslen);
+  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for wchar: %u\n", w_ccslen);
   buffer_ += buf;
 
   if (w_ccslen)
diff --git a/TAO/utils/catior/Catior_i.h b/TAO/utils/catior/Catior_i.h
index 60d7e2610eb..89192117b8a 100644
--- a/TAO/utils/catior/Catior_i.h
+++ b/TAO/utils/catior/Catior_i.h
@@ -89,7 +89,7 @@ private:
 
   CORBA::Boolean cat_nskfs_profile (TAO_InputCDR& stream);
 
-  void indent (void);
+  void indent ();
 
   size_t trace_depth_;
   ACE_CString buffer_;
diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp
index f0e763bd113..c4a4f483561 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.cpp
+++ b/TAO/utils/logWalker/GIOP_Buffer.cpp
@@ -101,12 +101,11 @@ struct ReplyHeader_1_0 { // Renamed from ReplyHeader
  */
 
 
-
 //static const size_t target_offset_12 = GIOP_Buffer::giop_header_len + 12;
 
 // 12 = req_id + flags + RESVD + addr disp.
 
-GIOP_Buffer::GIOP_Buffer(void)
+GIOP_Buffer::GIOP_Buffer()
   : cdr_ (0),
     preamble_(),
     log_offset_(0),
@@ -187,7 +186,7 @@ GIOP_Buffer::owner (Invocation *owner)
 }
 
 Invocation *
-GIOP_Buffer::owner (void)
+GIOP_Buffer::owner ()
 {
   return this->owner_;
 }
@@ -215,7 +214,7 @@ GIOP_Buffer::init_buf (const char *text, size_t offset)
   this->wr_pos_ = this->octets_;
 }
 
-GIOP_Buffer::~GIOP_Buffer(void)
+GIOP_Buffer::~GIOP_Buffer()
 {
   delete [] this->octets_;
 }
@@ -311,7 +310,7 @@ GIOP_Buffer::num_contexts () const
 }
 
 bool
-GIOP_Buffer::is_oneway (void)
+GIOP_Buffer::is_oneway ()
 {
   if (this->octets_ == 0)
     {
@@ -331,7 +330,7 @@ GIOP_Buffer::log_posn () const
 }
 
 Thread *
-GIOP_Buffer::thread (void)
+GIOP_Buffer::thread ()
 {
   return this->thr_;
 }
@@ -361,7 +360,7 @@ GIOP_Buffer::expected_size () const
 }
 
 size_t
-GIOP_Buffer::msg_size (void)
+GIOP_Buffer::msg_size ()
 {
   if (this->cur_size() < 12)
     return 0;
@@ -377,7 +376,7 @@ GIOP_Buffer::expected_req_id () const
 }
 
 size_t
-GIOP_Buffer::actual_req_id (void)
+GIOP_Buffer::actual_req_id ()
 {
   if (this->octets_ == 0)
     return 0;
@@ -395,7 +394,7 @@ GIOP_Buffer::cur_size () const
 }
 
 bool
-GIOP_Buffer::parse_svc_contexts (void)
+GIOP_Buffer::parse_svc_contexts ()
 {
   ACE_CDR::ULong temp;
   ACE_CDR::ULong num_svc_cont;
@@ -422,7 +421,7 @@ GIOP_Buffer::parse_svc_contexts (void)
 }
 
 bool
-GIOP_Buffer::parse_header (void)
+GIOP_Buffer::parse_header ()
 {
   if (this->octets_ == 0 || this->cur_size() < 12)
     {
@@ -482,7 +481,6 @@ GIOP_Buffer::parse_header (void)
     this->oid_ = this->cdr_->rd_ptr();
     if (!this->cdr_->skip_bytes(len_ulong))
       {
-
         return false;
       }
     if (!(*this->cdr_ >> len_ulong))
@@ -534,7 +532,7 @@ GIOP_Buffer::target_oid (size_t &len)
 }
 
 const char *
-GIOP_Buffer::operation (void)
+GIOP_Buffer::operation ()
 {
   if (octets_ == 0)
     return 0;
@@ -546,7 +544,7 @@ GIOP_Buffer::operation (void)
 }
 
 ACE_InputCDR &
-GIOP_Buffer::payload (void)
+GIOP_Buffer::payload ()
 {
   if (octets_ != 0 && !this->header_parsed_)
     this->header_parsed_ = this->parse_header();
@@ -560,7 +558,7 @@ GIOP_Buffer::has_octets () const
 }
 
 bool
-GIOP_Buffer::validate (void)
+GIOP_Buffer::validate ()
 {
   return
     this->expected_req_id_ == this->actual_req_id() &&
@@ -585,7 +583,7 @@ GIOP_Buffer::matches (GIOP_Buffer *other) const
 }
 
 void
-GIOP_Buffer::reset (void)
+GIOP_Buffer::reset ()
 {
   this->octets_ = 0;
   this->wr_pos_ = 0;
diff --git a/TAO/utils/logWalker/GIOP_Buffer.h b/TAO/utils/logWalker/GIOP_Buffer.h
index ed1549e86ef..c3331b91771 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.h
+++ b/TAO/utils/logWalker/GIOP_Buffer.h
@@ -31,7 +31,6 @@ class Thread;
 class GIOP_Buffer
 {
 public:
-
   static const char *size_leadin;
   static size_t leadin_len;
   static const size_t giop_header_len;
@@ -41,11 +40,11 @@ public:
                size_t offset,
                Thread *thread,
                Invocation *owner = 0);
-  GIOP_Buffer (void);
-  ~GIOP_Buffer (void);
+  GIOP_Buffer ();
+  ~GIOP_Buffer ();
 
   void owner (Invocation *);
-  Invocation *owner (void);
+  Invocation *owner ();
 
   void init_buf (const char *text, size_t offset);
   int add_octets(const char *text, size_t offset);
@@ -55,38 +54,38 @@ public:
   char minor_version () const;
   size_t reply_status () const;
   size_t num_contexts () const;
-  bool is_oneway (void);
+  bool is_oneway ();
   bool is_full () const;
   size_t log_posn () const;
-  Thread *thread (void);
+  Thread *thread ();
 
   const ACE_Time_Value & time () const;
   void time (const ACE_Time_Value &);
 
   const ACE_CString &preamble() const;
   size_t expected_req_id() const;
-  size_t actual_req_id(void);
+  size_t actual_req_id();
 
   size_t expected_size () const;
   size_t buf_size () const;
   size_t cur_size() const;
-  size_t msg_size (void);
+  size_t msg_size ();
 
   const char * target_oid (size_t &len);
-  const char * operation (void);
-  ACE_InputCDR &payload (void);
+  const char * operation ();
+  ACE_InputCDR &payload ();
 
   bool has_octets () const;
-  bool validate (void);
+  bool validate ();
   bool matches (GIOP_Buffer *other) const;
 
-  void reset (void);
+  void reset ();
   void transfer_from (GIOP_Buffer *other);
   void swap (GIOP_Buffer *other);
 
 private:
-  bool parse_svc_contexts (void);
-  bool parse_header (void);
+  bool parse_svc_contexts ();
+  bool parse_header ();
 
   ACE_InputCDR *cdr_;
   ACE_CString preamble_;
diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp
index dea98ef4939..c93aba3c71e 100644
--- a/TAO/utils/logWalker/HostProcess.cpp
+++ b/TAO/utils/logWalker/HostProcess.cpp
@@ -19,7 +19,7 @@ HostProcess::HostProcess (const ACE_CString &src, long pid)
 {
 }
 
-HostProcess::~HostProcess (void)
+HostProcess::~HostProcess ()
 {
   for (AddrList::ITERATOR i(this->listen_endpoints_);
        !i.done();
@@ -114,7 +114,6 @@ HostProcess::find_thread_for_handle (long h)
 PeerProcess *
 HostProcess::find_peer (const ACE_CString &addr)
 {
-
   PeerProcess *pp = 0;
   Endpoint ep (addr.c_str());
   (void)this->by_addr_.find(ep,pp);
diff --git a/TAO/utils/logWalker/HostProcess.h b/TAO/utils/logWalker/HostProcess.h
index 2d00b7c8ea4..d3898ea3279 100644
--- a/TAO/utils/logWalker/HostProcess.h
+++ b/TAO/utils/logWalker/HostProcess.h
@@ -45,7 +45,7 @@ class HostProcess
 {
 public:
   HostProcess (const ACE_CString &src, long pid);
-  ~HostProcess (void);
+  ~HostProcess ();
 
   // set/get the name of the process. This is only provided by
   // an alias supplied to the logWalker command line or manifest file.
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index f62e1545889..7ab85a713a2 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -25,7 +25,7 @@ Invocation::Invocation (PeerProcess *peer, Thread *thr, size_t rid)
 {
 }
 
-Invocation::~Invocation (void)
+Invocation::~Invocation ()
 {
   delete this->req_octets_;
   delete this->repl_octets_;
@@ -80,7 +80,7 @@ Invocation::set_target (const char *oid, size_t oid_len)
 }
 
 bool
-Invocation::message_complete (void)
+Invocation::message_complete ()
 {
   if (this->is_oneway())
     {
@@ -187,13 +187,13 @@ Invocation::contains (size_t line)
 }
 
 size_t
-Invocation::req_line (void)
+Invocation::req_line ()
 {
   return this->req_octets_ == 0 ? 0 : this->req_octets_->log_posn();
 }
 
 size_t
-Invocation::repl_line (void)
+Invocation::repl_line ()
 {
   return this->repl_octets_ == 0 ? 0 : this->repl_octets_->log_posn();
 }
diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h
index 787a68c0832..bfbe77234ed 100644
--- a/TAO/utils/logWalker/Invocation.h
+++ b/TAO/utils/logWalker/Invocation.h
@@ -45,7 +45,7 @@ public:
   // initialize a new instance, with the initial request text line and offeset
   Invocation (PeerProcess *peer, Thread *thr, size_t req_id = 0);
   bool init ( const char * text, size_t offset, Thread *thr);
-  ~Invocation (void);
+  ~Invocation ();
 
   // return true if the invocation was a oneway
   bool is_oneway() const;
@@ -54,7 +54,7 @@ public:
   // if it also has all its reply octets. The side-effect of this call
   // is to obtain the target reference from the request buffer and associate
   // it with the peer process.
-  bool message_complete (void);
+  bool message_complete ();
 
   size_t request_id () const;
 
@@ -74,8 +74,8 @@ public:
   GIOP_Buffer *give_octets (bool request);
 
   bool contains (size_t line);
-  size_t req_line (void);
-  size_t repl_line (void);
+  size_t req_line ();
+  size_t repl_line ();
 
   void add_notify_incident (const ACE_CString &text, size_t offset);
   Thread *waiter () const;
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 5a602702aa9..240dda83ee4 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -22,7 +22,7 @@ Log::Log (Session &session)
 {
 }
 
-Log::~Log (void)
+Log::~Log ()
 {
 }
 
@@ -151,7 +151,7 @@ Log::get_preamble ()
             if (this->procs_.get(first) == 0)
               first->proc_name(a2);
           }
-          //fallthru
+          ACE_FALLTHROUGH;
         default:
           {
             char ext[10];
@@ -213,7 +213,7 @@ Log::handle_msg_octets ()
 }
 
 void
-Log::parse_HEXDUMP_i (void)
+Log::parse_HEXDUMP_i ()
 {
   char *pos = ACE_OS::strstr (this->line_,"HEXDUMP");
   pos += 8;
@@ -232,7 +232,7 @@ Log::parse_HEXDUMP_i (void)
 }
 
 void
-Log::parse_dump_giop_msg_i (void)
+Log::parse_dump_giop_msg_i ()
 {
   int sending = ACE_OS::strstr (this->info_,"send") != 0 ? 0 : 1;
   int type =  ACE_OS::strstr (this->info_,"Request") != 0 ? 0 : 1;
@@ -342,7 +342,7 @@ Log::parse_dump_giop_msg_i (void)
 }
 
 void
-Log::parse_open_listener_i (void)
+Log::parse_open_listener_i ()
 {
   char *addr = ACE_OS::strchr(this->info_,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
@@ -352,7 +352,7 @@ Log::parse_open_listener_i (void)
 }
 
 void
-Log::parse_got_existing_i (void)
+Log::parse_got_existing_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -370,7 +370,7 @@ Log::parse_got_existing_i (void)
 }
 
 void
-Log::parse_muxed_tms_i (void)
+Log::parse_muxed_tms_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -395,7 +395,7 @@ Log::parse_muxed_tms_i (void)
 }
 
 void
-Log::parse_exclusive_tms_i (void)
+Log::parse_exclusive_tms_i ()
 {
   long handle = this->thr_->active_handle();
   PeerProcess *pp = this->hostproc_->find_peer(handle);
@@ -418,7 +418,7 @@ Log::parse_exclusive_tms_i (void)
 }
 
 void
-Log::parse_process_parsed_msgs_i (void)
+Log::parse_process_parsed_msgs_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_, '[');
   long handle = ACE_OS::strtol(hpos+1, 0, 10);
@@ -442,7 +442,7 @@ Log::parse_process_parsed_msgs_i (void)
 }
 
 void
-Log::parse_wait_for_event_i (void)
+Log::parse_wait_for_event_i ()
 {
 //   char *pos = ACE_OS::strchr (this->info_,'[');
 //   long rid = ACE_OS::strtol(pos+1, 0, 10);
@@ -460,14 +460,14 @@ Log::parse_wait_for_event_i (void)
 }
 
 void
-Log::parse_wait_on_read_i (void)
+Log::parse_wait_on_read_i ()
 {
   PeerProcess *pp = this->thr_->incoming();
   this->thr_->exit_wait (pp, this->offset_);
 }
 
 void
-Log::parse_make_idle_i (void)
+Log::parse_make_idle_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -484,7 +484,7 @@ Log::parse_make_idle_i (void)
 }
 
 void
-Log::parse_cleanup_queue_i (void)
+Log::parse_cleanup_queue_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -555,7 +555,7 @@ Log::parse_cleanup_queue_i (void)
 }
 
 void
-Log::parse_complete_connection_i (void)
+Log::parse_complete_connection_i ()
 {
   if (ACE_OS::strstr (this->info_, "failed") == 0)
     return;
@@ -586,7 +586,7 @@ Log::parse_complete_connection_i (void)
 }
 
 void
-Log::parse_close_connection_i (void)
+Log::parse_close_connection_i ()
 {
   char *hpos = ACE_OS::strchr(this->info_,'[');
   long handle = ACE_OS::strtol(hpos+1,0,10);
@@ -713,7 +713,7 @@ Log::parse_handler_open_i (bool is_ssl)
 }
 
 void
-Log::parse_begin_connection_i (void)
+Log::parse_begin_connection_i ()
 {
   char *addr = ACE_OS::strchr(this->info_,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
@@ -731,16 +731,15 @@ Log::parse_begin_connection_i (void)
 }
 
 void
-Log::parse_connection_handler_ctor_i (void)
+Log::parse_connection_handler_ctor_i ()
 {
   // char *c = ACE_OS::strchr (this->info_, '[') + 1;
   // size_t handle = ACE_OS::strtol (c, 0, 10);
   // ACE_DEBUG ((LM_DEBUG,"%d: constructed new handler for %d\n", offset_, handle));
-
 }
 
 void
-Log::parse_local_addr_i (void)
+Log::parse_local_addr_i ()
 {
   char *addr = ACE_OS::strchr(this->info_,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
@@ -770,7 +769,7 @@ Log::parse_local_addr_i (void)
 }
 
 void
-Log::parse_connection_not_complete_i (void)
+Log::parse_connection_not_complete_i ()
 {
   PeerProcess *pp = this->thr_->pop_new_connection ();
   if (pp != 0)
@@ -783,7 +782,7 @@ Log::parse_connection_not_complete_i (void)
 }
 
 void
-Log::parse_open_as_server_i (void)
+Log::parse_open_as_server_i ()
 {
   // ACE_DEBUG ((LM_DEBUG,"%d: open_as_server: adding peer process\n", offset_));
 
@@ -791,7 +790,7 @@ Log::parse_open_as_server_i (void)
 }
 
 void
-Log::parse_iiop_connection_handler_ctor_i (void)
+Log::parse_iiop_connection_handler_ctor_i ()
 {
   PeerProcess *pp = this->thr_->peek_new_connection();
   if (pp == 0)
@@ -808,7 +807,7 @@ Log::parse_iiop_connection_handler_ctor_i (void)
 }
 
 void
-Log::parse_wait_for_connection_i (void)
+Log::parse_wait_for_connection_i ()
 {
   //  ACE_ERROR ((LM_ERROR,"%d: wait_for_connection, line = %s\n", this->offset_, this->info_));
   if (ACE_OS::strstr (this->info_,"Connection not complete") == 0)
@@ -873,13 +872,13 @@ Log::parse_wait_for_connection_i (void)
 }
 
 void
-Log::parse_post_open_i (void)
+Log::parse_post_open_i ()
 {
   //  ACE_ERROR ((LM_ERROR,"%d: post_open, line = %s\n", this->offset_, this->line_));
 }
 
 void
-Log::parse_notify_poa_helper_i (void)
+Log::parse_notify_poa_helper_i ()
 {
   Invocation *inv = this->thr_->current_invocation ();
   if (inv == 0)
@@ -903,7 +902,7 @@ Log::parse_notify_poa_helper_i (void)
 }
 
 void
-Log::parse_notify_object_i (void)
+Log::parse_notify_object_i ()
 {
   Invocation *inv = this->thr_->current_invocation ();
   if (inv == 0)
@@ -977,7 +976,7 @@ Log::parse_notify_object_i (void)
 }
 
 void
-Log::get_timestamp (void)
+Log::get_timestamp ()
 {
   const char *time_tok = ACE_OS::strchr (this->line_,'@');
   size_t len = (size_t)(time_tok - this->line_);
@@ -1010,7 +1009,7 @@ Log::get_timestamp (void)
 }
 
 void
-Log::parse_line (void)
+Log::parse_line ()
 {
   if (this->dump_target_ != 0)
     {
diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h
index 813895c9df5..781ca90e485 100644
--- a/TAO/utils/logWalker/Log.h
+++ b/TAO/utils/logWalker/Log.h
@@ -37,43 +37,42 @@ class Log
 public:
   Log (Session &s);
 
-  virtual ~Log(void);
+  virtual ~Log();
 
   bool process_file (const ACE_TCHAR *filename, const char *alias = "");
 
 protected:
+  virtual void parse_line ();
 
-  virtual void parse_line (void);
-
-  void get_preamble (void);
-  void get_timestamp (void);
-  void handle_msg_octets (void);
-  bool match_target(void);
+  void get_preamble ();
+  void get_timestamp ();
+  void handle_msg_octets ();
+  bool match_target();
 
   void parse_handler_open_i (bool is_ssl);
-  void parse_connection_handler_ctor_i (void);
-  void parse_dump_giop_msg_i (void);
-  void parse_HEXDUMP_i (void);
-  void parse_open_listener_i (void);
-  void parse_got_existing_i (void);
-  void parse_muxed_tms_i (void);
-  void parse_exclusive_tms_i (void);
-  void parse_process_parsed_msgs_i (void);
-  void parse_wait_for_event_i (void);
-  void parse_wait_on_read_i (void);
-  void parse_make_idle_i (void);
-  void parse_cleanup_queue_i (void);
-  void parse_complete_connection_i (void);
-  void parse_close_connection_i (void);
-  void parse_begin_connection_i (void);
-  void parse_local_addr_i (void);
-  void parse_connection_not_complete_i (void);
-  void parse_open_as_server_i (void);
-  void parse_iiop_connection_handler_ctor_i (void);
-  void parse_wait_for_connection_i (void);
-  void parse_post_open_i (void);
-  void parse_notify_poa_helper_i (void);
-  void parse_notify_object_i (void);
+  void parse_connection_handler_ctor_i ();
+  void parse_dump_giop_msg_i ();
+  void parse_HEXDUMP_i ();
+  void parse_open_listener_i ();
+  void parse_got_existing_i ();
+  void parse_muxed_tms_i ();
+  void parse_exclusive_tms_i ();
+  void parse_process_parsed_msgs_i ();
+  void parse_wait_for_event_i ();
+  void parse_wait_on_read_i ();
+  void parse_make_idle_i ();
+  void parse_cleanup_queue_i ();
+  void parse_complete_connection_i ();
+  void parse_close_connection_i ();
+  void parse_begin_connection_i ();
+  void parse_local_addr_i ();
+  void parse_connection_not_complete_i ();
+  void parse_open_as_server_i ();
+  void parse_iiop_connection_handler_ctor_i ();
+  void parse_wait_for_connection_i ();
+  void parse_post_open_i ();
+  void parse_notify_poa_helper_i ();
+  void parse_notify_object_i ();
 
   ACE_CString origin_;
   ACE_CString alias_;
diff --git a/TAO/utils/logWalker/PeerObject.cpp b/TAO/utils/logWalker/PeerObject.cpp
index 3d15be1db38..3e7d4d4986b 100644
--- a/TAO/utils/logWalker/PeerObject.cpp
+++ b/TAO/utils/logWalker/PeerObject.cpp
@@ -9,18 +9,18 @@ PeerObject::PeerObject (long id, const char *name, PeerProcess *)
 {
 }
 
-PeerObject::~PeerObject (void)
+PeerObject::~PeerObject ()
 {
 }
 
 ACE_CString &
-PeerObject::name (void)
+PeerObject::name ()
 {
   return this->name_;
 }
 
 long
-PeerObject::ident (void)
+PeerObject::ident ()
 {
   return this->ident_;
 }
@@ -31,7 +31,7 @@ PeerObject::add_invocation (Invocation *inv)
   this->invocations_.enqueue_tail (inv);
 }
 size_t
-PeerObject::num_invocations (void)
+PeerObject::num_invocations ()
 {
   return this->invocations_.size();
 }
@@ -44,5 +44,4 @@ PeerObject::dump_detail (ostream &strm)
         << s << " invocation"
         << (s > 1 ? "s" : "")
         << endl;
-
 }
diff --git a/TAO/utils/logWalker/PeerObject.h b/TAO/utils/logWalker/PeerObject.h
index 1567861d9f3..20e01859153 100644
--- a/TAO/utils/logWalker/PeerObject.h
+++ b/TAO/utils/logWalker/PeerObject.h
@@ -19,13 +19,13 @@ class PeerObject
 {
 public:
   PeerObject (long ident, const char *name, PeerProcess * );
-  virtual ~PeerObject (void);
+  virtual ~PeerObject ();
 
   void add_invocation (Invocation *inv);
   void dump_detail (ostream &strm);
-  size_t num_invocations (void);
-  long ident (void);
-  ACE_CString &name (void);
+  size_t num_invocations ();
+  long ident ();
+  ACE_CString &name ();
 
 private:
   long ident_;
diff --git a/TAO/utils/logWalker/PeerProcess.cpp b/TAO/utils/logWalker/PeerProcess.cpp
index bb312fa3fc1..2572fbba6dd 100644
--- a/TAO/utils/logWalker/PeerProcess.cpp
+++ b/TAO/utils/logWalker/PeerProcess.cpp
@@ -8,7 +8,7 @@
 #include "Thread.h"
 #include "Session.h"
 
-Endpoint::Endpoint (void)
+Endpoint::Endpoint ()
   : addr_ (),
     host_ (),
     port_ (),
@@ -132,7 +132,7 @@ PeerProcess::PeerProcess (size_t offset, const ACE_CString &time, bool is_server
   this->ident_ = PeerProcess::nextIdent(is_server);
 }
 
-PeerProcess::~PeerProcess (void)
+PeerProcess::~PeerProcess ()
 {
   delete [] ident_;
   while (this->invocations_.size())
@@ -199,7 +199,7 @@ PeerProcess::add_transport (Transport *t)
 }
 
 Transport *
-PeerProcess::last_transport (void)
+PeerProcess::last_transport ()
 {
   return this->last_transport_;
 }
@@ -330,7 +330,7 @@ PeerProcess::set_owner (HostProcess *hp)
 }
 
 HostProcess *
-PeerProcess::owner (void)
+PeerProcess::owner ()
 {
   return this->owner_;
 }
diff --git a/TAO/utils/logWalker/PeerProcess.h b/TAO/utils/logWalker/PeerProcess.h
index f4c062c885b..c37995dbe85 100644
--- a/TAO/utils/logWalker/PeerProcess.h
+++ b/TAO/utils/logWalker/PeerProcess.h
@@ -28,7 +28,7 @@ enum EndpointRole {
 class Endpoint
 {
 public:
-  Endpoint (void);
+  Endpoint ();
   Endpoint (const Endpoint &other);
   Endpoint (const char *addr, EndpointRole role = ER_UNKNOWN);
   void assign (const char *addr, EndpointRole role = ER_UNKNOWN);
@@ -70,13 +70,13 @@ public:
   static char *nextIdent(bool is_server);
   PeerProcess (size_t offset, const ACE_CString &time, bool is_server);
 
-  virtual ~PeerProcess (void);
+  virtual ~PeerProcess ();
 
   const char * id () const;
   void split_filename (char *buffer, size_t len) const;
 
   void set_owner (HostProcess *host);
-  HostProcess *owner (void);
+  HostProcess *owner ();
 
   void match_hosts (Session *session);
   void set_server_addr (const ACE_CString &addr);
@@ -87,7 +87,7 @@ public:
   size_t offset () const;
   void ssl (bool is_ssl);
   void add_transport (Transport *t);
-  Transport *last_transport (void);
+  Transport *last_transport ();
   Transport *find_transport (long handle);
 
   bool match_local (const char *addr) const;
diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp
index a23ed050981..62d0e24da56 100644
--- a/TAO/utils/logWalker/Session.cpp
+++ b/TAO/utils/logWalker/Session.cpp
@@ -13,7 +13,7 @@ AltAddresses
 Session::alt_addrs_;
 
 
-Session::Session (void)
+Session::Session ()
   : split_details_ (false)
 {
   ACE_CString n ("localhost");
@@ -21,7 +21,7 @@ Session::Session (void)
   this->alt_addrs_.bind (n,v);
 }
 
-Session::~Session (void)
+Session::~Session ()
 {
   for (Processes::iterator i = processes_.begin();
        i != processes_.end();
@@ -52,7 +52,7 @@ Session::set_tao_version (ACE_TCHAR *str)
 }
 
 long
-Session::tao_version (void)
+Session::tao_version ()
 {
   return tao_version_;
 }
@@ -167,13 +167,13 @@ Session::outfile (const char *o)
 }
 
 bool
-Session::has_dir (void)
+Session::has_dir ()
 {
   return this->base_dir_.length() > 0;
 }
 
 bool
-Session::has_outfile (void)
+Session::has_outfile ()
 {
   return this->outfile_.length() > 0;
 }
@@ -341,7 +341,7 @@ Session::dump ()
 // iterate over the collection of host processes to associate peer
 // processes via endpoints.
 void
-Session::reconcile (void)
+Session::reconcile ()
 {
   for (Processes::ITERATOR i (this->processes_); !i.done(); i.advance())
     {
diff --git a/TAO/utils/logWalker/Session.h b/TAO/utils/logWalker/Session.h
index 95f02dc6993..c34f2c286bb 100644
--- a/TAO/utils/logWalker/Session.h
+++ b/TAO/utils/logWalker/Session.h
@@ -24,15 +24,15 @@ class Session
 public:
   Session ();
 
-  ~Session (void);
+  ~Session ();
 
   void add_process (HostProcess *proc);
   HostProcess *find_process (long pid);
   HostProcess *find_host (const Endpoint &endpoint, bool server);
-  void reconcile (void);
+  void reconcile ();
 
   static bool set_tao_version (ACE_TCHAR *str);
-  static long tao_version (void);
+  static long tao_version ();
   static void alternate_address (const char *string);
   static bool is_equivalent (const ACE_CString &primary,
                              const ACE_CString &alternate);
@@ -41,8 +41,8 @@ public:
   void make_dir (const char * ,bool );
   void outfile (const char * );
 
-  bool has_dir (void);
-  bool has_outfile (void);
+  bool has_dir ();
+  bool has_outfile ();
 
   void dump ();
   ostream * stream_for (ostream *old,
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index d7e1bc9fa5a..75708efce0e 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -44,7 +44,7 @@ Thread::push_new_connection (PeerProcess *pp)
 }
 
 PeerProcess *
-Thread::pop_new_connection (void)
+Thread::pop_new_connection ()
 {
   PeerProcess *pp = 0;
   this->new_connection_.pop (pp);
@@ -72,7 +72,7 @@ Thread::pending_local_addr () const
 }
 
 void
-Thread::handle_request (void)
+Thread::handle_request ()
 {
   this->server_encounters_++;
   if (this->pending_.size() > 1)
@@ -141,7 +141,6 @@ Thread::split_filename (char *buff, size_t len) const
   *c = '_';
   c = strchr (c, ']');
   strcpy (c, ".txt");
-
 }
 
 void
@@ -179,19 +178,19 @@ Thread::set_dup (Thread *other, bool set_other)
 }
 
 void
-Thread::clear_dup (void)
+Thread::clear_dup ()
 {
   this->target_dup_ = 0;
 }
 
 bool
-Thread::has_dup (void)
+Thread::has_dup ()
 {
   return this->target_dup_ != 0;
 }
 
 void
-Thread::swap_target (void)
+Thread::swap_target ()
 {
   if (target_dup_ != 0 && target_dup_->giop_target() != 0)
     {
@@ -209,7 +208,7 @@ Thread::swap_target (void)
 }
 
 GIOP_Buffer *
-Thread::giop_target (void)
+Thread::giop_target ()
 {
   return this->giop_target_;
 }
@@ -238,7 +237,7 @@ Thread::push_invocation (Invocation *inv)
 }
 
 void
-Thread::pop_invocation (void)
+Thread::pop_invocation ()
 {
   Invocation *inv;
   this->current_invocation_.pop (inv);
@@ -281,7 +280,6 @@ Thread::get_summary (long &sent_reqs,
                      size_t &sent_size,
                      size_t &recv_size)
 {
-
   for (ACE_DLList_Iterator <Invocation> i(this->invocations_);
        !i.done();
        i.advance())
@@ -383,7 +381,7 @@ Thread::dump_incidents (ostream &strm, const ACE_Time_Value& relstart)
 }
 
 size_t
-Thread::count_nesting (void)
+Thread::count_nesting ()
 {
   std::stack<Invocation *> nested;
   for (ACE_DLList_Iterator <Invocation> i (this->invocations_);
diff --git a/TAO/utils/logWalker/Thread.h b/TAO/utils/logWalker/Thread.h
index 25b583e1883..1a4e196a4cd 100644
--- a/TAO/utils/logWalker/Thread.h
+++ b/TAO/utils/logWalker/Thread.h
@@ -31,14 +31,14 @@ public:
   void incoming_from (PeerProcess *);
   void add_invocation (Invocation *);
   void push_invocation (Invocation *);
-  void pop_invocation (void);
+  void pop_invocation ();
   Invocation *current_invocation () const;
 
   PeerProcess *incoming () const;
-  void handle_request (void);
+  void handle_request ();
   void enter_wait (PeerProcess *);
   void exit_wait (PeerProcess *, size_t linenum);
-  GIOP_Buffer *giop_target (void);
+  GIOP_Buffer *giop_target ();
   void set_giop_target (GIOP_Buffer *buffer);
   void dump_summary (ostream &strm);
   void dump_invocations (ostream &strm);
@@ -47,7 +47,7 @@ public:
   void get_summary (long &sent_reqs, long &recv_reqs, size_t &sent_size, size_t &recv_size);
 
   void push_new_connection (PeerProcess *pp);
-  PeerProcess *pop_new_connection (void);
+  PeerProcess *pop_new_connection ();
   PeerProcess *peek_new_connection () const;
 
   void pending_local_addr (const ACE_CString &addr);
@@ -55,11 +55,11 @@ public:
   void active_handle (long handle);
   long active_handle () const;
   void set_dup (Thread *other, bool set_other);
-  void clear_dup (void);
-  void swap_target (void);
-  bool has_dup (void);
+  void clear_dup ();
+  void swap_target ();
+  bool has_dup ();
 
-  size_t count_nesting (void);
+  size_t count_nesting ();
 
 private:
   long id_;
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index 79f614b8dbc..7079d83c108 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -113,7 +113,7 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
 }
 
 void
-print_help (void)
+print_help ()
 {
   ACE_DEBUG ((LM_DEBUG, "tao_logWalker recongizes the following arguments\n"));
   ACE_DEBUG ((LM_DEBUG, "-o <filename> - write all output to specified file\n"));
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index ff1e56eb987..c50fed5c1b6 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -67,7 +67,6 @@ show_help(int argc, ACE_TCHAR *argv[])
 class  NSGROUP
 {
 public:
-
   enum NSGROUP_COMMAND {
     NSGROUP_NONE,
     NSGROUP_HELP,
@@ -87,13 +86,13 @@ public:
   NSGROUP (int argc, ACE_TCHAR **argv);
 
   /// start the ORB.
-  int start_orb (void);
+  int start_orb ();
 
   /// parse command line, validate arguments and run the command
-  int run_cmd (void);
+  int run_cmd ();
 
   /// Display command line interface usage
-  int show_usage( void );
+  int show_usage();
 
   const ACE_TCHAR * group_arg() const { return group_arg_; }
   const ACE_TCHAR * policy_arg() const { return policy_arg_; }
@@ -102,12 +101,10 @@ public:
   const ACE_TCHAR * namepath_arg() const { return namepath_arg_; }
 
 private:
-
   /// parse command line arguments
-  NSGROUP_COMMAND parse_command_line (void);
+  NSGROUP_COMMAND parse_command_line ();
 
 private:
-
   NS_group_svc svc_;
 
   int argc_;
@@ -138,14 +135,13 @@ private:
 }
 
 int
-NSGROUP::start_orb (void)
+NSGROUP::start_orb ()
 {
   const int RC_SUCCESS =  0;
   const int RC_ERROR   = -1;
 
   try
   {
-
 #if 0
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("start_orb::argc(%u)\n"), this->argc_));
     for( int i = 0; i < this->argc_; ++i){
@@ -162,7 +158,6 @@ NSGROUP::start_orb (void)
 
     if (RC_SUCCESS != svc_.set_orb (orb_.in ()))
     {
-
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT (" (%P|%t) Unable to initialize the ORB.\n")),
                           RC_ERROR);
@@ -212,11 +207,10 @@ NSGROUP::start_orb (void)
   }
 
   return RC_SUCCESS;
-
 }
 
 int
-NSGROUP::run_cmd(void)
+NSGROUP::run_cmd()
 {
   const int RC_ERROR   = -1;
   const int RC_BADARG  = -2;
@@ -225,7 +219,6 @@ NSGROUP::run_cmd(void)
 
   switch( parse_command_line () )
   {
-
     case NSGROUP_HELP:
       return show_usage ();
     break;
@@ -285,7 +278,7 @@ NSGROUP::run_cmd(void)
 }
 
 NSGROUP::NSGROUP_COMMAND
-NSGROUP::parse_command_line (void)
+NSGROUP::parse_command_line ()
 {
   #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -387,7 +380,6 @@ NSGROUP::parse_command_line (void)
   int non_option_arg_count = 0;
   for( int i = get_opts.opt_ind (); i < this->argc_; ++i)
   {
-
     non_option_arg_count++;
 
 
@@ -437,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 )
@@ -460,7 +451,7 @@ NSGROUP::parse_command_line (void)
 
 
 int
-NSGROUP::show_usage ( void )
+NSGROUP::show_usage ()
 {
   const int RC_SUCCESS =  0;
 
@@ -494,7 +485,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
     {
-
       NSGROUP ns_group (argc, argv);
 
       if ( show_help (argc, argv) )
diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.cpp b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
index 303d835bb76..6baafd53a19 100644
--- a/TAO/utils/wxNamingViewer/wxBindDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
@@ -12,7 +12,6 @@
 
 namespace  // anonymous
 {
-
 void create_dialog_components(wxDialog* dialog)
 {
   wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
@@ -62,7 +61,6 @@ void create_dialog_components(wxDialog* dialog)
   topsizer->SetSizeHints( dialog);
 }
 
-
 };  // anonymous
 
 
@@ -101,11 +99,8 @@ WxBindDialog::WxBindDialog(
   create_dialog_components( this);
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   if (isContext) {
-
     SetTitle( "Bind Context");
-
   } else {
-
     SetTitle( "Bind Object");
   }
   wxButton* ctrl = static_cast<wxButton*>( wxFindWindowByName(
@@ -148,14 +143,10 @@ bool WxBindDialog::TransferDataFromWindow()
   name[0].id = CORBA::string_dup( id);
   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/wxBindNewContext.cpp b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp
index 42310af30c4..3bbe855380e 100644
--- a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp
+++ b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp
@@ -83,7 +83,6 @@ namespace  // anonymous
     dialog->SetSizer( topsizer);
     topsizer->SetSizeHints( dialog);
   }
-
 }; // anonymous
 
 WxBindNewContext::WxBindNewContext( wxWindow* parent)
diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp
index e900f66dc37..4037b8a84fa 100644
--- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp
@@ -79,14 +79,12 @@ WxNamingTree::~WxNamingTree()
   clearChildren();
 }
 
-void WxNamingTree::clearChildren( void)
+void WxNamingTree::clearChildren()
 {
   wxTreeItemId item = GetRootItem();
   if (item) {
-
     clearChildren( item);
     Delete( item);
-
   }
 }
 
@@ -95,11 +93,9 @@ void WxNamingTree::clearChildren( wxTreeItemId& item)
   long cookie;
   wxTreeItemId child = GetFirstChild( item, cookie);
   while( child) {
-
     clearChildren( child);
     Delete( child);
     child = GetFirstChild( item, cookie);
-
   }
 }
 
@@ -108,24 +104,19 @@ void WxNamingTree::copySelectedToClipboard()
 {
   WxNamingObject* object = getTreeObject();
   try {
-
     wxString ior = orb->object_to_string( object->Object());
     if (wxTheClipboard->Open()) {
-
       wxTheClipboard->SetData( new wxTextDataObject( ior));
       wxTheClipboard->Close();
-
     }
 
   } catch( CORBA::Exception& ex) {
-
     wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
   }
 }
 
 
-WxNamingObject* WxNamingTree::getTreeObject( void) const
+WxNamingObject* WxNamingTree::getTreeObject() const
 {
   wxTreeItemId item = GetSelection();
   if (item == wxTreeItemId( (wxGenericTreeItem*)0)) {
@@ -148,9 +139,7 @@ void WxNamingTree::listBindingList(
       CosNaming::BindingList_var& bl)
 {
   try {
-
     for( unsigned int i=0; i < bl->length(); i++) {
-
       // Add each entry into the tree control
       CORBA::Object_var object = context->resolve( bl[i].binding_name);
       bool isContext =(bl[i].binding_type == CosNaming::ncontext);
@@ -161,34 +150,26 @@ void WxNamingTree::listBindingList(
       wxString name = static_cast<const char*>( (bl[i].binding_name[0]).id);
       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);
       switch( bl[i].binding_type) {
-
         case CosNaming::ncontext: {
-
           // 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");
-
   }
 }
 
@@ -198,14 +179,11 @@ void WxNamingTree::listContext( wxTreeItemId& item)
 // TODO: use hourglass
 //  SetCursor( *wxHOURGLASS_CURSOR);
   try {
-
     // Get the item's object and make sure we have a context
     WxNamingObject* namingObject = getTreeObject( item);
     CosNaming::NamingContext_var context = namingObject->NamingContext();
     if (CORBA::is_nil( context.in ())) {
-
       return;
-
     }
 
     // List the context's entries
@@ -214,9 +192,7 @@ void WxNamingTree::listContext( wxTreeItemId& item)
     context->list( listQuantum, bl, bi);
     listBindingList( item, context.in(), bl);
     if (!CORBA::is_nil( bi.in ())) {
-
       while( bl->length()) {
-
         wxString text;
         text << "This context contains more than " << listQuantum <<
             " entries, list the next " << listQuantum << "?";
@@ -224,21 +200,16 @@ void WxNamingTree::listContext( wxTreeItemId& item)
             text,
             "Question",
             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");
-
   }
 
 }
@@ -251,42 +222,32 @@ void WxNamingTree::onContextPopupBindContext( wxCommandEvent& event)
       orb,
       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());
     if (CORBA::is_nil( newContext.in ())) {
-
       wxMessageBox(
           "Object is not a CosNaming::NamingContext",
           "Error",
           wxOK | wxICON_EXCLAMATION,
           this);
       return;
-
     }
     context->bind_context(
         dialog->getName(),
         newContext.in ());
     onContextPopupRefresh( event);
-
   } catch( CORBA::Exception& ex) {
-
     wxMessageBox(
         ex._rep_id(),
         "CORBA::Exception");
-
   }
 }
 
@@ -298,29 +259,21 @@ void WxNamingTree::onContextPopupBindObject( wxCommandEvent& event)
       orb,
       this));
   if (dialog->ShowModal() != wxID_OK) {
-
     return;
-
   }
   try {
-
     wxTreeItemId item = GetSelection();
     WxNamingObject* object = getTreeObject( item);
     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");
-
   }
 }
 
@@ -331,28 +284,20 @@ void WxNamingTree::onContextPopupBindNewContext( wxCommandEvent& event)
   WxNamingObject* object = getTreeObject( item);
   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");
-
   }
 }
 
@@ -363,22 +308,17 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&)
       "Are you sure you want to destroy this object?",
       "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);
   CosNaming::NamingContext_var parentNaming = parentObject->NamingContext();
   try {
-
     // First try to destroy, it will raise an exception if it's not empty
     CosNaming::NamingContext_var context = object->NamingContext();
     context->destroy();
@@ -387,11 +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");
-
   }
 }
 
@@ -410,43 +347,32 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&)
       "Are you sure you want to unbind this context?",
       "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);
   CosNaming::NamingContext_var context = parent->NamingContext();
   try {
-
     context->unbind( object->Name());
     clearChildren( item);
     Delete( item);
-
   } catch( CORBA::Exception& ex) {
-
     wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
   }
 }
 
 
 void WxNamingTree::onItemExpanding( wxTreeEvent& event)
 {
-
   wxTreeItemId item = event.GetItem();
   // If this item has a child it has already been listed so nothing to do.
   if (GetLastChild( item) != wxTreeItemId( 0L)) {
-
     return;
-
   }
   listContext( item);
 }
@@ -456,7 +382,6 @@ void WxNamingTree::onLeftDClick( wxMouseEvent& event)
 {
   wxTreeItemId item = HitTest( event.GetPosition());
   if (!item) {
-
     return;
   }
   WxAutoDialog<WxViewIORDialog> dialog( new WxViewIORDialog(
@@ -474,32 +399,24 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& )
       "Are you sure you want to unbind this object?",
       "Confirm",
       wxYES_NO | wxICON_QUESTION) != wxYES) {
-
     return;
-
   }
   wxTreeItemId item = GetSelection();
 
   // Make sure we don't unbind "Root"
   wxTreeItemId parentItem = GetParent( item);
   if (parentItem == 0) {
-
     return;
-
   }
   WxNamingObject* object = getTreeObject( item);
   WxNamingObject* parent = getTreeObject( parentItem);
   CosNaming::NamingContext_var context = parent->NamingContext();
   try {
-
     context->unbind( object->Name());
     clearChildren( item);
     Delete( item);
-
   } catch( CORBA::Exception& ex) {
-
     wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
   }
 }
 
@@ -519,7 +436,6 @@ void WxNamingTree::onRMouseUClick( wxMouseEvent& event)
 {
   wxTreeItemId item = HitTest( event.GetPosition());
   if (!item) {
-
     return;
   }
   // First select the item, then popup the appropriate menu
@@ -527,15 +443,11 @@ void WxNamingTree::onRMouseUClick( wxMouseEvent& event)
   WxNamingObject* object = getTreeObject( item);
   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);
-
   }
 }
 
@@ -543,15 +455,11 @@ void WxNamingTree::resolve( CosNaming::NamingContext_ptr pRootContext)
 {
   clearChildren();
   if (!CORBA::is_nil( pRootContext)) {
-
     wxTreeItemId item = AddRoot( "Root");
     SetItemData( item, new WxNamingObject( pRootContext));
     listContext( item);
-
   } else {
-
     AddRoot( "<null>");
-
   }
 }
 
diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.h b/TAO/utils/wxNamingViewer/wxNamingTree.h
index 72d8ece9bde..1ba472b0ef0 100644
--- a/TAO/utils/wxNamingViewer/wxNamingTree.h
+++ b/TAO/utils/wxNamingViewer/wxNamingTree.h
@@ -34,7 +34,7 @@ private:
   enum {
     listQuantum = 40,
   };
-  void clearChildren (void);
+  void clearChildren ();
   void clearChildren (wxTreeItemId& item);
   WxNamingObject* getTreeObject() const;
   WxNamingObject* getTreeObject(wxTreeItemId& item) const;
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index abd14d11e1f..e9859892e31 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -146,10 +146,8 @@ void WxNamingViewerFrame::onMenuCopy( wxCommandEvent& WXUNUSED( event))
 void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event))
 {
   switch( selectNS->ShowModal()) {
-
     case wxID_OK:
       try {
-
 // TODO: need hourglass
         CORBA::Object_var object = pOrb->string_to_object(
             selectNS->getIOR().c_str());
@@ -157,13 +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;
 
@@ -172,7 +167,6 @@ void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event))
       setDefaultNS();
       resolve();
       break;
-
   }
 }
 
@@ -196,7 +190,6 @@ void WxNamingViewerFrame::setDefaultNS()
 
   TAO_Naming_Client client;
   if (client.init( pOrb) == 0) {
-
     rootContext = client.get_context();
 
     // For debugging, sets up some initial contexts in the NS
diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
index 5b0a8386324..ca363fcfd1c 100644
--- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
@@ -124,17 +124,13 @@ WxSelectNSDialog::WxSelectNSDialog( wxWindow* parent)
   ACE_TString name;
   ACE_Configuration::VALUETYPE type;
   while(config->enumerate_values( section, index, name, type) == 0) {
-
     ACE_TString value;
     if(config->get_string_value( section, name.c_str(), value) == 0) {
-
       servers->Append(
           name.c_str(),
           new wxString( value.c_str()));
-
     }
     index++;
-
   }
 }
 
@@ -143,9 +139,7 @@ WxSelectNSDialog::~WxSelectNSDialog()
 {
   int count = servers->Number();
   for (int i = 0; i < count; i++) {
-
     delete static_cast<wxString*>( servers->GetClientData( i));
-
   }
 }
 
@@ -154,7 +148,6 @@ void WxSelectNSDialog::onAdd( wxCommandEvent& WXUNUSED(event))
 {
   WxAutoDialog<WxAddNameServerDlg> dialog( new WxAddNameServerDlg( this));
   if (dialog->ShowModal() == wxID_OK) {
-
     servers->Append(
         dialog->getServerName(),
         new wxString( dialog->getIor()));
@@ -164,7 +157,6 @@ void WxSelectNSDialog::onAdd( wxCommandEvent& WXUNUSED(event))
         section,
         dialog->getServerName().c_str(),
         value);
-
   }
 }
 
@@ -205,7 +197,6 @@ void WxSelectNSDialog::onOK( wxCommandEvent& WXUNUSED(event))
 {
   int index = servers->GetSelection();
   if (index == -1) {
-
     wxMessageBox(
         "You must select a server or cancel",
         "Error",
@@ -222,13 +213,11 @@ void WxSelectNSDialog::onRemove( wxCommandEvent& WXUNUSED(event))
 {
   int index = servers->GetSelection();
   if (index != -1) {
-
     wxString name = servers->GetString( index);
     delete static_cast<wxString*>( servers->GetClientData( index));
     servers->Delete( index);
 
-    ACE_Configuration_Section_Key section = config->root_section();;
+    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 6b773657f58..f6ea0460cf5 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -113,7 +113,6 @@ namespace  // anonymous
       dialog->SetSizer( topsizer);
       topsizer->SetSizeHints( dialog);
     }
-
 };  // anonymous
 
 BEGIN_EVENT_TABLE( WxViewIORDialog, wxDialog)
@@ -169,9 +168,7 @@ WxViewIORDialog::WxViewIORDialog(
   applyButton->Enable( false);
 
   if (object != CORBA::Object::_nil()) {
-
     WxViewIORDialog::object = CORBA::Object::_duplicate( object);
-
   }
   CORBA::String_var ior = orb->object_to_string( object);
   WxViewIORDialog::ior = ior;
@@ -185,11 +182,9 @@ void WxViewIORDialog::decodeIOR()
 
   // if object is nil, return out
   if(CORBA::is_nil( object.in())) {
-
     typeID = "";
     TransferDataToWindow();
     return;
-
   }
 
   // Get the stub
@@ -203,20 +198,15 @@ void WxViewIORDialog::decodeIOR()
   CORBA::ULong count = baseProfiles.profile_count();
   wxTreeItemId rootItem = profiles->AddRoot( "Profiles");
   for( CORBA::ULong slot = 0; slot < count; slot++) {
-
     const TAO_Profile* profile = baseProfiles.get_profile( slot);
     try{
-
       // The need to const_cast should disappear in TAO 1.1.2 BUT IT DIDN'T
       char* profileString =
           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");
-
     }
 
   }
@@ -228,12 +218,9 @@ void WxViewIORDialog::OnApply( wxCommandEvent& event)
 {
   wxDialog::OnApply( event);
   try {
-
     object = orb->string_to_object( ior);
     decodeIOR();
-
   } catch( CORBA::Exception& ex) {
-
     wxMessageBox( ex._info().c_str(), "CORBA::Exception");
   }
 }
@@ -243,9 +230,7 @@ void WxViewIORDialog::onIORText( wxCommandEvent& event)
 {
   // Enable the Apply button if the IOR has changed
   if (event.GetString() != ior) {
-
     applyButton->Enable( true);
-
   }
 }